Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into 144-translation
Browse files Browse the repository at this point in the history
  • Loading branch information
Bjwebb committed Feb 24, 2021
2 parents 4bb358e + c9a8087 commit 069320f
Show file tree
Hide file tree
Showing 33 changed files with 63 additions and 63 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: CI
on: [push, pull_request]
env:
BASEDIR: https://raw.githubusercontent.com/open-contracting/standard-maintenance-scripts/master
BASEDIR: https://raw.githubusercontent.com/open-contracting/standard-maintenance-scripts/main
jobs:
build:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion cove_ocds/fixtures/SOURCES
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ Source: Same data as tenders_releases_2_releases.json, but edited to be a record
License: http://data.gc.ca/eng/open-government-licence-canada

ocds_release_nulls.json
Adapted from://github.com/open-contracting/sample-data/blob/master/blank-template/release-template-1__0__0.json
Adapted from://github.com/open-contracting/sample-data/blob/main/blank-template/release-template-1__0__0.json

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"publishedDate": "2112-04-11T01:58:02.871Z",
"version": "1.1",
"extensions": [
"https://raw.githubusercontent.com/open-contracting/ocds_bid_extension/master/extension.json",
"https://raw.githubusercontent.com/open-contracting-extensions/ocds_bid_extension/master/extension.json",
"https://raw.githubusercontent.com/OpenDataServices/cove/edcabaf773829b3a5dabde6285fe0c7542a2c944/cove_ocds/fixtures/evil/extension.json"
],
"releases": [{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"uid": null
},
"extensions": [
"https://raw.githubusercontent.com/open-contracting/ocds_metrics_extension/master/extension.json",
"https://raw.githubusercontent.com/open-contracting/ocds_extension_parties/master/extension.json"
"https://raw.githubusercontent.com/open-contracting-extensions/ocds_metrics_extension/master/extension.json",
"https://raw.githubusercontent.com/open-contracting-archive/ocds_upgrade_368/master/extension.json"
],
"version": "1.1",
"releases": [
Expand Down Expand Up @@ -76,7 +76,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z"
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
},
"version": "1.1",
"extensions": [
"https://raw.githubusercontent.com/open-contracting/ocds_metrics_extension/master/extension.json",
"https://raw.githubusercontent.com/open-contracting/ocds_extension_parties/master/extension.json",
"https://raw.githubusercontent.com/open-contracting/ocds_partyDetails_scale_extension/master/extension.json",
"https://raw.githubusercontent.com/open-contracting/bad_path_to_extensions/extension.json",
"https://raw.githubusercontent.com/open-contracting-extensions/ocds_metrics_extension/master/extension.json",
"https://raw.githubusercontent.com/open-contracting-archive/ocds_upgrade_368/master/extension.json",
"https://raw.githubusercontent.com/open-contracting-extensions/ocds_partyDetails_scale_extension/master/extension.json",
"https://raw.githubusercontent.com/open-contracting-extensions/bad_path_to_extensions/extension.json",
"http://example.com/404/",
"badprotocol://example.com"
],
Expand Down Expand Up @@ -150,7 +150,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z"
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"uid": null
},
"extensions": [
"https://raw.githubusercontent.com/open-contracting/bad_path_to_extensions/extension.json",
"https://raw.githubusercontent.com/open-contracting-extensions/bad_path_to_extensions/extension.json",
"http://example.com/404/",
"badprotocol://example.com"
],
Expand Down Expand Up @@ -71,7 +71,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z"
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"uid": null
},
"extensions": [
"https://raw.githubusercontent.com/open-contracting/ocds_tariffs_extension/d9df2969030b0a555c24c7db685262c714b4da24/extension.json",
"https://raw.githubusercontent.com/open-contracting-extensions/ocds_tariffs_extension/d9df2969030b0a555c24c7db685262c714b4da24/extension.json",
"https://raw.githubusercontent.com/OpenDataServices/cove/4318ebe1182ccd3b3c3492de2ae75683c3c0395f/cove_ocds/fixtures/codelist_extension/extension.json"
],
"version": "1.1",
Expand Down Expand Up @@ -68,7 +68,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z"
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"publishedDate": "2017-08-08T09:44:30+00:00",
"uri": "http://pptin.staging.yipl.com.np/bulk-download/2017",
"extensions":["https://raw.githubusercontent.com/open-contracting/ocds_requirements_extension/master/extension.json"],
"extensions":["https://raw.githubusercontent.com/open-contracting-extensions/ocds_requirements_extension/master/extension.json"],
"version": "1.0",
"releases": [{
"ocid": "ocds-rw2stw-DTOK-3994\/CIP\/KPV\/W\/NCB-26",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"uid": null
},
"extensions": [
"https://raw.githubusercontent.com/open-contracting/ocds_metrics_extension/master/extension.json",
"https://raw.githubusercontent.com/open-contracting/ocds_extension_parties/master/extension.json",
"https://raw.githubusercontent.com/open-contracting/ocds_partyDetails_scale_extension/master/extension.json"
"https://raw.githubusercontent.com/open-contracting-extensions/ocds_metrics_extension/master/extension.json",
"https://raw.githubusercontent.com/open-contracting-archive/ocds_upgrade_368/master/extension.json",
"https://raw.githubusercontent.com/open-contracting-extensions/ocds_partyDetails_scale_extension/master/extension.json"
],
"version": "1.1",
"releases": [
Expand Down Expand Up @@ -77,7 +77,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z"
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"uid": null
},
"extensions": [
"https://raw.githubusercontent.com/open-contracting/ocds_lots_extension/master/extension.json"
"https://raw.githubusercontent.com/open-contracting-extensions/ocds_lots_extension/master/extension.json"
],
"version": "1.1",
"releases": [
Expand Down Expand Up @@ -68,7 +68,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z"
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"uid": null
},
"extensions": [
"https://raw.githubusercontent.com/open-contracting/ocds_metrics_extension/master/extension.json",
"https://raw.githubusercontent.com/open-contracting/ocds_extension_parties/master/extension.json",
"https://raw.githubusercontent.com/open-contracting/ocds_partyDetails_scale_extension/master/extension.json",
"https://raw.githubusercontent.com/open-contracting/bad_path_to_extensions/extension.json",
"https://raw.githubusercontent.com/open-contracting-extensions/ocds_metrics_extension/master/extension.json",
"https://raw.githubusercontent.com/open-contracting-archive/ocds_upgrade_368/master/extension.json",
"https://raw.githubusercontent.com/open-contracting-extensions/ocds_partyDetails_scale_extension/master/extension.json",
"https://raw.githubusercontent.com/open-contracting-extensions/bad_path_to_extensions/extension.json",
"https://standard.open-contracting.org/latest/en/404.json",
"badprotocol://example.com"
],
Expand Down Expand Up @@ -74,7 +74,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z"
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z"
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"uid": null
},
"extensions": [
"https://raw.githubusercontent.com/open-contracting/ocds_tariffs_extension/d9df2969030b0a555c24c7db685262c714b4da24/extension.json"
"https://raw.githubusercontent.com/open-contracting-extensions/ocds_tariffs_extension/d9df2969030b0a555c24c7db685262c714b4da24/extension.json"
],
"version": "1.1",
"releases": [
Expand Down Expand Up @@ -75,7 +75,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z"
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z"
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"uid": null
},
"extensions": [
"https://raw.githubusercontent.com/open-contracting/ocds_tariffs_extension/d9df2969030b0a555c24c7db685262c714b4da24/extension.json",
"https://raw.githubusercontent.com/open-contracting-extensions/ocds_tariffs_extension/d9df2969030b0a555c24c7db685262c714b4da24/extension.json",
"https://raw.githubusercontent.com/OpenDataServices/cove/4318ebe1182ccd3b3c3492de2ae75683c3c0395f/cove_ocds/fixtures/codelist_extension/extension.json"
],
"version": "1.1",
Expand Down Expand Up @@ -77,7 +77,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z"
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z"
}
2 changes: 1 addition & 1 deletion cove_ocds/fixtures/tenders_releases_2_releases.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z"
}
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z"
}
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z",
"version": "1.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07"
}
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07"
}
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z"
}
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z"
}
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z"
}
2 changes: 1 addition & 1 deletion cove_ocds/fixtures/tenders_releases_extra_data.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
}
}
],
"uri": "https://github.com/open-contracting/sample-data/blob/master/buyandsell/ocds_data/tender_releases.json.zip",
"uri": "https://github.com/open-contracting/sample-data/blob/main/buyandsell/ocds_data/tender_releases.json.zip",
"license": "http://data.gc.ca/eng/open-government-licence-canada",
"publishedDate": "2014-11-07T00:00:00.00Z"
}
2 changes: 1 addition & 1 deletion cove_ocds/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ msgstr ""
msgid ""
"To preview how the data review tool works, try <a href=\"/review/?"
"source_url=https://raw.githubusercontent.com/open-contracting/sample-data/"
"master/fictional-example/1.1/ocds-213czf-000-00001-02-tender.json\"> loading "
"main/fictional-example/1.1/ocds-213czf-000-00001-02-tender.json\"> loading "
"some sample data. </a>"
msgstr ""

Expand Down
4 changes: 2 additions & 2 deletions cove_ocds/locale/es/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -230,12 +230,12 @@ msgstr ""
msgid ""
"To preview how the data review tool works, try <a "
"href=\"/review/?source_url=https://raw.githubusercontent.com/open-"
"contracting/sample-data/master/fictional-example/1.1/ocds-"
"contracting/sample-data/main/fictional-example/1.1/ocds-"
"213czf-000-00001-02-tender.json\"> loading some sample data. </a>"
msgstr ""
"Para ver cómo funciona la herramienta de revisión de datos, intenta <a "
"href=\"/review/?source_url=https://raw.githubusercontent.com/open-"
"contracting/sample-data/master/fictional-example/1.1/ocds-"
"contracting/sample-data/main/fictional-example/1.1/ocds-"
"213czf-000-00001-02-tender.json\"> subir algunos datos de muestra.</a>"

#: cove_ocds/templates/cove_ocds/base.html:151
Expand Down
2 changes: 1 addition & 1 deletion cove_ocds/templates/cove_ocds/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ <h1 class="heading-in-panel"> <small> {% blocktrans %}Using the data review tool
<p> {% blocktrans %}The application works with both <a href="http://standard.open-contracting.org/latest/en/getting_started/releases_and_records/">'release' and 'record'</a> OCDS documents that conform to the <a href="http://standard.open-contracting.org/">Open Data Contracting Standard</a> {%endblocktrans%} </p>
<p> {% blocktrans %}If your data passes basic structural 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%} </p>
<p> {% blocktrans %}Data is stored for {{ delete_files_after_days }} days at a randomly generated URL. You can share this link with others to support discussion of data quality. {%endblocktrans%} </p>
<p> {% blocktrans %}To preview how the data review tool works, try <a href="/review/?source_url=https://raw.githubusercontent.com/open-contracting/sample-data/master/fictional-example/1.1/ocds-213czf-000-00001-02-tender.json"> loading some sample data. </a>{% endblocktrans%} </p>
<p> {% blocktrans %}To preview how the data review tool works, try <a href="/review/?source_url=https://raw.githubusercontent.com/open-contracting/sample-data/main/fictional-example/1.1/ocds-213czf-000-00001-02-tender.json"> loading some sample data. </a>{% endblocktrans%} </p>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion cove_ocds/test_input.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def test_input_post(rf):
rf.post(
"/",
{
"source_url": "https://raw.githubusercontent.com/OpenDataServices/flatten-tool/master/flattentool/tests/fixtures/tenders_releases_2_releases.json"
"source_url": "https://raw.githubusercontent.com/OpenDataServices/flatten-tool/main/flattentool/tests/fixtures/tenders_releases_2_releases.json"
},
)
)
Expand Down
Loading

0 comments on commit 069320f

Please sign in to comment.