diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 992cf1682..a5e3db1bb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -56,7 +56,7 @@ Once we have reviewed and signed a copy of the agreement we will be able accept ## How we use branches in this repository * `master` represents our main development branch, which gets deployed frequently to http://dev.cove.opendataservices.coop/ -* `live` corresponds to the code currently running in our live deployments at http://cove.opendataservices.coop/ and http://standard.open-contracting.org/validator/ +* `live` corresponds to the code currently running in our live deployments at http://cove.opendataservices.coop/ and http://standard.open-contracting.org/review/ * Branches of the form `release-...` are for a release of Cove. These diverge from `master` so that we can have a testing period with no new features. Once a release is ready it gets merged into `live`. We currently have a monthly release cyle: https://github.com/OpenDataServices/cove#release-cycle * Other branches represent development work or bug fixes. diff --git a/README.rst b/README.rst index 570896c5c..de7d1a134 100644 --- a/README.rst +++ b/README.rst @@ -54,7 +54,7 @@ Release Cycle CoVE is in constant development. There are public instances in use at: https://dataquality.threesixtygiving.org/ -http://standard.open-contracting.org/validator/ +http://standard.open-contracting.org/review/ We deploy the latest version of CoVE at the end of each calendar month (usually the last Thursday of the month). We make a development version ready for user testing (mainly internally) two weeks before deployment. Our cut off date for new features to be considered in that cycle is the week before that. diff --git a/cove/locale/en/LC_MESSAGES/django.po b/cove/locale/en/LC_MESSAGES/django.po index d89408731..426673432 100644 --- a/cove/locale/en/LC_MESSAGES/django.po +++ b/cove/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-20 09:48+0000\n" +"POT-Creation-Date: 2018-10-30 16:05+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -51,7 +51,7 @@ msgstr "" msgid "Sorry we got a ConnectionError whilst trying to download that file" msgstr "" -#: cove/input/views.py:73 cove/input/views.py:81 cove/lib/converters.py:174 +#: cove/input/views.py:73 cove/input/views.py:81 cove/lib/converters.py:178 #: cove/lib/exceptions.py:25 cove/lib/exceptions.py:34 #: cove/lib/exceptions.py:61 msgid "Try Again" @@ -77,12 +77,12 @@ msgid "" "related to permissions, or you may be blocking certain user agents." msgstr "" -#: cove/lib/converters.py:172 cove/lib/exceptions.py:23 +#: cove/lib/converters.py:176 cove/lib/exceptions.py:23 #: cove/lib/exceptions.py:32 cove/lib/exceptions.py:59 msgid "Sorry, we can't process that data" msgstr "" -#: cove/lib/converters.py:175 +#: cove/lib/converters.py:179 msgid "" "We think you tried to upload a JSON file, but it is not well formed JSON.\n" "\n" @@ -341,27 +341,22 @@ msgid "days" msgstr "" #: cove/templates/validation_table.html:7 -#: cove/templates/validation_table_modal.html:7 msgid "Error Description" msgstr "" #: cove/templates/validation_table.html:8 -#: cove/templates/validation_table_modal.html:9 msgid "Error Count" msgstr "" #: cove/templates/validation_table.html:9 -#: cove/templates/validation_table_modal.html:10 msgid "First 3 Examples" msgstr "" #: cove/templates/validation_table.html:10 -#: cove/templates/validation_table_modal.html:11 msgid "Location of first 3 errors" msgstr "" #: cove/templates/validation_table.html:12 -#: cove/templates/validation_table_modal.html:13 msgid "Spreadsheet Location of first 3 errors" msgstr "" diff --git a/cove_360/locale/en/LC_MESSAGES/django.po b/cove_360/locale/en/LC_MESSAGES/django.po index 043ca8932..63c4b59a8 100644 --- a/cove_360/locale/en/LC_MESSAGES/django.po +++ b/cove_360/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-20 09:48+0000\n" +"POT-Creation-Date: 2018-10-30 16:05+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -756,23 +756,15 @@ msgid "" "prefer a spreadsheet format." msgstr "" -#: cove_360/views.py:37 cove_360/views.py:47 +#: cove_360/views.py:38 cove_360/views.py:48 msgid "Sorry, we can't process that data" msgstr "" -#: cove_360/views.py:39 cove_360/views.py:49 +#: cove_360/views.py:40 cove_360/views.py:50 msgid "Try Again" msgstr "" -#: cove_360/views.py:40 -msgid "" -"We think you tried to upload a JSON file, but it is not well formed JSON.\n" -"\n" -" Error message: {}" -msgstr "" - -#: cove_360/views.py:50 +#: cove_360/views.py:51 msgid "" "360Giving JSON should have an object as the top level, the JSON you supplied " "does not." diff --git a/cove_360/locale/es/LC_MESSAGES/django.po b/cove_360/locale/es/LC_MESSAGES/django.po index 90adf077c..23cb768e6 100644 --- a/cove_360/locale/es/LC_MESSAGES/django.po +++ b/cove_360/locale/es/LC_MESSAGES/django.po @@ -2,21 +2,20 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-23 11:29+0000\n" +"POT-Creation-Date: 2018-10-30 16:05+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Ben Webb , 2017\n" -"Language-Team: Spanish (https://www.transifex.com/OpenDataServices/" -"teams/59127/es/)\n" -"Language: es\n" +"Language-Team: Spanish (https://www.transifex.com/OpenDataServices/teams/59127/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: cove_360/templates/cove_360/additional_checks.html:5 @@ -44,8 +43,8 @@ msgid "" "formats, allowing you to download the original file, and the converted " "versions." msgstr "" -"Sube, pega o proporciona un enlace a los datos en el formato del Estándar de " -"Datos 360Giving, y esta aplicación los convertirá entre JSON, Excel y CSV, " +"Sube, pega o proporciona un enlace a los datos en el formato del Estándar de" +" Datos 360Giving, y esta aplicación los convertirá entre JSON, Excel y CSV, " "esto te permitirá descargar el archivo original y las versiones convertidas." #: cove_360/templates/cove_360/base.html:45 @@ -53,8 +52,8 @@ msgid "" "You will also be able to inspect key information from the data that the " "application is able to find, so that you can check the data." msgstr "" -"También podrás inspeccionar información clave de los datos que la aplicación " -"es capaz de encontrar, para que puedas comprobar los datos." +"También podrás inspeccionar información clave de los datos que la aplicación" +" es capaz de encontrar, para que puedas comprobar los datos." #: cove_360/templates/cove_360/base.html:46 msgid "This tool will:" @@ -62,8 +61,8 @@ msgstr "Esta herramienta:" #: cove_360/templates/cove_360/base.html:47 msgid "" -"Check your data is valid. When it passes these checks, you will know that it " -"is formatted for re-use" +"Check your data is valid. When it passes these checks, you will know that it" +" is formatted for re-use" msgstr "" "Comprueba que sus datos son válidos. Una vez que sus datos pasen estos " "chequeos, usted sabrá que están listos para ser reusados." @@ -74,8 +73,8 @@ msgstr "Lo que no hace:" #: cove_360/templates/cove_360/base.html:49 msgid "" -" Check your data is accurate. Read about common data errors and how to check " -"for them in the " +" Check your data is accurate. Read about common data errors and how to check" +" for them in the " msgstr "" "Comprueba que sus datos son correctos. Lea acerca de errores de datos " "comunes y cómo solucionarlos" @@ -100,9 +99,10 @@ msgstr "Publicación y Uso de Datos de Concesiones Abiertos" #: cove_360/templates/cove_360/base.html:53 msgid "" -"To preview how this tool works, try loading some sample data." +"To preview how this tool works, try loading some " +"sample data." msgstr "" #: cove_360/templates/cove_360/base.html:55 @@ -110,54 +110,43 @@ msgid "Formats" msgstr "Formatos" #: cove_360/templates/cove_360/base.html:56 -#, fuzzy -#| msgid "" -#| "The application accepts data in some of the formats given in the 360Giving Data Standard " -#| "guidance.\n" -#| "
Acceptable files are: " -msgid "" -"The application accepts data in some of the formats given in the 360Giving Data Standard " -"guidance.

\n" +msgid "" +"The application accepts data in some of the formats given in the 360Giving Data Standard guidance.

\n" "

Acceptable files are: " msgstr "" -"La aplicación acepta datos en algunos de los formatos dados en la guía del Estándar de Datos " -"360Giving.
Los siguientes son archivos aceptados:" #: cove_360/templates/cove_360/base.html:59 msgid "" -"Summary Spreadsheet - Excel, CSV (UTF-8, Windows-1252 and ISO-8859-1 encodings " -"supported)" +"Summary Spreadsheet - Excel, CSV (UTF-8, " +"Windows-1252 and ISO-8859-1 encodings supported)" msgstr "" "Resumen en formato hoja de cálculo- Excel, CSV (codificaciones " +"titles.xlsx\">Excel, CSV (codificaciones " "soportadas: UTF-8, Windows-1252 and ISO-8859-1)" #: cove_360/templates/cove_360/base.html:60 msgid "" -"JSON built to the 360Giving JSON schema (UTF-8 encoding " -"supported)" +"JSON built to the 360Giving JSON schema (UTF-8 encoding supported)" msgstr "" -"Documento JSON creado siguiendo el esquema JSON " -"360Giving (codificación soportada: UTF-8)" +"Documento JSON creado siguiendo el esquema JSON 360Giving (codificación soportada: UTF-8)" #: cove_360/templates/cove_360/base.html:61 msgid "" -"Multi-table data package - " +"Multi-table data package - " "Excel" msgstr "" -"Paquete de datos de tablas " +"Paquete de datos de tablas " "múltiples - Excel" #: cove_360/templates/cove_360/common_errors.html:6 @@ -197,8 +186,8 @@ msgid "" "Putting more than one address in the same field e.g. \"http://example.com " "and http:example2.com\" is not a 'uri'" msgstr "" -"Poner más de una dirección en el mismo campo, por ejemplo \"http://example." -"com y http: example2.com\" no es una 'uri'" +"Poner más de una dirección en el mismo campo, por ejemplo " +"\"http://example.com y http: example2.com\" no es una 'uri'" #: cove_360/templates/cove_360/common_errors.html:17 msgid "Date is not in the correct format" @@ -206,11 +195,13 @@ msgstr "El formato de la fecha es incorrecto" #: cove_360/templates/cove_360/common_errors.html:18 msgid "" -"Dates should be in the formats defined by the 360Giving Standard." +"Dates should be in the formats defined by the 360Giving " +"Standard." msgstr "" -"Las fechas deben tener el formato definido en el Estándar 360Giving." +"Las fechas deben tener el formato definido en el Estándar " +"360Giving." #: cove_360/templates/cove_360/common_errors.html:20 msgid "" @@ -231,20 +222,20 @@ msgstr "" "Añadir un dato que no es una fecha a un campo de fechas (por accidente)" #: cove_360/templates/cove_360/common_errors.html:26 -#, fuzzy -#| msgid "Datetimes (used for Last Modified fields)" msgid "Datetimes format used for Last Modified fields" -msgstr "Fechas/horas (se usa para campos de Última Modificación)" +msgstr "" #: cove_360/templates/cove_360/common_errors.html:27 msgid "" "A datetime format is a very specific form of a date and time that is " -"specified by the 360Giving Standard." +"specified by the 360Giving " +"Standard." msgstr "" "El formato fecha/hora es un formato muy específico de fecha y hora definido " -"por el Estándar 360Giving." +"por el Estándar " +"360Giving." #: cove_360/templates/cove_360/common_errors.html:28 msgid "A datetime should be in the form of YYYY-MM-DDThh:mm:ss±hh:mm where:" @@ -270,31 +261,25 @@ msgstr "T es simplemente la letra \"T\"" #: cove_360/templates/cove_360/common_errors.html:34 msgid "hh is a 2 digit representation of an hour e.g. 01 for 1AM, 13 for 1PM" msgstr "" -"hh es una representación de 2 dígitos de una hora por ejemplo, 01 para 1 AM, " -"13 para 1 PM" +"hh es una representación de 2 dígitos de una hora por ejemplo, 01 para 1 AM," +" 13 para 1 PM" #: cove_360/templates/cove_360/common_errors.html:35 -msgid "mm is a 2 digit representation of minutes in an hour e.g. 05 for 5 past" +msgid "" +"mm is a 2 digit representation of minutes in an hour e.g. 05 for 5 past" msgstr "" -"mm es una representación de 2 dígitos de minutos en una hora, por ejemplo 05 " -"para 5 minutos " +"mm es una representación de 2 dígitos de minutos en una hora, por ejemplo 05" +" para 5 minutos " #: cove_360/templates/cove_360/common_errors.html:36 msgid "ss is a 2 digit representation of seconds" msgstr "ss es una representación 2 dígitos de segundo" #: cove_360/templates/cove_360/common_errors.html:37 -#, fuzzy -#| msgid "" -#| "±hh:mm is a timezone offset from UTC. For most UK data producers this can " -#| "simply be replaced with a 'Z'" msgid "" "+hh:mm or -hh:mm is a timezone offset from UTC. For most UK data producers " "this can simply be replaced with a 'Z'" msgstr "" -"± hh: mm es un desplazamiento de zona horaria UTC. Para la mayoría de los " -"productores de datos del Reino Unido esto simplemente se puede sustituir con " -"una \"Z\"" #: cove_360/templates/cove_360/common_errors.html:39 msgid "" @@ -305,8 +290,8 @@ msgstr "" #: cove_360/templates/cove_360/common_errors.html:40 msgid "" -"Read further guidance about date and datetime fields and " +"Read further guidance about date and datetime fields and " "formatting tips when publishing using spreadsheets." msgstr "" @@ -373,7 +358,8 @@ msgstr "" #: cove_360/templates/cove_360/common_errors.html:65 msgid "Every grant needs a unique identifier so we can tell them apart" msgstr "" -"Cada concesión necesita un identificador único para que podamos distinguirlas" +"Cada concesión necesita un identificador único para que podamos " +"distinguirlas" #: cove_360/templates/cove_360/common_errors.html:65 msgid "Grant Identifiers" @@ -404,7 +390,8 @@ msgstr "Toda organización necesita un nombre que pueda ser leído por humanos." #: cove_360/templates/cove_360/common_errors.html:77 msgid "" -"Every grant needs a to specify an organisation to which the grant is awarded." +"Every grant needs a to specify an organisation to which the grant is " +"awarded." msgstr "" "Cada concesión necesita especificar una organización a la que se concede la " "subvención." @@ -428,8 +415,8 @@ msgid "" "In 360Giving data when we talk about currencies, countries and organisation " "types we ask publishers to use values from a predefined list. When we ask " "whether or not this grant was from an open call we expect either 'yes' or " -"no' and nothing else. When we validate people's data, we check the values of " -"those fields against those lists." +"no' and nothing else. When we validate people's data, we check the values of" +" those fields against those lists." msgstr "" "En los datos 360Giving cuando hablamos de monedas, países y tipos de " "organización, le pedimos a los editores utilizar valores de una lista " @@ -439,23 +426,22 @@ msgstr "" #: cove_360/templates/cove_360/common_errors.html:95 msgid "This error tells us that we have found something not on the list." -msgstr "Este error nos dice que hemos encontrado algo que no está en la lista." +msgstr "" +"Este error nos dice que hemos encontrado algo que no está en la lista." #: cove_360/templates/cove_360/common_errors.html:96 msgid "" -"The lists are referenced in the 360Giving Grants Schema. See 360Giving JSON Schemas for more information." +"The lists are referenced in the 360Giving Grants Schema. See 360Giving JSON Schemas for more information." msgstr "" -"Las listas son referenciadas en el esquema 360Giving. Ver 360Giving JSON esquemas para obtener más información." +"Las listas son referenciadas en el esquema 360Giving. Ver 360Giving JSON esquemas para obtener más información." #: cove_360/templates/cove_360/common_errors.html:100 -#, fuzzy -#| msgid "Value is not a string" msgid "Field x is not a string" -msgstr "El valor no es una cadena de caracteres" +msgstr "" #: cove_360/templates/cove_360/common_errors.html:101 #: cove_360/templates/cove_360/common_errors.html:109 @@ -465,8 +451,8 @@ msgstr "Los datos del standard se esperan en un formato determinado." #: cove_360/templates/cove_360/common_errors.html:102 msgid "" "Strings are generally text, but can contain other characters such as " -"numbers. Sometimes spreadsheet software can alter the format of data so that " -"it is no longer a string." +"numbers. Sometimes spreadsheet software can alter the format of data so that" +" it is no longer a string." msgstr "" "Las cadenas de caracteres son generalmente texto, pero puede contener otros " "caracteres como números. A veces el software de hoja de cálculo puede " @@ -475,33 +461,25 @@ msgstr "" #: cove_360/templates/cove_360/common_errors.html:103 msgid "" -"To fix these kinds of errors, check the field to make sure you are supplying " -"a string." +"To fix these kinds of errors, check the field to make sure you are supplying" +" a string." msgstr "" "Para solucionar este tipo de errores, compruebe el campo para asegurarse de " "que está proporcionando una cadena." #: cove_360/templates/cove_360/common_errors.html:107 -#, fuzzy -#| msgid "Value is not an integer" msgid "Value is not a number" -msgstr "El valor no es un número entero" +msgstr "" #: cove_360/templates/cove_360/common_errors.html:108 msgid "Field x is not a number" msgstr "" #: cove_360/templates/cove_360/common_errors.html:110 -#, fuzzy -#| msgid "" -#| "To fix these kinds of errors, check the field to make sure you are " -#| "supplying an integer." msgid "" -"To fix these kinds of errors, check the field to make sure you are supplying " -"a number." +"To fix these kinds of errors, check the field to make sure you are supplying" +" a number." msgstr "" -"Para solucionar este tipo de errores, compruebe el campo para asegurarse de " -"que está proporcionando un número entero." #: cove_360/templates/cove_360/explore.html:29 msgid "A file was " @@ -548,11 +526,11 @@ msgstr "concedida el %(start_date)s." #: cove_360/templates/cove_360/explore.html:44 #, python-format msgid "" -"awarded between %(start_date)s and %(end_date)s." +"awarded between %(start_date)s and " +"%(end_date)s." msgstr "" -"concedida entre %(start_date)s y %(end_date)s." +"concedida entre %(start_date)s y " +"%(end_date)s." #: cove_360/templates/cove_360/explore.html:51 msgid "The grant" @@ -565,11 +543,11 @@ msgstr "1 subvención" #: cove_360/templates/cove_360/explore.html:55 #, python-format msgid "" -" was awarded in %(currency_code)s with a value of " -"%(currency_symbol)s%(amount_awarded)s." +" was awarded in %(currency_code)s with a value of " +"%(currency_symbol)s%(amount_awarded)s." msgstr "" -"fue concedida en strong>%(currency_code)scon un valor de " -"%(currency_symbol)s%(amount_awarded)s." +"fue concedida en strong>%(currency_code)scon un valor de " +"%(currency_symbol)s%(amount_awarded)s." #: cove_360/templates/cove_360/explore.html:58 msgid "The grants" @@ -589,18 +567,18 @@ msgid "" msgstr "" "fue concedida en %(currency_code)s con un valor total de " "%(currency_symbol)s%(total_amount)s y subvenciones " -"individuales con cuantías desde%(currency_symbol)s%(min_amount)s (la menor) a %(currency_symbol)s%(max_amount)s (la " -"mayor)." +"individuales con cuantías " +"desde%(currency_symbol)s%(min_amount)s (la menor) a " +"%(currency_symbol)s%(max_amount)s (la mayor)." #: cove_360/templates/cove_360/explore.html:68 #, python-format msgid "" -" This file is not 'utf-8' encoded (it is " -"%(csv_encoding)s encoded)." +" This file is not 'utf-8' encoded (it is " +"%(csv_encoding)s encoded)." msgstr "" -"Este archivo no 'está codificado en'utf-8'(está codificado en %(csv_encoding)s)." +"Este archivo no 'está codificado " +"en'utf-8'(está codificado en %(csv_encoding)s)." #: cove_360/templates/cove_360/explore.html:72 msgid "" @@ -635,8 +613,8 @@ msgid "" "The JSON data could not be converted to spreadsheet due to the following " "error error: %(conversion_error)s" msgstr "" -"El archivo JSON no pudo ser convertido a hoja de cálculo debido al siguiente " -"error error: %(conversion_error)s" +"El archivo JSON no pudo ser convertido a hoja de cálculo debido al siguiente" +" error error: %(conversion_error)s" #: cove_360/templates/cove_360/explore.html:115 msgid "Conversion errors:" @@ -667,8 +645,8 @@ msgstr "Enhorabuena! Sus datos son válidos al compararlos con " #: cove_360/templates/cove_360/explore.html:155 msgid "" -"There are some validation errors in your data, please check " -"them in the table below." +"There are some validation errors in your data, please check" +" them in the table below." msgstr "" "Hay algunos errores de validación en sus datos, por favor " "revíselos en la siguiente tabla." @@ -695,12 +673,9 @@ msgstr "" #: cove_360/templates/cove_360/explore.html:192 msgid "" "\n" -" Additional checks highlight some specific areas where the source " -"data may be incorrect or require further attention.\n" -" They can also suggest ways to increase the usefulness of the " -"data.\n" -" In any case, these checks do not indicate validation errors and " -"can be ignored if they are not relevant.\n" +" Additional checks highlight some specific areas where the source data may be incorrect or require further attention.\n" +" They can also suggest ways to increase the usefulness of the data.\n" +" In any case, these checks do not indicate validation errors and can be ignored if they are not relevant.\n" " " msgstr "" @@ -719,8 +694,8 @@ msgid "" "spelling mistakes." msgstr "" "Campos adicionales han sido encontrados en sus datos. Por " -"favor, compruebe que fueron añadidos intencionalmente y no simplemente como " -"el resultado de faltas de ortografía." +"favor, compruebe que fueron añadidos intencionalmente y no simplemente como" +" el resultado de faltas de ortografía." #: cove_360/templates/cove_360/explore.html:263 msgid "Review" @@ -809,40 +784,22 @@ msgid "What happens to the data I provide to this site?" msgstr "¿Qué sucede con los datos que proporciono a este sitio?" #: cove_360/templates/cove_360/more_info.html:11 -#, fuzzy -#| msgid "" -#| "We retain the data you upload or paste to this site, on our server, for 7 " -#| "days." msgid "" "We retain the data you upload or paste to this site, on our server, for " "seven days." msgstr "" -"Los datos subidos o pegado en este sitio son conservados en nuestros " -"servidores durante 7 días." #: cove_360/templates/cove_360/more_info.html:12 -#, fuzzy -#| msgid "" -#| "If you supply a link, we fetch the data from that link and store it on " -#| "our server for 7 days." msgid "" "If you supply a link, we fetch the data from that link and store it on our " "server for seven days." msgstr "" -"Si proporciona un enlace, obtenemos los datos de ese enlace y los " -"almacenamos en nuestros servidores durante 7 días." #: cove_360/templates/cove_360/more_info.html:13 -#, fuzzy -#| msgid "" -#| "We delete all data older than 7 days from our servers daily, retaining " -#| "none of the original data." msgid "" "We delete all data older than seven days from our servers daily, retaining " "none of the original data." msgstr "" -"Borramos todos los datos de más de 7 días de nuestros servidores " -"diariamente, no conservamos ninguno de los datos originales." #: cove_360/templates/cove_360/more_info.html:14 msgid "" @@ -850,8 +807,8 @@ msgid "" "understand how people are using this application, what types of data are " "being supplied, what common errors exist and so on." msgstr "" -"Mientras los datos están en nuestros servidores podemos acceder a ellos para " -"ayudarnos a entender cómo las personas usan esta aplicación, los tipos de " +"Mientras los datos están en nuestros servidores podemos acceder a ellos para" +" ayudarnos a entender cómo las personas usan esta aplicación, los tipos de " "datos suministrados, los errores más comunes que existen, etc." #: cove_360/templates/cove_360/more_info.html:15 @@ -868,8 +825,8 @@ msgstr "" #: cove_360/templates/cove_360/more_info.html:16 msgid "" "We do retain some metadata about data supplied to this site. Details can be " -"found in the code, but may include information about whether or not the file " -"was uploaded, linked or pasted, the size of the file, the date/time it was " +"found in the code, but may include information about whether or not the file" +" was uploaded, linked or pasted, the size of the file, the date/time it was " "supplied and so on. " msgstr "" "Guardamos algunos metadatos sobre los datos suministrados a este sitio. Los " @@ -878,19 +835,10 @@ msgstr "" "la fecha / hora en que se suministra y así sucesivamente." #: cove_360/templates/cove_360/more_info.html:19 -#, fuzzy -#| msgid "Why do you delete data after 7 days?" msgid "Why do you delete data after seven days?" -msgstr "¿Por qué eliminan los datos después de 7 días?" +msgstr "" #: cove_360/templates/cove_360/more_info.html:21 -#, fuzzy -#| msgid "" -#| "This is service to allow people to explore machine readable data. As such " -#| "we see no need to store and gather everything people submit to the site " -#| "forever. We have chosen 7 days as a practical time frame that allows " -#| "people to share results with colleagues, but also allows data to " -#| "disappear over time to save people having to clean up after themselves." msgid "" "This is a service to allow people to explore machine readable data. As such " "we see no need to store and gather everything people submit to the site " @@ -898,25 +846,12 @@ msgid "" "people to share results with colleagues, but also allows data to disappear " "over time to save people having to clean up after themselves." msgstr "" -"Este es un servicio que permite a la gente explorar datos que una " -"computadora puede leer. Como tal no vemos la necesidad de almacenar para " -"siempre todo lo que los usuarios suben al sitio. Hemos optado por 7 días por " -"razones prácticas, al ser un periodo de que permite a la gente compartir los " -"resultados con colegas a la vez que asegura que los datos desaparezcan " -"después de cierto tiempo, lo cual elimina la necesidad tener que hacer " -"periodicamente una limpieza manual de los datos almacenados. " #: cove_360/templates/cove_360/more_info.html:22 -#, fuzzy -#| msgid "" -#| "We believe that deleting supplied data after 7 days provides a level of " -#| "privacy for the users of this service. " msgid "" "We believe that deleting supplied data after seven days provides a level of " "privacy for the users of this service. " msgstr "" -"Creemos que el borrado de los datos suministrados después de 7 días " -"proporciona un nivel de privacidad para los usuarios de este servicio." #: cove_360/templates/cove_360/more_info.html:27 msgid "Why provide converted versions?" @@ -932,68 +867,27 @@ msgstr "Datos sobre Mejores Prácticas en la Web" #: cove_360/templates/cove_360/more_info.html:29 msgid "" -"recommend making open data available in a range of formats to meet the needs " -"of different users, for example, developers may want JSON, researchers might " -"prefer a spreadsheet format." +"recommend making open data available in a range of formats to meet the needs" +" of different users, for example, developers may want JSON, researchers " +"might prefer a spreadsheet format." msgstr "" "recomienda ofrecer los datos abiertos en una variedad de formatos para " "satisfacer las necesidades de los distintos usuarios. Por ejemplo, los " "desarrolladores pueden requerir JSON, mientras los investigadores puede que " "prefieran un formato de hoja de cálculo." -#: cove_360/views.py:37 cove_360/views.py:47 +#: cove_360/views.py:38 cove_360/views.py:48 msgid "Sorry, we can't process that data" msgstr "Lo sentimos, no podemos procesar esos datos" -#: cove_360/views.py:39 cove_360/views.py:49 +#: cove_360/views.py:40 cove_360/views.py:50 msgid "Try Again" msgstr "Inténtelo de nuevo" -#: cove_360/views.py:40 +#: cove_360/views.py:51 msgid "" -"We think you tried to upload a JSON file, but it is not well formed JSON.\n" -"\n" -" Error message: {}" +"360Giving JSON should have an object as the top level, the JSON you supplied" +" does not." msgstr "" -"Pensamos que está intentando enviar un archivo JSON, pero no está bien " -"formado JSON\n" -"\n" -" Mensaje de error: {}" - -#: cove_360/views.py:50 -msgid "" -"360Giving JSON should have an object as the top level, the JSON you supplied " -"does not." -msgstr "" -"360Giving JSON debe tener un objeto al nivel más alto pero el JSON que usted " -"ha aportado no lo es." - -#~ msgid "" -#~ "Most dates should be in the YYYY-MM-DD format, but the 360Giving Standard " -#~ "sets out the requirements for each field of the standard." -#~ msgstr "" -#~ "La mayoría de las fecha deben tener el formato AAAA-MM-DD, aunque el Estándar " -#~ "360Giving especifica requirimientos para cada campo del estándar" - -#~ msgid "" -#~ "Integers are basically numbers (but they are not decimals like financial " -#~ "values)." -#~ msgstr "" -#~ "Los enteros son básicamente números (pero no son decimales como valores " -#~ "financieros)." - -#~ msgid "" -#~ "Data in the standard is expected to be provided in a certain format. " -#~ "Sometimes spreadsheet software can alter the format of data so that it is " -#~ "no longer a string." -#~ msgstr "" -#~ "Los datos de la norma se espera que se presentará en un formato " -#~ "determinado. A veces software de hoja de cálculo puede alterar el formato " -#~ "de los datos de modo que ya no es una cadena." - -#~ msgid "click to see." -#~ msgstr "haga clic para ver." +"360Giving JSON debe tener un objeto al nivel más alto pero el JSON que usted" +" ha aportado no lo es." diff --git a/cove_iati/locale/en/LC_MESSAGES/django.po b/cove_iati/locale/en/LC_MESSAGES/django.po index 1822434b0..f6a708574 100644 --- a/cove_iati/locale/en/LC_MESSAGES/django.po +++ b/cove_iati/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-20 09:48+0000\n" +"POT-Creation-Date: 2018-10-30 16:05+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,22 +25,6 @@ msgstr "" msgid "Try Again" msgstr "" -#: cove_iati/lib/iati.py:32 -msgid "" -"We think you tried to upload a XML file, but it is not well formed XML.\n" -"\n" -" Error message: {}" -msgstr "" - -#: cove_iati/lib/iati.py:42 -msgid "" -"We think you tried to upload a XML file, but the encoding is incorrect.\n" -"\n" -" Error message: {}" -msgstr "" - #: cove_iati/templates/cove_iati/base.html:30 msgid "How to use " msgstr "" @@ -56,7 +40,8 @@ msgid "" msgstr "" #: cove_iati/templates/cove_iati/explore.html:29 -msgid "A file was " +#, python-format +msgid "An IATI %(schema_name)s file was" msgstr "" #: cove_iati/templates/cove_iati/explore.html:31 @@ -99,7 +84,7 @@ msgid "Invalid against Schema " msgstr "" #: cove_iati/templates/cove_iati/explore.html:96 -#: cove_iati/templates/cove_iati/explore.html:143 +#: cove_iati/templates/cove_iati/explore.html:144 #, python-format msgid " %(n_errors)s Error." msgid_plural "%(n_errors)s Errors " @@ -124,67 +109,67 @@ msgid "" "them in the table below." msgstr "" -#: cove_iati/templates/cove_iati/explore.html:138 -#: cove_iati/templates/cove_iati/explore.html:142 +#: cove_iati/templates/cove_iati/explore.html:139 +#: cove_iati/templates/cove_iati/explore.html:143 msgid "Ruleset Errors " msgstr "" -#: cove_iati/templates/cove_iati/explore.html:139 +#: cove_iati/templates/cove_iati/explore.html:140 msgid "Failed" msgstr "" -#: cove_iati/templates/cove_iati/explore.html:147 +#: cove_iati/templates/cove_iati/explore.html:148 msgid "Ruleset Checks" msgstr "" -#: cove_iati/templates/cove_iati/explore.html:157 +#: cove_iati/templates/cove_iati/explore.html:158 msgid "There was a problem running ruleset checks." msgstr "" -#: cove_iati/templates/cove_iati/explore.html:160 +#: cove_iati/templates/cove_iati/explore.html:161 msgid "" "This may be due to validation errors in your data, please fix them and try " "again." msgstr "" -#: cove_iati/templates/cove_iati/explore.html:163 +#: cove_iati/templates/cove_iati/explore.html:164 msgid "Sorry your data contains ruleset errors" msgstr "" -#: cove_iati/templates/cove_iati/explore.html:167 +#: cove_iati/templates/cove_iati/explore.html:168 msgid "Congratulations! Your data passes all IATI ruleset checks" msgstr "" -#: cove_iati/templates/cove_iati/explore.html:171 +#: cove_iati/templates/cove_iati/explore.html:172 msgid "" "There are some ruleset errors in your data, please check " "them in the table below." msgstr "" -#: cove_iati/templates/cove_iati/explore.html:187 +#: cove_iati/templates/cove_iati/explore.html:189 msgid "Download and Share" msgstr "" -#: cove_iati/templates/cove_iati/explore.html:194 +#: cove_iati/templates/cove_iati/explore.html:196 msgid "The following files are available to download:" msgstr "" -#: cove_iati/templates/cove_iati/explore.html:197 +#: cove_iati/templates/cove_iati/explore.html:199 msgid "Original file" msgstr "" -#: cove_iati/templates/cove_iati/explore.html:217 +#: cove_iati/templates/cove_iati/explore.html:219 msgid "Use the following url to share these results:" msgstr "" -#: cove_iati/templates/cove_iati/explore.html:223 +#: cove_iati/templates/cove_iati/explore.html:225 msgid "" "After 7 days all uploaded data is deleted from our servers, and the results " "will no longer be available. Anyone using the link to this page after that " "will be shown a message that tells them the file has been removed." msgstr "" -#: cove_iati/templates/cove_iati/explore.html:224 +#: cove_iati/templates/cove_iati/explore.html:226 msgid "" "These results will be available for 7 days from the day the data was first " "uploaded. You can revisit these results until then." @@ -215,14 +200,14 @@ msgstr "" msgid "Path" msgstr "" -#: cove_iati/views.py:32 +#: cove_iati/views.py:31 msgid "Upload a file (.csv, .xlsx, .xml)" msgstr "" -#: cove_iati/views.py:41 +#: cove_iati/views.py:40 msgid "Supply a URL" msgstr "" -#: cove_iati/views.py:46 +#: cove_iati/views.py:45 msgid "Paste (XML only)" msgstr "" diff --git a/cove_ocds/locale/en/LC_MESSAGES/django.po b/cove_ocds/locale/en/LC_MESSAGES/django.po index 5085d490b..1e9e2191a 100644 --- a/cove_ocds/locale/en/LC_MESSAGES/django.po +++ b/cove_ocds/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-20 09:48+0000\n" +"POT-Creation-Date: 2018-10-30 16:05+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,85 +17,36 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cove_ocds/lib/exceptions.py:8 +#: cove_ocds/lib/exceptions.py:9 msgid "Unrecognised version of the schema" msgstr "" -#: cove_ocds/lib/exceptions.py:10 cove_ocds/lib/exceptions.py:23 -#: cove_ocds/lib/exceptions.py:39 cove_ocds/lib/exceptions.py:52 -#: cove_ocds/views.py:46 cove_ocds/views.py:57 +#: cove_ocds/lib/exceptions.py:11 cove_ocds/lib/exceptions.py:24 +#: cove_ocds/lib/exceptions.py:40 cove_ocds/lib/exceptions.py:53 +#: cove_ocds/views.py:49 cove_ocds/views.py:60 msgid "Try Again" msgstr "" -#: cove_ocds/lib/exceptions.py:11 -msgid "" -"We think you tried to run your data against an unrecognised version of the " -"schema.\n" -"\n" -" Error message: {} is not a recognised choice " -"for the schema version" -msgstr "" - -#: cove_ocds/lib/exceptions.py:15 cove_ocds/lib/exceptions.py:31 +#: cove_ocds/lib/exceptions.py:16 cove_ocds/lib/exceptions.py:32 msgid "{} is not a valid schema version" msgstr "" -#: cove_ocds/lib/exceptions.py:21 +#: cove_ocds/lib/exceptions.py:22 msgid "Version format does not comply with the schema" msgstr "" -#: cove_ocds/lib/exceptions.py:24 -msgid "" -"The value for the \"version\" field in your data follows the " -"major.minor.patch pattern but according to the schema the patch " -"digit shouldn't be included (e.g. \"1.1.0\" should appear as " -"\"1.1\" in your data as the validator always uses the latest patch " -"release for a major.minor version).\n" -"\n" -"Please get rid of the patch digit and try again.\n" -"\n" -" Error message: {} format does not comply " -"with the schema" -msgstr "" - -#: cove_ocds/lib/exceptions.py:37 +#: cove_ocds/lib/exceptions.py:38 msgid "JSON reference error" msgstr "" -#: cove_ocds/lib/exceptions.py:40 -msgid "" -"We have detected a JSON reference error in the schema. This may be due to some extension trying to resolve non-existing references. \n" -"\n" -" Error message: {}" -msgstr "" - -#: cove_ocds/lib/exceptions.py:44 +#: cove_ocds/lib/exceptions.py:45 msgid "{}" msgstr "" -#: cove_ocds/lib/exceptions.py:50 cove_ocds/lib/exceptions.py:63 +#: cove_ocds/lib/exceptions.py:51 cove_ocds/lib/exceptions.py:64 msgid "Missing OCDS package" msgstr "" -#: cove_ocds/lib/exceptions.py:53 -msgid "" -"We could not detect a package structure at the top-level of your data. OCDS " -"releases and records should be published within a release package or record package to provide important meta-data. For " -"more information, please refer to the Releases " -"and Records section in the OCDS documentation.\n" -"\n" -" Error message: Missing OCDS package" -msgstr "" - #. Translators: Label of a button that triggers search #: cove_ocds/templates/cove_ocds/base.html:48 #: cove_ocds/templates/cove_ocds/explore_base.html:46 @@ -103,7 +54,7 @@ msgid "Go" msgstr "" #: cove_ocds/templates/cove_ocds/base.html:55 -msgid " Data Standard Validator" +msgid " Data Review Tool" msgstr "" #: cove_ocds/templates/cove_ocds/base.html:58 @@ -141,7 +92,7 @@ msgid "" msgstr "" #: cove_ocds/templates/cove_ocds/base.html:102 -msgid "Validate and Explore" +msgid "Check and Review" msgstr "" #: cove_ocds/templates/cove_ocds/base.html:103 @@ -155,17 +106,17 @@ msgid "" msgstr "" #: cove_ocds/templates/cove_ocds/base.html:106 -msgid "Inspect key contents of your data to check data quality" +msgid "Inspect key contents of your data to review data quality" msgstr "" #: cove_ocds/templates/cove_ocds/base.html:107 msgid "" "Access your data in different formats (spreadsheet and JSON) to support " -"further data validation." +"further review." msgstr "" #: cove_ocds/templates/cove_ocds/base.html:122 -msgid "Using the validator" +msgid "Using the data review tool" msgstr "" #: cove_ocds/templates/cove_ocds/base.html:123 @@ -202,9 +153,9 @@ msgstr "" #: cove_ocds/templates/cove_ocds/base.html:131 msgid "" -"If your data passes basic validation checks, the tool will then present a " -"report on data quality, and information about the contents of your file. It " -"will also offer alternative copies of the data for download. " +"If your data passes basic schema validation checks, the tool will then " +"present a report on data quality, and information about the contents of your " +"file. It will also offer alternative copies of the data for download. " msgstr "" #: cove_ocds/templates/cove_ocds/base.html:132 @@ -215,7 +166,7 @@ msgstr "" #: cove_ocds/templates/cove_ocds/base.html:133 msgid "" -"To preview how the validator works, try loading " "some sample data. " @@ -275,41 +226,41 @@ msgstr "" msgid "Schema Extensions" msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:196 +#: cove_ocds/templates/cove_ocds/explore_base.html:200 msgid "Conversion Errors" msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:218 +#: cove_ocds/templates/cove_ocds/explore_base.html:222 msgid "Conversion Errors (titles)" msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:246 -#: cove_ocds/templates/cove_ocds/explore_base.html:402 -#: cove_ocds/templates/cove_ocds/explore_base.html:405 +#: cove_ocds/templates/cove_ocds/explore_base.html:250 +#: cove_ocds/templates/cove_ocds/explore_base.html:406 +#: cove_ocds/templates/cove_ocds/explore_base.html:409 msgid "Validation Errors" msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:260 -#: cove_ocds/templates/cove_ocds/explore_base.html:420 -#: cove_ocds/templates/cove_ocds/explore_base.html:423 +#: cove_ocds/templates/cove_ocds/explore_base.html:264 +#: cove_ocds/templates/cove_ocds/explore_base.html:424 +#: cove_ocds/templates/cove_ocds/explore_base.html:427 msgid "Structure Warnings" msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:282 -#: cove_ocds/templates/cove_ocds/explore_base.html:408 -#: cove_ocds/templates/cove_ocds/explore_base.html:411 +#: cove_ocds/templates/cove_ocds/explore_base.html:286 +#: cove_ocds/templates/cove_ocds/explore_base.html:412 +#: cove_ocds/templates/cove_ocds/explore_base.html:415 msgid "Conformance (Rules)" msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:304 +#: cove_ocds/templates/cove_ocds/explore_base.html:308 msgid "Codelist Validation Errors" msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:326 +#: cove_ocds/templates/cove_ocds/explore_base.html:330 msgid "Additional Fields" msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:330 +#: cove_ocds/templates/cove_ocds/explore_base.html:334 msgid "" "This data includes the following fields which are not part of the OCDS " "schema. You should check whether the data in these fields could be provided " @@ -318,66 +269,66 @@ msgid "" "schema." msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:344 +#: cove_ocds/templates/cove_ocds/explore_base.html:348 msgid "Additional Codelist Values" msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:364 -#: cove_ocds/templates/cove_ocds/explore_base.html:444 -#: cove_ocds/templates/cove_ocds/explore_base.html:447 +#: cove_ocds/templates/cove_ocds/explore_base.html:368 +#: cove_ocds/templates/cove_ocds/explore_base.html:448 +#: cove_ocds/templates/cove_ocds/explore_base.html:451 msgid "Deprecated Fields" msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:364 +#: cove_ocds/templates/cove_ocds/explore_base.html:368 msgid "" "Fields flagged as 'deprecated' will be either replaced or removed in future " "versions of the schema." msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:380 +#: cove_ocds/templates/cove_ocds/explore_base.html:384 msgid "Save or Share these results" msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:381 +#: cove_ocds/templates/cove_ocds/explore_base.html:385 msgid "Use the following url to share these results:" msgstr "" #. Translators: Paragraph that describes the application -#: cove_ocds/templates/cove_ocds/explore_base.html:386 +#: cove_ocds/templates/cove_ocds/explore_base.html:390 msgid "" "These results will be available for 7 days from the day the data was first " "uploaded. You can revisit these results until then." msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:387 +#: cove_ocds/templates/cove_ocds/explore_base.html:391 msgid "" "After 7 days all uploaded data is deleted from our servers, and the results " "will no longer be available. Anyone using the link to this page after that " "will be shown a message that tells them the file has been removed." msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:414 +#: cove_ocds/templates/cove_ocds/explore_base.html:418 msgid "view all errors ▼" msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:417 -#: cove_ocds/templates/cove_ocds/explore_base.html:429 -#: cove_ocds/templates/cove_ocds/explore_base.html:435 +#: cove_ocds/templates/cove_ocds/explore_base.html:421 +#: cove_ocds/templates/cove_ocds/explore_base.html:433 +#: cove_ocds/templates/cove_ocds/explore_base.html:439 msgid "View all errors ▲" msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:426 +#: cove_ocds/templates/cove_ocds/explore_base.html:430 #: cove_ocds/templates/cove_ocds/ocds_missing_ids_table.html:6 #: cove_ocds/templates/cove_ocds/ocid_prefixes_table.html:5 msgid "View all errors ▼" msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:432 +#: cove_ocds/templates/cove_ocds/explore_base.html:436 msgid "Quality Warnings" msgstr "" -#: cove_ocds/templates/cove_ocds/explore_base.html:438 -#: cove_ocds/templates/cove_ocds/explore_base.html:441 +#: cove_ocds/templates/cove_ocds/explore_base.html:442 +#: cove_ocds/templates/cove_ocds/explore_base.html:445 msgid "Additional Fields (fields in data not in schema)" msgstr "" @@ -409,7 +360,6 @@ msgid "validation against " msgstr "" #: cove_ocds/templates/cove_ocds/explore_record.html:26 -#: cove_ocds/templates/cove_ocds/explore_release.html:24 msgid "See Validation Errors below." msgstr "" @@ -512,6 +462,10 @@ msgstr "" msgid "Records Table:" msgstr "" +#: cove_ocds/templates/cove_ocds/explore_release.html:24 +msgid "See Schema validation Errors below." +msgstr "" + #: cove_ocds/templates/cove_ocds/explore_release.html:28 msgid "Failed to apply " msgstr "" @@ -972,19 +926,11 @@ msgstr "" msgid "Open Contracting Identifier guidance" msgstr "" -#: cove_ocds/views.py:44 cove_ocds/views.py:55 +#: cove_ocds/views.py:47 cove_ocds/views.py:58 msgid "Sorry, we can't process that data" msgstr "" -#: cove_ocds/views.py:47 -msgid "" -"We think you tried to upload a JSON file, but it is not well formed JSON.\n" -"\n" -" Error message: {}" -msgstr "" - -#: cove_ocds/views.py:58 +#: cove_ocds/views.py:61 msgid "" "OCDS JSON should have an object as the top level, the JSON you supplied does " "not." diff --git a/cove_ocds/locale/es/LC_MESSAGES/django.po b/cove_ocds/locale/es/LC_MESSAGES/django.po index e76650567..625980b93 100644 --- a/cove_ocds/locale/es/LC_MESSAGES/django.po +++ b/cove_ocds/locale/es/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-20 09:48+0000\n" +"POT-Creation-Date: 2018-10-30 16:05+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Bibiana Cristofol , 2018\n" +"Last-Translator: Bibiana Cristòfol , 2018\n" "Language-Team: Spanish (https://www.transifex.com/OpenDataServices/teams/59127/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,80 +18,36 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: cove_ocds/lib/exceptions.py:8 +#: cove_ocds/lib/exceptions.py:9 msgid "Unrecognised version of the schema" msgstr "Versión del esquema no reconocida" -#: cove_ocds/lib/exceptions.py:10 cove_ocds/lib/exceptions.py:23 -#: cove_ocds/lib/exceptions.py:39 cove_ocds/lib/exceptions.py:52 -#: cove_ocds/views.py:46 cove_ocds/views.py:57 +#: cove_ocds/lib/exceptions.py:11 cove_ocds/lib/exceptions.py:24 +#: cove_ocds/lib/exceptions.py:40 cove_ocds/lib/exceptions.py:53 +#: cove_ocds/views.py:49 cove_ocds/views.py:60 msgid "Try Again" msgstr "Inténtelo de nuevo" -#: cove_ocds/lib/exceptions.py:11 -msgid "" -"We think you tried to run your data against an unrecognised version of the schema.\n" -"\n" -" Error message: {} is not a recognised choice for the schema version" -msgstr "" -"Nos parece que ha intentando validar sus datos usando una versión del esquema no reconocida.\n" -"\n" -" Mensaje del error: {} no es una opción reconocida como versión del esquema" - -#: cove_ocds/lib/exceptions.py:15 cove_ocds/lib/exceptions.py:31 +#: cove_ocds/lib/exceptions.py:16 cove_ocds/lib/exceptions.py:32 msgid "{} is not a valid schema version" msgstr "{} no es una versión válida del esquema" -#: cove_ocds/lib/exceptions.py:21 +#: cove_ocds/lib/exceptions.py:22 msgid "Version format does not comply with the schema" msgstr "El formato de la versión no se ajusta al esquema" -#: cove_ocds/lib/exceptions.py:24 -msgid "" -"The value for the \"version\" field in your data follows the major.minor.patch pattern but according to the schema the patch digit shouldn't be included (e.g. \"1.1.0\" should appear as \"1.1\" in your data as the validator always uses the latest patch release for a major.minor version).\n" -"\n" -"Please get rid of the patch digit and try again.\n" -"\n" -" Error message: {} format does not comply with the schema" -msgstr "" -"El valor de el campo \"version\" en sus datos sigue el patrón mayor.menor.parche pero según el esquema el dígito del parche no debe ser incluido (por ejemplo, \"1.1.0\" debería aparecer como \"1.1\" en sus datos ya que el validador siempre usa el parche más reciente para una versión mayor.menor)\n" -"\n" -"Por favor excluya el dígito del parche e inténtenlo de nuevo.\n" -"\n" -"Mensaje del error: {} el formato no concuerda con el esquema" - -#: cove_ocds/lib/exceptions.py:37 +#: cove_ocds/lib/exceptions.py:38 msgid "JSON reference error" msgstr "Error de referencia en JSON" -#: cove_ocds/lib/exceptions.py:40 -msgid "" -"We have detected a JSON reference error in the schema. This may be due to some extension trying to resolve non-existing references. \n" -"\n" -" Error message: {}" -msgstr "" -"Hemos detectado un error de referencia en JSON. Esto podría ser debido a alguna extensión intentando resolver una referencia que no existe.\n" -"\n" -"Mensaje del error:{} " - -#: cove_ocds/lib/exceptions.py:44 +#: cove_ocds/lib/exceptions.py:45 msgid "{}" msgstr "{}" -#: cove_ocds/lib/exceptions.py:50 cove_ocds/lib/exceptions.py:63 +#: cove_ocds/lib/exceptions.py:51 cove_ocds/lib/exceptions.py:64 msgid "Missing OCDS package" msgstr "Paquete OCDS no encontrado" -#: cove_ocds/lib/exceptions.py:53 -msgid "" -"We could not detect a package structure at the top-level of your data. OCDS releases and records should be published within a release package or record package to provide important meta-data. For more information, please refer to the Releases and Records section in the OCDS documentation.\n" -"\n" -" Error message: Missing OCDS package" -msgstr "" -"No hemos podido detectar una estructura de paquete en sus datos. Entregras y registros del OCDS deben ser publicados como un paquete de entregas o como un paquete de registros, los cuales proveen importantes meta-datos. Para obtener más información, por favor consulte la sección Entregas y Registros en la documentación del OCDS\n" -"\n" -"Mensaje del error: No se ha podido encontrar un paquete del OCDS " - #. Translators: Label of a button that triggers search #: cove_ocds/templates/cove_ocds/base.html:48 #: cove_ocds/templates/cove_ocds/explore_base.html:46 @@ -99,8 +55,8 @@ msgid "Go" msgstr "Ir" #: cove_ocds/templates/cove_ocds/base.html:55 -msgid " Data Standard Validator" -msgstr "Validador del Estándar de Datos " +msgid " Data Review Tool" +msgstr "Herramienta de revisión de datos" #: cove_ocds/templates/cove_ocds/base.html:58 msgid " Standard Documentation " @@ -145,8 +101,8 @@ msgstr "" "trabaja para cambiar esto." #: cove_ocds/templates/cove_ocds/base.html:102 -msgid "Validate and Explore" -msgstr "Validar y Explorar" +msgid "Check and Review" +msgstr "Comprobar y revisar" #: cove_ocds/templates/cove_ocds/base.html:103 msgid "This tool helps you to:" @@ -162,20 +118,20 @@ msgstr "" ".open-contracting.org/latest/es/schema/\"> esquema" #: cove_ocds/templates/cove_ocds/base.html:106 -msgid "Inspect key contents of your data to check data quality" -msgstr "Inspeccionar contenido clave de sus datos para comprobar su calidad" +msgid "Inspect key contents of your data to review data quality" +msgstr "Inspecciona el contenido clave de tus datos para revisar su calidad." #: cove_ocds/templates/cove_ocds/base.html:107 msgid "" "Access your data in different formats (spreadsheet and JSON) to support " -"further data validation." +"further review." msgstr "" -"Acceder a sus datos en distintos formatos (hoja de cálculo y JSON) para así " -"ayudar con futuras validaciones de los datos." +"Accede a tus datos en distintos formatos (hoja de cálculo y JSON) para así " +"ayudar a mantener futuras revisiones." #: cove_ocds/templates/cove_ocds/base.html:122 -msgid "Using the validator" -msgstr "Uso del validador" +msgid "Using the data review tool" +msgstr "Uso de la herramienta de revisión de datos" #: cove_ocds/templates/cove_ocds/base.html:123 msgid "" @@ -227,14 +183,14 @@ msgstr "" #: cove_ocds/templates/cove_ocds/base.html:131 msgid "" -"If your data passes basic validation checks, the tool will then present a " -"report on data quality, and information about the contents of your file. It " -"will also offer alternative copies of the data for download. " +"If your data passes basic schema validation checks, the tool will then " +"present a report on data quality, and information about the contents of your" +" file. It will also offer alternative copies of the data for download. " msgstr "" -"Si sus datos pasan las comprobaciones básicas de validación, la herramienta" -" presentará un informe sobre la calidad de los datos e información sobre " -"el contenido de su archivo. La herramienta también le ofrecerá copias " -"alternativas de los datos para descargar. " +"Si tus datos pasan las comprobaciones básicas de validación del schema, la " +"herramienta presentará un informe sobre la calidad de los datos e " +"información sobre el contenido de su archivo. También ofrecerá copias " +"alternativas de los datos para su descarga." #: cove_ocds/templates/cove_ocds/base.html:132 msgid "" @@ -247,15 +203,15 @@ msgstr "" #: cove_ocds/templates/cove_ocds/base.html:133 msgid "" -"To preview how the validator works, try loading some sample data. " msgstr "" -"Para ver como funciona el validador pruebe a subir algunos datos de muestra." +"213czf-000-00001-02-tender.json\"> subir algunos datos de muestra." #: cove_ocds/templates/cove_ocds/deprecated_fields_table.html:7 msgid "Field" @@ -313,41 +269,41 @@ msgstr "Convertir a hoja de cálculo" msgid "Schema Extensions" msgstr "Extensiones del Esquema" -#: cove_ocds/templates/cove_ocds/explore_base.html:196 +#: cove_ocds/templates/cove_ocds/explore_base.html:200 msgid "Conversion Errors" msgstr "Errores de Conversión" -#: cove_ocds/templates/cove_ocds/explore_base.html:218 +#: cove_ocds/templates/cove_ocds/explore_base.html:222 msgid "Conversion Errors (titles)" msgstr "Errores de Conversión (títulos)" -#: cove_ocds/templates/cove_ocds/explore_base.html:246 -#: cove_ocds/templates/cove_ocds/explore_base.html:402 -#: cove_ocds/templates/cove_ocds/explore_base.html:405 +#: cove_ocds/templates/cove_ocds/explore_base.html:250 +#: cove_ocds/templates/cove_ocds/explore_base.html:406 +#: cove_ocds/templates/cove_ocds/explore_base.html:409 msgid "Validation Errors" msgstr "Errores de validación" -#: cove_ocds/templates/cove_ocds/explore_base.html:260 -#: cove_ocds/templates/cove_ocds/explore_base.html:420 -#: cove_ocds/templates/cove_ocds/explore_base.html:423 +#: cove_ocds/templates/cove_ocds/explore_base.html:264 +#: cove_ocds/templates/cove_ocds/explore_base.html:424 +#: cove_ocds/templates/cove_ocds/explore_base.html:427 msgid "Structure Warnings" msgstr "Advertencias de Estructura" -#: cove_ocds/templates/cove_ocds/explore_base.html:282 -#: cove_ocds/templates/cove_ocds/explore_base.html:408 -#: cove_ocds/templates/cove_ocds/explore_base.html:411 +#: cove_ocds/templates/cove_ocds/explore_base.html:286 +#: cove_ocds/templates/cove_ocds/explore_base.html:412 +#: cove_ocds/templates/cove_ocds/explore_base.html:415 msgid "Conformance (Rules)" msgstr "Conformidad (Reglas)" -#: cove_ocds/templates/cove_ocds/explore_base.html:304 +#: cove_ocds/templates/cove_ocds/explore_base.html:308 msgid "Codelist Validation Errors" msgstr "Errores de Validación de Listas de Códigos" -#: cove_ocds/templates/cove_ocds/explore_base.html:326 +#: cove_ocds/templates/cove_ocds/explore_base.html:330 msgid "Additional Fields" msgstr "Campos adicionales" -#: cove_ocds/templates/cove_ocds/explore_base.html:330 +#: cove_ocds/templates/cove_ocds/explore_base.html:334 msgid "" "This data includes the following fields which are not part of the OCDS " "schema. You should check whether the data in these fields could be provided " @@ -361,17 +317,17 @@ msgstr "" "href=\"http://standard.open-" "contracting.org/latest/en/extensions/\">extensión existente del esquema." -#: cove_ocds/templates/cove_ocds/explore_base.html:344 +#: cove_ocds/templates/cove_ocds/explore_base.html:348 msgid "Additional Codelist Values" msgstr "Valores Adicionales de Listas de Códigos" -#: cove_ocds/templates/cove_ocds/explore_base.html:364 -#: cove_ocds/templates/cove_ocds/explore_base.html:444 -#: cove_ocds/templates/cove_ocds/explore_base.html:447 +#: cove_ocds/templates/cove_ocds/explore_base.html:368 +#: cove_ocds/templates/cove_ocds/explore_base.html:448 +#: cove_ocds/templates/cove_ocds/explore_base.html:451 msgid "Deprecated Fields" msgstr "Campos Obsoletos" -#: cove_ocds/templates/cove_ocds/explore_base.html:364 +#: cove_ocds/templates/cove_ocds/explore_base.html:368 msgid "" "Fields flagged as 'deprecated' will be either replaced or removed in future " "versions of the schema." @@ -379,16 +335,16 @@ msgstr "" "Campos marcados como 'obsoletos' serán reemplazados o eliminados en futuras " "versiones del esquema." -#: cove_ocds/templates/cove_ocds/explore_base.html:380 +#: cove_ocds/templates/cove_ocds/explore_base.html:384 msgid "Save or Share these results" msgstr "Guardar o Compartir estos resultados" -#: cove_ocds/templates/cove_ocds/explore_base.html:381 +#: cove_ocds/templates/cove_ocds/explore_base.html:385 msgid "Use the following url to share these results:" msgstr "Utilice el siguiente enlace para compartir estos resultados:" #. Translators: Paragraph that describes the application -#: cove_ocds/templates/cove_ocds/explore_base.html:386 +#: cove_ocds/templates/cove_ocds/explore_base.html:390 msgid "" "These results will be available for 7 days from the day the data was first " "uploaded. You can revisit these results until then." @@ -396,7 +352,7 @@ msgstr "" "Estos resultados estarán disponibles durante 7 días desde el día en que los " "datos se cargan. Puede revisar estos resultados hasta entonces." -#: cove_ocds/templates/cove_ocds/explore_base.html:387 +#: cove_ocds/templates/cove_ocds/explore_base.html:391 msgid "" "After 7 days all uploaded data is deleted from our servers, and the results " "will no longer be available. Anyone using the link to this page after that " @@ -407,28 +363,28 @@ msgstr "" "que use el enlace a esta página después de ese momento verá un aviso de que " "el archivo ha sido eliminado." -#: cove_ocds/templates/cove_ocds/explore_base.html:414 +#: cove_ocds/templates/cove_ocds/explore_base.html:418 msgid "view all errors ▼" msgstr "ver todos los errores ▼" -#: cove_ocds/templates/cove_ocds/explore_base.html:417 -#: cove_ocds/templates/cove_ocds/explore_base.html:429 -#: cove_ocds/templates/cove_ocds/explore_base.html:435 +#: cove_ocds/templates/cove_ocds/explore_base.html:421 +#: cove_ocds/templates/cove_ocds/explore_base.html:433 +#: cove_ocds/templates/cove_ocds/explore_base.html:439 msgid "View all errors ▲" msgstr "Vea todos los errores ▲" -#: cove_ocds/templates/cove_ocds/explore_base.html:426 +#: cove_ocds/templates/cove_ocds/explore_base.html:430 #: cove_ocds/templates/cove_ocds/ocds_missing_ids_table.html:6 #: cove_ocds/templates/cove_ocds/ocid_prefixes_table.html:5 msgid "View all errors ▼" msgstr "Vea todos los errores ▼" -#: cove_ocds/templates/cove_ocds/explore_base.html:432 +#: cove_ocds/templates/cove_ocds/explore_base.html:436 msgid "Quality Warnings" msgstr "Advertencias de Calidad" -#: cove_ocds/templates/cove_ocds/explore_base.html:438 -#: cove_ocds/templates/cove_ocds/explore_base.html:441 +#: cove_ocds/templates/cove_ocds/explore_base.html:442 +#: cove_ocds/templates/cove_ocds/explore_base.html:445 msgid "Additional Fields (fields in data not in schema)" msgstr "Campos adicionales (campos en los datos que no están en el esquema)" @@ -462,7 +418,6 @@ msgid "validation against " msgstr "validación de acuerdo con " #: cove_ocds/templates/cove_ocds/explore_record.html:26 -#: cove_ocds/templates/cove_ocds/explore_release.html:24 msgid "See Validation Errors below." msgstr "Ver errores de validación más abajo." @@ -573,6 +528,12 @@ msgstr "OCIDs únicas" msgid "Records Table:" msgstr "Tabla de Registros:" +#: cove_ocds/templates/cove_ocds/explore_release.html:24 +msgid "See Schema validation Errors below." +msgstr "" +"Ver errores de validación del Schema más " +"abajo." + #: cove_ocds/templates/cove_ocds/explore_release.html:28 msgid "Failed to apply " msgstr " Ha fallado al aplicar" @@ -1077,21 +1038,11 @@ msgstr "Para mas información vea" msgid "Open Contracting Identifier guidance" msgstr "Guía para indentificadores de Contratos Abiertos " -#: cove_ocds/views.py:44 cove_ocds/views.py:55 +#: cove_ocds/views.py:47 cove_ocds/views.py:58 msgid "Sorry, we can't process that data" msgstr "Lo sentimos, no podemos procesar esos datos" -#: cove_ocds/views.py:47 -msgid "" -"We think you tried to upload a JSON file, but it is not well formed JSON.\n" -"\n" -" Error message: {}" -msgstr "" -"Creemos que está intentando enviar un archivo JSON que contiene algunos errores de forma\n" -"\n" -" Mensaje del error: {}" - -#: cove_ocds/views.py:58 +#: cove_ocds/views.py:61 msgid "" "OCDS JSON should have an object as the top level, the JSON you supplied does" " not." diff --git a/cove_ocds/settings.py b/cove_ocds/settings.py index 20c465494..76e0f5f4e 100644 --- a/cove_ocds/settings.py +++ b/cove_ocds/settings.py @@ -33,8 +33,8 @@ COVE_CONFIG = { 'app_name': 'cove_ocds', 'app_base_template': 'cove_ocds/base.html', - 'app_verbose_name': 'Open Contracting Data Standard Validator', - 'app_strapline': 'Validate and Explore your data.', + 'app_verbose_name': 'Open Contracting Data Review Tool', + 'app_strapline': 'Review your OCDS data.', 'schema_name': {'release': 'release-package-schema.json', 'record': 'record-package-schema.json'}, 'schema_item_name': 'release-schema.json', 'schema_host': None, diff --git a/cove_ocds/templates/cove_ocds/base.html b/cove_ocds/templates/cove_ocds/base.html index e9414a169..b3da66cfa 100644 --- a/cove_ocds/templates/cove_ocds/base.html +++ b/cove_ocds/templates/cove_ocds/base.html @@ -52,7 +52,7 @@

- {% block h1 %}

{% blocktrans %} Data Standard Validator{% endblocktrans %}

beta

{% endblock %} + {% block h1 %}

{% blocktrans %} Data Review Tool{% endblocktrans %}

beta

{% endblock %}

{% blocktrans %} Standard Documentation {% endblocktrans %}

 @@ -99,12 +99,12 @@

{% blocktrans %}About OCDS {%endblocktrans
-

{% blocktrans %}Validate and Explore{%endblocktrans%}

+

{% blocktrans %}Check and Review{%endblocktrans%}

{% blocktrans %}This tool helps you to:{%endblocktrans%}

  • {% blocktrans %}Check that your OCDS data complies with the schema{%endblocktrans%}
    • -
  • {% blocktrans %}Inspect key contents of your data to check data quality{%endblocktrans%}
    • -
  • {% blocktrans %}Access your data in different formats (spreadsheet and JSON) to support further data validation.{%endblocktrans%}
    • +
  • {% blocktrans %}Inspect key contents of your data to review data quality{%endblocktrans%}
    • +
  • {% blocktrans %}Access your data in different formats (spreadsheet and JSON) to support further review.{%endblocktrans%}

@@ -119,7 +119,7 @@

{% blocktrans %}Validate and Explore{%endbl
-

{% blocktrans %}Using the validator{%endblocktrans%}

+

{% blocktrans %}Using the data review tool{%endblocktrans%}

{% blocktrans %}You can upload, paste or provide a link to data published using the Open Contracting Data Standard. This can be:{%endblocktrans%}

    @@ -128,9 +128,9 @@

    {% blocktrans %}Using the validator{%endbl

{% blocktrans %}Supported encodings are UTF-8 for JSON and UTF-8, Windows-1252 and ISO-8859-1 for CSV.{% endblocktrans%}

{% blocktrans %}The application works with both 'release' and 'record' OCDS documents that conform to the Open Data Contracting Standard {%endblocktrans%}

-

{% blocktrans %}If your data passes basic validation checks, the tool will then present a report on data quality, and information about the contents of your file. It will also offer alternative copies of the data for download. {%endblocktrans%}

+

{% blocktrans %}If your data passes basic schema validation checks, the tool will then present a report on data quality, and information about the contents of your file. It will also offer alternative copies of the data for download. {%endblocktrans%}

{% blocktrans %}Data is stored for 7 days at a randomly generated URL. You can share this link with others to support discussion of data quality. {%endblocktrans%}

-

{% blocktrans %}To preview how the validator works, try loading some sample data. {% endblocktrans%}

+

{% blocktrans %}To preview how the data review tool works, try loading some sample data. {% endblocktrans%}

diff --git a/cove_ocds/templates/cove_ocds/explore_base.html b/cove_ocds/templates/cove_ocds/explore_base.html index b656c85d5..91c9476aa 100644 --- a/cove_ocds/templates/cove_ocds/explore_base.html +++ b/cove_ocds/templates/cove_ocds/explore_base.html @@ -20,12 +20,12 @@

Schema

{% if unrecognized_version_data %}
-  Your data specifies a version {{unrecognized_version_data}} which is not recognised. For that reason, it's been validated against the current default version. +  Your data specifies a version {{unrecognized_version_data}} which is not recognised. For that reason, it's been checked against the current default version.
{% endif %} -

This data has been checked against OCDS {% if releases %}release {% endif %}{% if records %}record {% endif %}package schema version {{ version_used_display }}. You can choose a different version of the schema to validate and explore your data.

+

This data has been checked against OCDS {% if releases %}release {% endif %}{% if records %}record {% endif %}package schema version {{ version_used_display }}. You can choose a different version of the schema to check and explore your data.


- Validate and explore same data against a different version of the schema + Check and explore same data against a different version of the schema
Switching the schema version will result in changes to CoVE output and conversions. If you revisit or share this URL, the lastest version selected will be used to check your data @@ -184,7 +184,7 @@

{% endif %}  Get a copy of the schema with extension patches applied {% else %} -

None of the extensions above could be applied. Your data has been validated against a schema with no extensions.

+

None of the extensions above could be applied. Your data has been checked against a schema with no extensions.

{% endif %}

@@ -202,7 +202,7 @@

{% if file_type == 'xlsx' or file_type == 'csv' %} -

In order to validate your data we need to convert it. During that conversion we found the following issues:

+

In order to check your data we need to convert it. During that conversion we found the following issues:

{% endif %}
    {% for warning_message in conversion_warning_messages %} @@ -224,7 +224,7 @@

{% if file_type == 'xlsx' or file_type == 'csv' %} -

In order to validate your data we need to convert it. During that conversion we found the following issues:

+

In order to check your data we need to convert it. During that conversion we found the following issues:

{% endif %}
    {% for warning_message in conversion_warning_messages_titles %} @@ -310,7 +310,7 @@

- The fields below use closed codelists. When using these fields, you must use one of the pre-defined codelist values. If you use a value that is not on the relevant codelist, your data will not pass validation. Where you see + or - this indicates that the codelist has been modified with these additions (+) or subtractions (-) by one or more extensions. + The fields below use closed codelists. When using these fields, you must use one of the pre-defined codelist values. If you use a value that is not on the relevant codelist, your data will not pass schema validation checks. Where you see + or - this indicates that the codelist has been modified with these additions (+) or subtractions (-) by one or more extensions. {% with additional_codelist_values=additional_closed_codelist_values %}
{% include "additional_codelist_values.html" %}
{% endwith %} diff --git a/cove_ocds/templates/cove_ocds/explore_release.html b/cove_ocds/templates/cove_ocds/explore_release.html index 7aeb5e86a..d254661ae 100644 --- a/cove_ocds/templates/cove_ocds/explore_release.html +++ b/cove_ocds/templates/cove_ocds/explore_release.html @@ -21,7 +21,7 @@

{% trans 'Headlines' %}

{% trans "Passed " %} {% endif %} {% blocktrans %}validation against {% endblocktrans %}OCDS release package schema version {{ version_used_display }}. - {% if validation_errors %}
{% blocktrans %}See Validation Errors below.{% endblocktrans %}{% endif %} + {% if validation_errors %}
{% blocktrans %}See Schema validation Errors below.{% endblocktrans %}{% endif %}
{% if extensions and extensions.invalid_extension %}
diff --git a/cove_ocds/tests_functional.py b/cove_ocds/tests_functional.py index f65b23ce6..cc8878f97 100644 --- a/cove_ocds/tests_functional.py +++ b/cove_ocds/tests_functional.py @@ -9,7 +9,7 @@ from selenium.webdriver.support.ui import Select from selenium.webdriver.chrome.options import Options -PREFIX_OCDS = os.environ.get('PREFIX_OCDS', '/validator/') +PREFIX_OCDS = os.environ.get('PREFIX_OCDS', '/review/') BROWSER = os.environ.get('BROWSER', 'ChromeHeadless') @@ -80,8 +80,8 @@ def test_footer_ocds(server_url, browser, link_text, expected_text, css_selector def test_index_page_ocds(server_url, browser): browser.get(server_url) - assert 'Data Standard Validator' in browser.find_element_by_tag_name('body').text - assert 'Using the validator' in browser.find_element_by_tag_name('body').text + assert 'Data Review Tool' in browser.find_element_by_tag_name('body').text + assert 'Using the data review tool' in browser.find_element_by_tag_name('body').text assert "'release'" in browser.find_element_by_tag_name('body').text assert "'record'" in browser.find_element_by_tag_name('body').text @@ -199,7 +199,7 @@ def test_500_error(server_url, browser): 'is not valid under any of the given schemas', '/records/compiledRelease/tender/targets', 'The schema version specified in the file is 1.1', - '/records/releases/tender/targets'], ['validated against a schema with no extensions'], True), + '/records/releases/tender/targets'], ['checked against a schema with no extensions'], True), ('tenders_releases_deprecated_fields_against_1_1_live.json', ['Deprecated Fields', 'The single amendment object has been deprecated', 'documents at the milestone level is now deprecated', @@ -265,7 +265,7 @@ def test_500_error(server_url, browser): # Test "version" value in data ('tenders_releases_1_release_with_unrecognized_version.json', ['Your data specifies a version 123.123 which is not recognised', 'checked against OCDS release package schema version {}. You can'.format(OCDS_DEFAULT_SCHEMA_VERSION), - 'validated against the current default version.', + 'checked against the current default version.', 'Convert to Spreadsheet'], ['Additional Fields (fields in data not in schema)', 'Error message'], False), ('tenders_releases_1_release_with_wrong_version_type.json', ['Your data specifies a version 1000 (it must be a string) which is not recognised', @@ -329,7 +329,7 @@ def check_url_input_result_page(server_url, browser, httpserver, source_filename for text in not_expected_text: assert text not in body_text - assert 'Data Standard Validator' in browser.find_element_by_tag_name('body').text + assert 'Data Review Tool' in browser.find_element_by_tag_name('body').text # assert 'Release Table' in browser.find_element_by_tag_name('body').text if conversion_successful: @@ -558,7 +558,7 @@ def test_url_input_with_version_change(server_url, url_input_browser, httpserver 'Get a copy of the schema with extension patches applied', 'The following extensions failed', 'extensions were not introduced in the schema until version 1.1.'], - ['validated against a schema with no extensions']), + ['checked against a schema with no extensions']), ('tenders_releases_1_release_with_all_invalid_extensions.json', ['None of the extensions above could be applied', 'extensions were not introduced in the schema until version 1.1.'], ['Party Scale', diff --git a/cove_ocds/urls.py b/cove_ocds/urls.py index 0b31f2eed..0c3f63244 100644 --- a/cove_ocds/urls.py +++ b/cove_ocds/urls.py @@ -13,8 +13,8 @@ urlpatterns_core += [url(r'^data/(.+)$', cove_ocds.views.explore_ocds, name='explore')] urlpatterns = [ - url(r'^$', RedirectView.as_view(url='validator/', permanent=False)), - url('^validator/', include(urlpatterns_core)), + url(r'^$', RedirectView.as_view(url='review/', permanent=False)), + url('^review/', include(urlpatterns_core)), ] urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/docs/deployment.md b/docs/deployment.md index 7e27e8550..ae735e115 100644 --- a/docs/deployment.md +++ b/docs/deployment.md @@ -15,7 +15,7 @@ Travis tests will fail if a branch isn't ready to be merged and deployed. This i ``` salt-ssh --state-output=mixed -L 'cove-live-ocds-2' state.highstate ``` -2. Check that the latest commit is shown in the footer of +2. Check that the latest commit is shown in the footer of 3. Test that the live site is working as expected. From the cove directory: diff --git a/secret_data_test.py b/secret_data_test.py index 6af569690..c56f2a1c7 100644 --- a/secret_data_test.py +++ b/secret_data_test.py @@ -63,7 +63,7 @@ os.makedirs(output_dir, exist_ok=True) output_filename = os.path.join(output_dir, 'validation_errors.json') with open(output_filename, 'w+') as output_file: - response = requests.post('http://localhost:8009/validator/', files={'original_file': open(original_file, 'rb')}, data={'csrfmiddlewaretoken': 'foo'}, headers={'Cookie': 'csrftoken=' + 'foo'}) + response = requests.post('http://localhost:8009/review/', files={'original_file': open(original_file, 'rb')}, data={'csrfmiddlewaretoken': 'foo'}, headers={'Cookie': 'csrftoken=' + 'foo'}) parsed = urlparse(response.url) new_tuple = parsed.scheme, parsed.netloc, '/media/' + parsed.path.split('/')[-1] + '/validation_errors-3.json', '', '', ''