From d05e36d607c13e62394c06258deb24a7c3627a28 Mon Sep 17 00:00:00 2001 From: Ben Webb Date: Thu, 26 Sep 2019 11:57:24 +0100 Subject: [PATCH 1/6] [#895] Update lib-cove to a dev commit --- cove_ocds/tests_functional.py | 1 - requirements.in | 2 +- requirements.txt | 2 +- requirements_dev.txt | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cove_ocds/tests_functional.py b/cove_ocds/tests_functional.py index 300bb5aa8..bd96c3ae8 100644 --- a/cove_ocds/tests_functional.py +++ b/cove_ocds/tests_functional.py @@ -196,7 +196,6 @@ def test_500_error(server_url, browser): 'Get a copy of the schema with extension patches applied', 'The following extensions failed', "Invalid code found in scale", - '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'], ['checked against a schema with no extensions'], True), diff --git a/requirements.in b/requirements.in index b770e9b1a..3ce3e53ee 100644 --- a/requirements.in +++ b/requirements.in @@ -4,7 +4,7 @@ Django<1.12 -e git+https://github.com/OpenDataServices/flatten-tool.git@v0.9.0#egg=flattentool -e git+https://github.com/open-contracting/lib-cove-ocds.git@v0.7.1#egg=libcoveocds -e git+https://github.com/OpenDataServices/lib-cove-web.git@v0.9.2#egg=libcoveweb --e git+https://github.com/OpenDataServices/lib-cove.git@v0.8.0#egg=libcove +-e git+https://github.com/OpenDataServices/lib-cove.git@b2011f29bbbb00466c8662d7511e00524dc54e32#egg=libcove django-bootstrap3 django-debug-toolbar requests diff --git a/requirements.txt b/requirements.txt index 24014ae28..e085f1bd8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ Django==1.11.23 # rq.filter: <1.12 -e git+https://github.com/OpenDataServices/flatten-tool.git@511cc6d1ee83d77aa7a1efe965eb3dd7e4940c1b#egg=flattentool -e git+https://github.com/open-contracting/lib-cove-ocds.git@4fbdd620f40698e1566deae159e356250ed869cf#egg=libcoveocds -e git+https://github.com/OpenDataServices/lib-cove-web.git@62663c3dd6f71c57d53dc5ea7a285210b140f4ab#egg=libcoveweb --e git+https://github.com/OpenDataServices/lib-cove.git@61ed8d096817c52a845ac7b1e84ae5b11e19af77#egg=libcove +-e git+https://github.com/OpenDataServices/lib-cove.git@b2011f29bbbb00466c8662d7511e00524dc54e32#egg=libcove django-bootstrap3==11.1.0 django-debug-toolbar==2.0 requests==2.22.0 diff --git a/requirements_dev.txt b/requirements_dev.txt index 012745c83..1113c71a1 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -3,7 +3,7 @@ Django==1.11.23 # rq.filter: <1.12 -e git+https://github.com/OpenDataServices/flatten-tool.git@511cc6d1ee83d77aa7a1efe965eb3dd7e4940c1b#egg=flattentool -e git+https://github.com/open-contracting/lib-cove-ocds.git@4fbdd620f40698e1566deae159e356250ed869cf#egg=libcoveocds -e git+https://github.com/OpenDataServices/lib-cove-web.git@62663c3dd6f71c57d53dc5ea7a285210b140f4ab#egg=libcoveweb --e git+https://github.com/OpenDataServices/lib-cove.git@61ed8d096817c52a845ac7b1e84ae5b11e19af77#egg=libcove +-e git+https://github.com/OpenDataServices/lib-cove.git@b2011f29bbbb00466c8662d7511e00524dc54e32#egg=libcove django-bootstrap3==11.1.0 django-debug-toolbar==2.0 requests==2.22.0 From 31b6c9274cd603c0f42e7c57c7713fa30a346fbf Mon Sep 17 00:00:00 2001 From: Ben Webb Date: Tue, 1 Oct 2019 13:37:46 +0100 Subject: [PATCH 2/6] [#895] Add text about embedded/linked releases assumptions for oneOf --- cove_ocds/templates/cove_ocds/validation_table.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cove_ocds/templates/cove_ocds/validation_table.html b/cove_ocds/templates/cove_ocds/validation_table.html index 2127110df..ea55cded9 100644 --- a/cove_ocds/templates/cove_ocds/validation_table.html +++ b/cove_ocds/templates/cove_ocds/validation_table.html @@ -24,6 +24,11 @@ {% if error.message_type in common_error_types %} (more info) {% endif %} + {% if error.assumption == 'embedded_releases' %} + (Assuming these are embedded releases, because they have an id). + {% elif error.assumption == 'linked_releases' %} + (Assuming these are linked releases, because they lack an id). + {% endif %}

{% if 'schema_title' in error %}
From ae39abc6239dedb58f567d784c48eb958ab35b2b Mon Sep 17 00:00:00 2001 From: Ben Webb Date: Tue, 8 Oct 2019 18:28:32 +0100 Subject: [PATCH 3/6] [#895] Update lib-cove requirement to 0.11.0 release --- requirements.in | 2 +- requirements.txt | 2 +- requirements_dev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.in b/requirements.in index 3ce3e53ee..94f926b33 100644 --- a/requirements.in +++ b/requirements.in @@ -4,7 +4,7 @@ Django<1.12 -e git+https://github.com/OpenDataServices/flatten-tool.git@v0.9.0#egg=flattentool -e git+https://github.com/open-contracting/lib-cove-ocds.git@v0.7.1#egg=libcoveocds -e git+https://github.com/OpenDataServices/lib-cove-web.git@v0.9.2#egg=libcoveweb --e git+https://github.com/OpenDataServices/lib-cove.git@b2011f29bbbb00466c8662d7511e00524dc54e32#egg=libcove +-e git+https://github.com/OpenDataServices/lib-cove.git@v0.11.0#egg=libcove django-bootstrap3 django-debug-toolbar requests diff --git a/requirements.txt b/requirements.txt index e085f1bd8..08741400f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ Django==1.11.23 # rq.filter: <1.12 -e git+https://github.com/OpenDataServices/flatten-tool.git@511cc6d1ee83d77aa7a1efe965eb3dd7e4940c1b#egg=flattentool -e git+https://github.com/open-contracting/lib-cove-ocds.git@4fbdd620f40698e1566deae159e356250ed869cf#egg=libcoveocds -e git+https://github.com/OpenDataServices/lib-cove-web.git@62663c3dd6f71c57d53dc5ea7a285210b140f4ab#egg=libcoveweb --e git+https://github.com/OpenDataServices/lib-cove.git@b2011f29bbbb00466c8662d7511e00524dc54e32#egg=libcove +-e git+https://github.com/OpenDataServices/lib-cove.git@b6323033a8634f03121b099937551e8003bb66d9#egg=libcove django-bootstrap3==11.1.0 django-debug-toolbar==2.0 requests==2.22.0 diff --git a/requirements_dev.txt b/requirements_dev.txt index 1113c71a1..c5d6fe361 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -3,7 +3,7 @@ Django==1.11.23 # rq.filter: <1.12 -e git+https://github.com/OpenDataServices/flatten-tool.git@511cc6d1ee83d77aa7a1efe965eb3dd7e4940c1b#egg=flattentool -e git+https://github.com/open-contracting/lib-cove-ocds.git@4fbdd620f40698e1566deae159e356250ed869cf#egg=libcoveocds -e git+https://github.com/OpenDataServices/lib-cove-web.git@62663c3dd6f71c57d53dc5ea7a285210b140f4ab#egg=libcoveweb --e git+https://github.com/OpenDataServices/lib-cove.git@b2011f29bbbb00466c8662d7511e00524dc54e32#egg=libcove +-e git+https://github.com/OpenDataServices/lib-cove.git@b6323033a8634f03121b099937551e8003bb66d9#egg=libcove django-bootstrap3==11.1.0 django-debug-toolbar==2.0 requests==2.22.0 From c3ee7dd7e98e5b9e2dc89daa16fadeda7b2b534c Mon Sep 17 00:00:00 2001 From: Ben Webb Date: Tue, 8 Oct 2019 19:13:48 +0100 Subject: [PATCH 4/6] Update external 404 page so that it actually 404s --- cove_ocds/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cove_ocds/tests.py b/cove_ocds/tests.py index e48f62c29..5f3124759 100644 --- a/cove_ocds/tests.py +++ b/cove_ocds/tests.py @@ -210,7 +210,7 @@ METRICS_EXT = 'https://raw.githubusercontent.com/open-contracting/ocds_metrics_extension/master/extension.json' CODELIST_EXT = 'https://raw.githubusercontent.com/INAImexico/ocds_extendedProcurementCategory_extension/0ed54770c85500cf21f46e88fb06a30a5a2132b1/extension.json' UNKNOWN_URL_EXT = 'http://bad-url-for-extensions.com/extension.json' -NOT_FOUND_URL_EXT = 'http://example.com/extension.json' +NOT_FOUND_URL_EXT = 'https://standard.open-contracting.org/latest/en/404.json' def test_get_releases_aggregates(): From 82d9b1b56acbac81b605983ff2147229bc276133 Mon Sep 17 00:00:00 2001 From: Ben Webb Date: Fri, 11 Oct 2019 12:54:28 +0100 Subject: [PATCH 5/6] [#895] Add trans tags and then makemessages --- cove_360/locale/en/LC_MESSAGES/django.po | 135 +++++++++--------- cove_iati/locale/en/LC_MESSAGES/django.po | 2 +- cove_ocds/locale/en/LC_MESSAGES/django.po | 16 ++- .../templates/cove_ocds/validation_table.html | 4 +- 4 files changed, 87 insertions(+), 70 deletions(-) diff --git a/cove_360/locale/en/LC_MESSAGES/django.po b/cove_360/locale/en/LC_MESSAGES/django.po index 439eda98f..527882ece 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: 2019-08-29 07:16+0000\n" +"POT-Creation-Date: 2019-10-11 11:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -409,74 +409,81 @@ msgid "A file was " msgstr "" #: cove_360/templates/cove_360/explore.html:35 +#: cove_360/templates/cove_360/explore.html:109 msgid "downloaded from " msgstr "" #: cove_360/templates/cove_360/explore.html:37 +#: cove_360/templates/cove_360/explore.html:111 msgid "uploaded " msgstr "" #: cove_360/templates/cove_360/explore.html:39 +#: cove_360/templates/cove_360/explore.html:113 msgid "on " msgstr "" -#: cove_360/templates/cove_360/explore.html:43 +#: cove_360/templates/cove_360/explore.html:89 #, python-format msgid " This file contains %(n_grants)s grant" msgid_plural "This file contains %(n_grants)s grants " msgstr[0] "" msgstr[1] "" -#: cove_360/templates/cove_360/explore.html:44 +#: cove_360/templates/cove_360/explore.html:90 #, python-format msgid "from %(n_funders)s funder" msgid_plural "from %(n_funders)s funders" msgstr[0] "" msgstr[1] "" -#: cove_360/templates/cove_360/explore.html:45 +#: cove_360/templates/cove_360/explore.html:91 #, python-format msgid "to %(n_recipients)s recipient" msgid_plural "to %(n_recipients)s recipients" msgstr[0] "" msgstr[1] "" -#: cove_360/templates/cove_360/explore.html:47 +#: cove_360/templates/cove_360/explore.html:93 #, python-format msgid " awarded on %(start_date)s." msgstr "" -#: cove_360/templates/cove_360/explore.html:47 +#: cove_360/templates/cove_360/explore.html:93 #, python-format msgid "" "awarded between %(start_date)s and %(end_date)s." msgstr "" -#: cove_360/templates/cove_360/explore.html:54 +#: cove_360/templates/cove_360/explore.html:107 +msgid "The file was " +msgstr "" + +#: cove_360/templates/cove_360/explore.html:120 msgid "The grant" msgstr "" -#: cove_360/templates/cove_360/explore.html:56 +#: cove_360/templates/cove_360/explore.html:122 msgid "1 grant" msgstr "" -#: cove_360/templates/cove_360/explore.html:58 +#: cove_360/templates/cove_360/explore.html:124 #, python-format msgid "" " was awarded in %(currency_code)s with a value of " "%(currency_symbol)s%(amount_awarded)s." msgstr "" -#: cove_360/templates/cove_360/explore.html:61 +#: cove_360/templates/cove_360/explore.html:127 msgid "The grants" msgstr "" -#: cove_360/templates/cove_360/explore.html:63 +#: cove_360/templates/cove_360/explore.html:129 msgid "grants" msgstr "" -#: cove_360/templates/cove_360/explore.html:65 +#: cove_360/templates/cove_360/explore.html:131 #, python-format msgid "" " were awarded in %(currency_code)s with a total value of " @@ -485,14 +492,14 @@ msgid "" "%(currency_symbol)s%(max_amount)s (highest)." msgstr "" -#: cove_360/templates/cove_360/explore.html:71 +#: cove_360/templates/cove_360/explore.html:137 #, python-format msgid "" " This file is not 'utf-8' encoded (it is " "%(csv_encoding)s encoded)." msgstr "" -#: cove_360/templates/cove_360/explore.html:76 +#: cove_360/templates/cove_360/explore.html:142 msgid "" "If this appears incorrect the remainder of this page will help you to " "investigate what happened.

\n" @@ -513,98 +520,98 @@ msgid "" "\t\t " msgstr "" -#: cove_360/templates/cove_360/explore.html:88 +#: cove_360/templates/cove_360/explore.html:154 msgid "Convert to Spreadsheet" msgstr "" -#: cove_360/templates/cove_360/explore.html:104 +#: cove_360/templates/cove_360/explore.html:170 msgid "This data could not be read as 360Giving JSON data" msgstr "" -#: cove_360/templates/cove_360/explore.html:107 +#: cove_360/templates/cove_360/explore.html:173 msgid "This data could be read as 360Giving JSON data" msgstr "" -#: cove_360/templates/cove_360/explore.html:110 +#: cove_360/templates/cove_360/explore.html:176 #, python-format msgid "%(n_warnings)s Error" msgid_plural "%(n_warnings)s Errors" msgstr[0] "" msgstr[1] "" -#: cove_360/templates/cove_360/explore.html:118 +#: cove_360/templates/cove_360/explore.html:184 msgid "Before checking your data we needed to convert it to JSON." msgstr "" -#: cove_360/templates/cove_360/explore.html:126 +#: cove_360/templates/cove_360/explore.html:192 #, python-format msgid "" "The JSON data could not be converted to spreadsheet due to the following " "error error: %(conversion_error)s" msgstr "" -#: cove_360/templates/cove_360/explore.html:132 +#: cove_360/templates/cove_360/explore.html:198 msgid "Conversion errors:" msgstr "" -#: cove_360/templates/cove_360/explore.html:151 +#: cove_360/templates/cove_360/explore.html:217 msgid "Data does not use the 360Giving Standard " msgstr "" -#: cove_360/templates/cove_360/explore.html:151 +#: cove_360/templates/cove_360/explore.html:217 #, python-format msgid " %(n_errors)s Error." msgid_plural "%(n_errors)s Errors " msgstr[0] "" msgstr[1] "" -#: cove_360/templates/cove_360/explore.html:154 +#: cove_360/templates/cove_360/explore.html:220 msgid "Data uses the 360Giving Standard" msgstr "" -#: cove_360/templates/cove_360/explore.html:163 +#: cove_360/templates/cove_360/explore.html:229 msgid "Sorry your data is not yet using the 360Giving standard. We used the " msgstr "" -#: cove_360/templates/cove_360/explore.html:165 +#: cove_360/templates/cove_360/explore.html:231 msgid "" "Congratulations! Your data is using the 360Giving standard. We used the " msgstr "" -#: cove_360/templates/cove_360/explore.html:167 +#: cove_360/templates/cove_360/explore.html:233 msgid "to check this." msgstr "" -#: cove_360/templates/cove_360/explore.html:173 +#: cove_360/templates/cove_360/explore.html:239 msgid "" "The following errors are preventing your data from being " "valid. Use the feedback below to find and resolve the issues in your file" msgstr "" -#: cove_360/templates/cove_360/explore.html:241 +#: cove_360/templates/cove_360/explore.html:307 msgid "Quality" msgstr "" -#: cove_360/templates/cove_360/explore.html:242 +#: cove_360/templates/cove_360/explore.html:308 #, python-format msgid " Quality checks" msgid_plural "%(n_quality_accuracy_checks)s Quality checks" msgstr[0] "" msgstr[1] "" -#: cove_360/templates/cove_360/explore.html:251 +#: cove_360/templates/cove_360/explore.html:317 msgid "" "Quality checks failed due to an issue with the data. Fix some validation " "errors first." msgstr "" -#: cove_360/templates/cove_360/explore.html:257 +#: cove_360/templates/cove_360/explore.html:323 msgid "" "Quality checks highlight areas where the source data may be incorrect or " "need further attention" msgstr "" -#: cove_360/templates/cove_360/explore.html:260 +#: cove_360/templates/cove_360/explore.html:326 msgid "" "\n" "\t

For each check we give feedback on the issue and what steps may be " @@ -614,38 +621,38 @@ msgid "" "\t " msgstr "" -#: cove_360/templates/cove_360/explore.html:269 -#: cove_360/templates/cove_360/explore.html:356 +#: cove_360/templates/cove_360/explore.html:335 +#: cove_360/templates/cove_360/explore.html:422 msgid "Check Description" msgstr "" -#: cove_360/templates/cove_360/explore.html:270 -#: cove_360/templates/cove_360/explore.html:357 +#: cove_360/templates/cove_360/explore.html:336 +#: cove_360/templates/cove_360/explore.html:423 msgid "First 3 Locations" msgstr "" -#: cove_360/templates/cove_360/explore.html:327 +#: cove_360/templates/cove_360/explore.html:393 msgid "Usefulness" msgstr "" -#: cove_360/templates/cove_360/explore.html:328 +#: cove_360/templates/cove_360/explore.html:394 #, python-format msgid " Usefulness checks" msgid_plural "%(n_usefulness_checks)s Usefulness checks" msgstr[0] "" msgstr[1] "" -#: cove_360/templates/cove_360/explore.html:337 +#: cove_360/templates/cove_360/explore.html:403 msgid "" "Usefulness checks failed due to an issue with the data. Fix some validation " "errors first." msgstr "" -#: cove_360/templates/cove_360/explore.html:343 +#: cove_360/templates/cove_360/explore.html:409 msgid "Usefulness checks highlight ways the data could be made more useful." msgstr "" -#: cove_360/templates/cove_360/explore.html:346 +#: cove_360/templates/cove_360/explore.html:412 msgid "" "\n" "\t

For each check we highlight areas which contribute to the " @@ -656,18 +663,18 @@ msgid "" "\t " msgstr "" -#: cove_360/templates/cove_360/explore.html:414 +#: cove_360/templates/cove_360/explore.html:480 msgid "Additional Fields" msgstr "" -#: cove_360/templates/cove_360/explore.html:415 +#: cove_360/templates/cove_360/explore.html:481 #, python-format msgid " Additional fields" msgid_plural "%(n_additional_fields)s Additional fields" msgstr[0] "" msgstr[1] "" -#: cove_360/templates/cove_360/explore.html:422 +#: cove_360/templates/cove_360/explore.html:488 msgid "" "Additional fields were found in your data. Additional " "fields not covered by the 360Giving Standard headings may be included in the " @@ -675,79 +682,79 @@ msgid "" "the result of spelling mistakes." msgstr "" -#: cove_360/templates/cove_360/explore.html:443 +#: cove_360/templates/cove_360/explore.html:509 msgid "Check your data" msgstr "" -#: cove_360/templates/cove_360/explore.html:443 +#: cove_360/templates/cove_360/explore.html:509 #, python-format msgid "%(n_grants)s Grant" msgid_plural "%(n_grants)s Grants" msgstr[0] "" msgstr[1] "" -#: cove_360/templates/cove_360/explore.html:449 +#: cove_360/templates/cove_360/explore.html:515 msgid "Review your data." msgstr "" -#: cove_360/templates/cove_360/explore.html:458 +#: cove_360/templates/cove_360/explore.html:524 msgid "Grant identifiers:" msgstr "" -#: cove_360/templates/cove_360/explore.html:466 +#: cove_360/templates/cove_360/explore.html:532 msgid "Funder organisation identifiers:" msgstr "" -#: cove_360/templates/cove_360/explore.html:475 +#: cove_360/templates/cove_360/explore.html:541 msgid "Recipient organisation identifiers:" msgstr "" -#: cove_360/templates/cove_360/explore.html:489 +#: cove_360/templates/cove_360/explore.html:555 msgid "Grants Table" msgstr "" -#: cove_360/templates/cove_360/explore.html:531 +#: cove_360/templates/cove_360/explore.html:597 msgid "Download data and share these results" msgstr "" -#: cove_360/templates/cove_360/explore.html:538 +#: cove_360/templates/cove_360/explore.html:604 msgid "" "You can share these test results with others by using the following url:" msgstr "" -#: cove_360/templates/cove_360/explore.html:541 +#: cove_360/templates/cove_360/explore.html:607 msgid "" "If your data is not suitable to share publicly then you should treat this " "url with care. Only share it with people who have permission to access the " "data." msgstr "" -#: cove_360/templates/cove_360/explore.html:543 +#: cove_360/templates/cove_360/explore.html:609 msgid "" "After 7 days, the link will expire and the data is deleted from our servers " "- so the results will no longer be available. You can revisit these results " "until then." msgstr "" -#: cove_360/templates/cove_360/explore.html:545 +#: cove_360/templates/cove_360/explore.html:611 msgid "" "You can download a copy of the data that has been tested by this tool. We " "provide the following formats to download:" msgstr "" -#: cove_360/templates/cove_360/explore.html:548 +#: cove_360/templates/cove_360/explore.html:614 msgid "Original file" msgstr "" -#: cove_360/templates/cove_360/explore.html:560 +#: cove_360/templates/cove_360/explore.html:626 msgid "You can also download an" msgstr "" -#: cove_360/templates/cove_360/explore.html:560 +#: cove_360/templates/cove_360/explore.html:626 msgid "Excel Spreadsheet (.xlsx) with JSON field names" msgstr "" -#: cove_360/templates/cove_360/explore.html:560 +#: cove_360/templates/cove_360/explore.html:626 msgid "instead of titles as column headers" msgstr "" @@ -861,15 +868,15 @@ msgstr "" msgid "Line:" msgstr "" -#: cove_360/views.py:55 cove_360/views.py:65 +#: cove_360/views.py:58 cove_360/views.py:68 msgid "Sorry, we can't process that data" msgstr "" -#: cove_360/views.py:57 cove_360/views.py:67 +#: cove_360/views.py:60 cove_360/views.py:70 msgid "Try Again" msgstr "" -#: cove_360/views.py:68 +#: cove_360/views.py:71 msgid "" "360Giving JSON should have an object as the top level, the JSON you supplied " "does not." diff --git a/cove_iati/locale/en/LC_MESSAGES/django.po b/cove_iati/locale/en/LC_MESSAGES/django.po index c04a4ddc1..11665c435 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: 2019-08-29 07:16+0000\n" +"POT-Creation-Date: 2019-10-11 11:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/cove_ocds/locale/en/LC_MESSAGES/django.po b/cove_ocds/locale/en/LC_MESSAGES/django.po index f64110acd..9ea504ede 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: 2019-08-29 07:16+0000\n" +"POT-Creation-Date: 2019-10-11 11:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1018,11 +1018,21 @@ msgstr "" msgid "Spreadsheet Location of first 3 errors" msgstr "" -#: cove_ocds/templates/cove_ocds/validation_table.html:65 +#: cove_ocds/templates/cove_ocds/validation_table.html:28 +msgid "" +"(Assuming these are embedded releases, because they have an id)." +msgstr "" + +#: cove_ocds/templates/cove_ocds/validation_table.html:30 +msgid "" +"(Assuming these are linked releases, because they lack an id)." +msgstr "" + +#: cove_ocds/templates/cove_ocds/validation_table.html:70 msgid "Path:" msgstr "" -#: cove_ocds/templates/cove_ocds/validation_table.html:66 +#: cove_ocds/templates/cove_ocds/validation_table.html:71 msgid "Line:" msgstr "" diff --git a/cove_ocds/templates/cove_ocds/validation_table.html b/cove_ocds/templates/cove_ocds/validation_table.html index ea55cded9..2f9578422 100644 --- a/cove_ocds/templates/cove_ocds/validation_table.html +++ b/cove_ocds/templates/cove_ocds/validation_table.html @@ -25,9 +25,9 @@ (more info) {% endif %} {% if error.assumption == 'embedded_releases' %} - (Assuming these are embedded releases, because they have an id). + {% trans '(Assuming these are embedded releases, because they have an id).' %} {% elif error.assumption == 'linked_releases' %} - (Assuming these are linked releases, because they lack an id). + {% trans '(Assuming these are linked releases, because they lack an id).' %} {% endif %}

{% if 'schema_title' in error %} From 55050d65f6c633767e2e124eaff028e0187e333b Mon Sep 17 00:00:00 2001 From: Ben Webb Date: Fri, 11 Oct 2019 18:11:08 +0100 Subject: [PATCH 6/6] [#895] Pull from Transifex --- cove_360/locale/es/LC_MESSAGES/django.po | 135 ++++++++++++---------- cove_ocds/locale/es/LC_MESSAGES/django.po | 24 +++- 2 files changed, 91 insertions(+), 68 deletions(-) diff --git a/cove_360/locale/es/LC_MESSAGES/django.po b/cove_360/locale/es/LC_MESSAGES/django.po index 4d9cf862c..5a5940ce1 100644 --- a/cove_360/locale/es/LC_MESSAGES/django.po +++ b/cove_360/locale/es/LC_MESSAGES/django.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-22 14:56+0000\n" +"POT-Creation-Date: 2019-10-11 11:39+0000\n" "PO-Revision-Date: 2017-04-03 14:37+0000\n" "Last-Translator: Bibiana Cristòfol , 2019\n" "Language-Team: Spanish (https://www.transifex.com/OpenDataServices/teams/59127/es/)\n" @@ -496,44 +496,47 @@ msgid "A file was " msgstr "Un archivo ha sido" #: cove_360/templates/cove_360/explore.html:35 +#: cove_360/templates/cove_360/explore.html:109 msgid "downloaded from " msgstr "descargado desde" #: cove_360/templates/cove_360/explore.html:37 +#: cove_360/templates/cove_360/explore.html:111 msgid "uploaded " msgstr "subido" #: cove_360/templates/cove_360/explore.html:39 +#: cove_360/templates/cove_360/explore.html:113 msgid "on " msgstr "en" -#: cove_360/templates/cove_360/explore.html:43 +#: cove_360/templates/cove_360/explore.html:89 #, python-format msgid " This file contains %(n_grants)s grant" msgid_plural "This file contains %(n_grants)s grants " msgstr[0] "Este archivo contiene %(n_grants)s subvención" msgstr[1] "Este archivo contiene %(n_grants)s subvenciones" -#: cove_360/templates/cove_360/explore.html:44 +#: cove_360/templates/cove_360/explore.html:90 #, python-format msgid "from %(n_funders)s funder" msgid_plural "from %(n_funders)s funders" msgstr[0] "de %(n_funders)s proveedor de fondos" msgstr[1] "de %(n_funders)s proveedores de fondos" -#: cove_360/templates/cove_360/explore.html:45 +#: cove_360/templates/cove_360/explore.html:91 #, python-format msgid "to %(n_recipients)s recipient" msgid_plural "to %(n_recipients)s recipients" msgstr[0] "a %(n_recipients)s receptor" msgstr[1] "a %(n_recipients)s receptores" -#: cove_360/templates/cove_360/explore.html:47 +#: cove_360/templates/cove_360/explore.html:93 #, python-format msgid " awarded on %(start_date)s." msgstr "concedida el %(start_date)s." -#: cove_360/templates/cove_360/explore.html:47 +#: cove_360/templates/cove_360/explore.html:93 #, python-format msgid "" "awarded between %(start_date)s and " @@ -542,15 +545,19 @@ msgstr "" "concedida entre %(start_date)s y " "%(end_date)s." -#: cove_360/templates/cove_360/explore.html:54 +#: cove_360/templates/cove_360/explore.html:107 +msgid "The file was " +msgstr "" + +#: cove_360/templates/cove_360/explore.html:120 msgid "The grant" msgstr "la subvención" -#: cove_360/templates/cove_360/explore.html:56 +#: cove_360/templates/cove_360/explore.html:122 msgid "1 grant" msgstr "1 subvención" -#: cove_360/templates/cove_360/explore.html:58 +#: cove_360/templates/cove_360/explore.html:124 #, python-format msgid "" " was awarded in %(currency_code)s with a value of " @@ -559,15 +566,15 @@ msgstr "" "fue concedida en strong>%(currency_code)scon un valor de " "%(currency_symbol)s%(amount_awarded)s." -#: cove_360/templates/cove_360/explore.html:61 +#: cove_360/templates/cove_360/explore.html:127 msgid "The grants" msgstr "Las subvenciones" -#: cove_360/templates/cove_360/explore.html:63 +#: cove_360/templates/cove_360/explore.html:129 msgid "grants" msgstr "subvenciones" -#: cove_360/templates/cove_360/explore.html:65 +#: cove_360/templates/cove_360/explore.html:131 #, python-format msgid "" " were awarded in %(currency_code)s with a total value of " @@ -581,7 +588,7 @@ msgstr "" "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:71 +#: cove_360/templates/cove_360/explore.html:137 #, python-format msgid "" " This file is not 'utf-8' encoded (it is " @@ -590,7 +597,7 @@ msgstr "" "Este archivo no 'está codificado " "en'utf-8'(está codificado en %(csv_encoding)s)." -#: cove_360/templates/cove_360/explore.html:76 +#: cove_360/templates/cove_360/explore.html:142 msgid "" "If this appears incorrect the remainder of this page will help you to investigate what happened.

\n" "\t\t

The feedback is split into several sections

\n" @@ -604,30 +611,30 @@ msgid "" "\t\t " msgstr "" -#: cove_360/templates/cove_360/explore.html:88 +#: cove_360/templates/cove_360/explore.html:154 msgid "Convert to Spreadsheet" msgstr "Convertir a hoja de cálculo" -#: cove_360/templates/cove_360/explore.html:104 +#: cove_360/templates/cove_360/explore.html:170 msgid "This data could not be read as 360Giving JSON data" msgstr "" -#: cove_360/templates/cove_360/explore.html:107 +#: cove_360/templates/cove_360/explore.html:173 msgid "This data could be read as 360Giving JSON data" msgstr "" -#: cove_360/templates/cove_360/explore.html:110 +#: cove_360/templates/cove_360/explore.html:176 #, python-format msgid "%(n_warnings)s Error" msgid_plural "%(n_warnings)s Errors" msgstr[0] "%(n_warnings)s Error" msgstr[1] "%(n_warnings)s Errores" -#: cove_360/templates/cove_360/explore.html:118 +#: cove_360/templates/cove_360/explore.html:184 msgid "Before checking your data we needed to convert it to JSON." msgstr "" -#: cove_360/templates/cove_360/explore.html:126 +#: cove_360/templates/cove_360/explore.html:192 #, python-format msgid "" "The JSON data could not be converted to spreadsheet due to the following " @@ -636,68 +643,68 @@ msgstr "" "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:132 +#: cove_360/templates/cove_360/explore.html:198 msgid "Conversion errors:" msgstr "Errores de conversión:" -#: cove_360/templates/cove_360/explore.html:151 +#: cove_360/templates/cove_360/explore.html:217 msgid "Data does not use the 360Giving Standard " msgstr "" -#: cove_360/templates/cove_360/explore.html:151 +#: cove_360/templates/cove_360/explore.html:217 #, python-format msgid " %(n_errors)s Error." msgid_plural "%(n_errors)s Errors " msgstr[0] "%(n_errors)s Error." msgstr[1] "%(n_errors)s Errores." -#: cove_360/templates/cove_360/explore.html:154 +#: cove_360/templates/cove_360/explore.html:220 msgid "Data uses the 360Giving Standard" msgstr "" -#: cove_360/templates/cove_360/explore.html:163 +#: cove_360/templates/cove_360/explore.html:229 msgid "Sorry your data is not yet using the 360Giving standard. We used the " msgstr "" -#: cove_360/templates/cove_360/explore.html:165 +#: cove_360/templates/cove_360/explore.html:231 msgid "" "Congratulations! Your data is using the 360Giving standard. We used the " msgstr "" -#: cove_360/templates/cove_360/explore.html:167 +#: cove_360/templates/cove_360/explore.html:233 msgid "to check this." msgstr "" -#: cove_360/templates/cove_360/explore.html:173 +#: cove_360/templates/cove_360/explore.html:239 msgid "" "The following errors are preventing your data from being " "valid. Use the feedback below to find and resolve the issues in your file" msgstr "" -#: cove_360/templates/cove_360/explore.html:241 +#: cove_360/templates/cove_360/explore.html:307 msgid "Quality" msgstr "" -#: cove_360/templates/cove_360/explore.html:242 +#: cove_360/templates/cove_360/explore.html:308 #, python-format msgid " Quality checks" msgid_plural "%(n_quality_accuracy_checks)s Quality checks" msgstr[0] "" msgstr[1] "" -#: cove_360/templates/cove_360/explore.html:251 +#: cove_360/templates/cove_360/explore.html:317 msgid "" "Quality checks failed due to an issue with the data. Fix some validation " "errors first." msgstr "" -#: cove_360/templates/cove_360/explore.html:257 +#: cove_360/templates/cove_360/explore.html:323 msgid "" "Quality checks highlight areas where the source data may be incorrect or " "need further attention" msgstr "" -#: cove_360/templates/cove_360/explore.html:260 +#: cove_360/templates/cove_360/explore.html:326 msgid "" "\n" "\t

For each check we give feedback on the issue and what steps may be taken to resolve it.

\n" @@ -705,38 +712,38 @@ msgid "" "\t " msgstr "" -#: cove_360/templates/cove_360/explore.html:269 -#: cove_360/templates/cove_360/explore.html:356 +#: cove_360/templates/cove_360/explore.html:335 +#: cove_360/templates/cove_360/explore.html:422 msgid "Check Description" msgstr "Compruebe la Descripción" -#: cove_360/templates/cove_360/explore.html:270 -#: cove_360/templates/cove_360/explore.html:357 +#: cove_360/templates/cove_360/explore.html:336 +#: cove_360/templates/cove_360/explore.html:423 msgid "First 3 Locations" msgstr "Primeras 3 localizaciones" -#: cove_360/templates/cove_360/explore.html:327 +#: cove_360/templates/cove_360/explore.html:393 msgid "Usefulness" msgstr "" -#: cove_360/templates/cove_360/explore.html:328 +#: cove_360/templates/cove_360/explore.html:394 #, python-format msgid " Usefulness checks" msgid_plural "%(n_usefulness_checks)s Usefulness checks" msgstr[0] "" msgstr[1] "" -#: cove_360/templates/cove_360/explore.html:337 +#: cove_360/templates/cove_360/explore.html:403 msgid "" "Usefulness checks failed due to an issue with the data. Fix some validation " "errors first." msgstr "" -#: cove_360/templates/cove_360/explore.html:343 +#: cove_360/templates/cove_360/explore.html:409 msgid "Usefulness checks highlight ways the data could be made more useful." msgstr "" -#: cove_360/templates/cove_360/explore.html:346 +#: cove_360/templates/cove_360/explore.html:412 msgid "" "\n" "\t

For each check we highlight areas which contribute to the usefulness of the data and suggest what changes could be made.

\n" @@ -745,18 +752,18 @@ msgid "" "\t " msgstr "" -#: cove_360/templates/cove_360/explore.html:414 +#: cove_360/templates/cove_360/explore.html:480 msgid "Additional Fields" msgstr "Campos adicionales" -#: cove_360/templates/cove_360/explore.html:415 +#: cove_360/templates/cove_360/explore.html:481 #, python-format msgid " Additional fields" msgid_plural "%(n_additional_fields)s Additional fields" msgstr[0] "" msgstr[1] "" -#: cove_360/templates/cove_360/explore.html:422 +#: cove_360/templates/cove_360/explore.html:488 msgid "" "Additional fields were found in your data. Additional " "fields not covered by the 360Giving Standard headings may be included in the" @@ -764,79 +771,79 @@ msgid "" "just the result of spelling mistakes." msgstr "" -#: cove_360/templates/cove_360/explore.html:443 +#: cove_360/templates/cove_360/explore.html:509 msgid "Check your data" msgstr "" -#: cove_360/templates/cove_360/explore.html:443 +#: cove_360/templates/cove_360/explore.html:509 #, python-format msgid "%(n_grants)s Grant" msgid_plural "%(n_grants)s Grants" msgstr[0] "%(n_grants)s Subvención" msgstr[1] "%(n_grants)s Subvenciones" -#: cove_360/templates/cove_360/explore.html:449 +#: cove_360/templates/cove_360/explore.html:515 msgid "Review your data." msgstr "Revise sus datos." -#: cove_360/templates/cove_360/explore.html:458 +#: cove_360/templates/cove_360/explore.html:524 msgid "Grant identifiers:" msgstr "Identificadores de subvenciones" -#: cove_360/templates/cove_360/explore.html:466 +#: cove_360/templates/cove_360/explore.html:532 msgid "Funder organisation identifiers:" msgstr "Identificadores de organizaciones financiadoras:" -#: cove_360/templates/cove_360/explore.html:475 +#: cove_360/templates/cove_360/explore.html:541 msgid "Recipient organisation identifiers:" msgstr "Identificadores de organizaciones receptoras:" -#: cove_360/templates/cove_360/explore.html:489 +#: cove_360/templates/cove_360/explore.html:555 msgid "Grants Table" msgstr "Tabla de Subvenciones" -#: cove_360/templates/cove_360/explore.html:531 +#: cove_360/templates/cove_360/explore.html:597 msgid "Download data and share these results" msgstr "" -#: cove_360/templates/cove_360/explore.html:538 +#: cove_360/templates/cove_360/explore.html:604 msgid "" "You can share these test results with others by using the following url:" msgstr "" -#: cove_360/templates/cove_360/explore.html:541 +#: cove_360/templates/cove_360/explore.html:607 msgid "" "If your data is not suitable to share publicly then you should treat this " "url with care. Only share it with people who have permission to access the " "data." msgstr "" -#: cove_360/templates/cove_360/explore.html:543 +#: cove_360/templates/cove_360/explore.html:609 msgid "" "After 7 days, the link will expire and the data is deleted from our servers " "- so the results will no longer be available. You can revisit these results " "until then." msgstr "" -#: cove_360/templates/cove_360/explore.html:545 +#: cove_360/templates/cove_360/explore.html:611 msgid "" "You can download a copy of the data that has been tested by this tool. We " "provide the following formats to download:" msgstr "" -#: cove_360/templates/cove_360/explore.html:548 +#: cove_360/templates/cove_360/explore.html:614 msgid "Original file" msgstr "Archivo original" -#: cove_360/templates/cove_360/explore.html:560 +#: cove_360/templates/cove_360/explore.html:626 msgid "You can also download an" msgstr "Puede también descargar una" -#: cove_360/templates/cove_360/explore.html:560 +#: cove_360/templates/cove_360/explore.html:626 msgid "Excel Spreadsheet (.xlsx) with JSON field names" msgstr "Hoja de cálculo de Excel (.xlsx) con los nombres de los campos JSON" -#: cove_360/templates/cove_360/explore.html:560 +#: cove_360/templates/cove_360/explore.html:626 msgid "instead of titles as column headers" msgstr "en lugar de títulos como encabezamientos de columnas" @@ -965,15 +972,15 @@ msgstr "Ruta:" msgid "Line:" msgstr "Línea:" -#: cove_360/views.py:55 cove_360/views.py:65 +#: cove_360/views.py:58 cove_360/views.py:68 msgid "Sorry, we can't process that data" msgstr "Lo sentimos, no podemos procesar esos datos" -#: cove_360/views.py:57 cove_360/views.py:67 +#: cove_360/views.py:60 cove_360/views.py:70 msgid "Try Again" msgstr "Inténtelo de nuevo" -#: cove_360/views.py:68 +#: cove_360/views.py:71 msgid "" "360Giving 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 87488a4bb..1bae46556 100644 --- a/cove_ocds/locale/es/LC_MESSAGES/django.po +++ b/cove_ocds/locale/es/LC_MESSAGES/django.po @@ -10,15 +10,16 @@ # Eduardo Gomez , 2019 # Bibiana Cristòfol , 2019 # Amy Guy , 2019 +# Romina Fernandez , 2019 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-22 14:56+0000\n" +"POT-Creation-Date: 2019-10-11 11:39+0000\n" "PO-Revision-Date: 2017-04-03 14:36+0000\n" -"Last-Translator: Amy Guy , 2019\n" +"Last-Translator: Romina Fernandez , 2019\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" @@ -1154,11 +1155,26 @@ msgstr "3 primeros ejemplos" msgid "Spreadsheet Location of first 3 errors" msgstr " Ubicación de los 3 primeros errores en la hoja de cálculo" -#: cove_ocds/templates/cove_ocds/validation_table.html:65 +#: cove_ocds/templates/cove_ocds/validation_table.html:28 +msgid "" +"(Assuming these are embedded releases, because they have an " +"id)." +msgstr "" +"(Asumiendo que estas son entregas ('releases') embebidas, porque tienen un " +"id)." + +#: cove_ocds/templates/cove_ocds/validation_table.html:30 +msgid "" +"(Assuming these are linked releases, because they lack an id)." +msgstr "" +"(Asumiendo que estas son entregas ('releases') enlazadas, porque no tienen " +"un id)." + +#: cove_ocds/templates/cove_ocds/validation_table.html:70 msgid "Path:" msgstr "Ruta:" -#: cove_ocds/templates/cove_ocds/validation_table.html:66 +#: cove_ocds/templates/cove_ocds/validation_table.html:71 msgid "Line:" msgstr "Línea:"