Merge 6a0276b into 23d51d4

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.
 

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.

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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 ""
 

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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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"
-"<span class=\"glyphicon glyphicon-exclamation-sign\" aria-hidden=\"true\"></"
-"span> <strong>Error message:</strong> {}"
-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."