Merge pull request #1380 from open-contracting/930-multiple-document-…

…languages release schema: Add Document.languages, deprecate Document.language
open-contracting · Sep 23, 2021 · 70d2549 · 70d2549
2 parents 9c6ea22 + 08ac042
commit 70d2549
Show file tree

Hide file tree

Showing 69 changed files with 537 additions and 893 deletions.
diff --git a/docs/_static/json/amendments/amendments-contract-example.json b/docs/_static/json/amendments/amendments-contract-example.json
@@ -17,7 +17,6 @@
           "tag": [
             "contract"
           ],
-          "language": "en",
           "contracts": [
             {
               "status": "active",
@@ -102,7 +101,6 @@
           "tag": [
             "contractAmendment"
           ],
-          "language": "en",
           "contracts": [
             {
               "status": "active",
@@ -188,7 +186,6 @@
         "id": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-2019-02-17T00:00:00Z",
         "date": "2019-02-17T00:00:00Z",
         "ocid": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856",
-        "language": "en",
         "contracts": [
           {
             "id": "CN3562241",
@@ -286,16 +283,6 @@
       },
       "versionedRelease": {
         "ocid": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856",
-        "language": [
-          {
-            "releaseID": "ocds-d2phr6-12b0ab8ac4c28d322a82062e99918856-9887f9ebe7043172ab2abe4db2a5aa24",
-            "releaseDate": "2019-02-15T01:00:58Z",
-            "releaseTag": [
-              "contract"
-            ],
-            "value": "en"
-          }
-        ],
         "contracts": [
           {
             "id": "CN3562241",

diff --git a/docs/_static/json/amendments/amendments-easy-releases-example.json b/docs/_static/json/amendments/amendments-easy-releases-example.json
@@ -11,7 +11,6 @@
       "ocid": "ocds-d2phr6-1000035663",
       "releases": [
         {
-          "language": "en",
           "ocid": "ocds-d2phr6-1000035663",
           "date": "2015-04-04T00:00:00Z",
           "tag": [
@@ -50,7 +49,6 @@
           "id": "ocds-d2phr6-1000035663-tender-2015-04-04T00:00:00Z"
         },
         {
-          "language": "en",
           "contracts": [
             {
               "status": "active",
@@ -175,7 +173,6 @@
         "id": "ocds-d2phr6-1000035663-2018-06-21T00:00:00Z",
         "date": "2018-06-21T00:00:00Z",
         "ocid": "ocds-d2phr6-1000035663",
-        "language": "en",
         "parties": [
           {
             "id": "ac3545c6a1e90c4074832acb210b4963",
@@ -271,16 +268,6 @@
       },
       "versionedRelease": {
         "ocid": "ocds-d2phr6-1000035663",
-        "language": [
-          {
-            "releaseID": "ocds-d2phr6-1000035663-tender-2015-04-04T00:00:00Z",
-            "releaseDate": "2015-04-04T00:00:00Z",
-            "releaseTag": [
-              "tender"
-            ],
-            "value": "en"
-          }
-        ],
         "parties": [
           {
             "id": "ac3545c6a1e90c4074832acb210b4963",

diff --git a/docs/_static/json/amendments/amendments-tender-example.json b/docs/_static/json/amendments/amendments-tender-example.json
@@ -18,7 +18,6 @@
           "ocid": "ocds-213czf-000-00002",
           "id": "ocds-213czf-000-00002-01-tender",
           "date": "2016-01-01T09:30:00Z",
-          "language": "en",
           "tag": [
             "tender"
           ],
@@ -66,7 +65,6 @@
           "ocid": "ocds-213czf-000-00002",
           "id": "ocds-213czf-000-00002-01-tender-update",
           "date": "2016-01-31T09:30:00Z",
-          "language": "en",
           "tag": [
             "tenderUpdate"
           ],
@@ -114,7 +112,6 @@
           "ocid": "ocds-213czf-000-00002",
           "id": "ocds-213czf-000-00002-01-tender-amendment",
           "date": "2016-02-05T10:30:00Z",
-          "language": "en",
           "tag": [
             "tenderAmendment"
           ],
@@ -175,7 +172,6 @@
         "id": "ocds-213czf-000-00002-2016-02-05T10:30:00Z",
         "date": "2016-02-05T10:30:00Z",
         "ocid": "ocds-213czf-000-00002",
-        "language": "en",
         "parties": [
           {
             "id": "GB-COH-09506232",
@@ -227,16 +223,6 @@
       },
       "versionedRelease": {
         "ocid": "ocds-213czf-000-00002",
-        "language": [
-          {
-            "releaseID": "ocds-213czf-000-00002-01-tender",
-            "releaseDate": "2016-01-01T09:30:00Z",
-            "releaseTag": [
-              "tender"
-            ],
-            "value": "en"
-          }
-        ],
         "parties": [
           {
             "id": "GB-COH-09506232",

diff --git a/docs/examples/award.json b/docs/examples/award.json
@@ -16,7 +16,6 @@
       "ocid": "ocds-213czf-000-00001",
       "id": "ocds-213czf-000-00001-04-award",
       "date": "2010-05-10T09:30:00Z",
-      "language": "en",
       "tag": [
         "award"
       ],
@@ -156,8 +155,7 @@
             "description": "Official tender notice.",
             "url": "http://example.com/tender-notices/ocds-213czf-000-00001-01.html",
             "datePublished": "2010-03-01T09:00:00Z",
-            "format": "text/html",
-            "language": "en"
+            "format": "text/html"
           },
           {
             "id": "0006",
@@ -166,8 +164,7 @@
             "description": "Responses to enquiries asked by interested parties.",
             "url": "http://example.com/enquiry-response/ocds-213czf-000-00001-01.html",
             "datePublished": "2010-03-20T11:30:15Z",
-            "format": "text/html",
-            "language": "en"
+            "format": "text/html"
           }
         ],
         "amendments": [
@@ -238,8 +235,7 @@
               "description": "Award of contract to build new cycle lanes in the centre of town to Balfour Beatty Plc.",
               "url": "http://example.com/tender-notices/ocds-213czf-000-00001-04.html",
               "datePublished": "2010-05-10T09:30:00Z",
-              "format": "text/html",
-              "language": "en"
+              "format": "text/html"
             }
           ]
         }

diff --git a/docs/examples/contract.json b/docs/examples/contract.json
@@ -16,7 +16,6 @@
       "ocid": "ocds-213czf-000-00001",
       "id": "ocds-213czf-000-00001-05-contract",
       "date": "2010-06-10T10:30:00Z",
-      "language": "en",
       "tag": [
         "contract"
       ],
@@ -142,8 +141,7 @@
               "description": "Award of contract to build new cycle lanes in the centre of town to Balfour Beatty Plc.",
               "url": "http://example.com/tender-notices/ocds-213czf-000-00001-04.html",
               "datePublished": "2010-05-10T10:30:00Z",
-              "format": "text/html",
-              "language": "en"
+              "format": "text/html"
             }
           ]
         }
@@ -200,8 +198,7 @@
               "description": "The Signed Contract for Cycle Path Construction",
               "url": "http://example.com/contracts/ocds-213czf-000-00001",
               "datePublished": "2015-06-10T16:43:12Z",
-              "format": "application/pdf",
-              "language": "en"
+              "format": "application/pdf"
             }
           ]
         }

diff --git a/docs/examples/contractAmendment.json b/docs/examples/contractAmendment.json
@@ -16,7 +16,6 @@
       "ocid": "ocds-213czf-000-00001",
       "id": "ocds-213czf-000-00001-07-contractAmendment",
       "date": "2011-04-05T13:30:00Z",
-      "language": "en",
       "tag": [
         "contractAmendment"
       ],
@@ -142,8 +141,7 @@
               "description": "Award of contract to build new cycle lanes in the centre of town to Balfour Beatty Plc.",
               "url": "http://example.com/tender-notices/ocds-213czf-000-00001-04.html",
               "datePublished": "2010-05-10T10:30:00Z",
-              "format": "text/html",
-              "language": "en"
+              "format": "text/html"
             }
           ]
         }
@@ -200,8 +198,7 @@
               "description": "The Signed Contract for Cycle Path Construction",
               "url": "http://example.com/contracts/ocds-213czf-000-00001",
               "datePublished": "2015-06-10T16:43:12Z",
-              "format": "application/pdf",
-              "language": "en"
+              "format": "application/pdf"
             }
           ],
           "amendments": [

diff --git a/docs/examples/extended.json b/docs/examples/extended.json
@@ -18,7 +18,6 @@
       "ocid": "ocds-213czf-000-00001",
       "id": "ocds-213czf-000-00001-02-tender",
       "date": "2010-03-15T09:30:00Z",
-      "language": "en",
       "tag": [
         "tender"
       ],
@@ -149,8 +148,7 @@
             "description": "Official tender notice.",
             "url": "http://example.com/tender-notices/ocds-213czf-000-00001-01.html",
             "datePublished": "2010-03-01T09:00:00Z",
-            "format": "text/html",
-            "language": "en"
+            "format": "text/html"
           }
         ]
       }

diff --git a/docs/examples/frameworks/open_multiple_award.json b/docs/examples/frameworks/open_multiple_award.json
@@ -84,8 +84,7 @@
           "identifier": "ocds-70d2nz-2239-4-LP14",
           "uri": "https://example.org/records/ocds-70d2nz-2239-4-LP14"
         }
-      ],
-      "language": "es"
+      ]
     }
   ]
 }
diff --git a/docs/examples/frameworks/open_multiple_first_stage.json b/docs/examples/frameworks/open_multiple_first_stage.json
@@ -74,8 +74,7 @@
           "startDate": "2005-01-19T15:30:00Z",
           "endDate": "2020-08-27T15:00:00Z"
         }
-      },
-      "language": "es"
+      }
     }
   ]
 }
diff --git a/docs/examples/frameworks/open_multiple_second_stage.json b/docs/examples/frameworks/open_multiple_second_stage.json
@@ -78,8 +78,7 @@
           "identifier": "ocds-70d2nz-2239-4-LP14",
           "uri": "https://example.org/records/ocds-70d2nz-2239-4-LP14"
         }
-      ],
-      "language": "es"
+      ]
     }
   ]
 }
diff --git a/docs/examples/frameworks/open_multiple_supplier.json b/docs/examples/frameworks/open_multiple_supplier.json
@@ -67,8 +67,7 @@
             }
           ]
         }
-      ],
-      "language": "es"
+      ]
     }
   ]
 }
diff --git a/docs/examples/implementation.json b/docs/examples/implementation.json
@@ -16,7 +16,6 @@
       "ocid": "ocds-213czf-000-00001",
       "id": "ocds-213czf-000-00001-06-implementation",
       "date": "2011-01-10T09:30:00Z",
-      "language": "en",
       "tag": [
         "implementation"
       ],

diff --git a/docs/examples/language.json b/docs/examples/language.json
@@ -1,5 +1,4 @@
 {
-  "language": "en",
   "tender": {
     "item": {
       "description": "Software consultancy services",

diff --git a/docs/examples/merging/example02-field-planning.json b/docs/examples/merging/example02-field-planning.json
@@ -8,7 +8,6 @@
   "releases": [
     {
       "date": "2013-07-17T16:36:56.000Z",
-      "language": "es",
       "ocid": "ocds-k50g02-13-9-368828",
       "id": "13-9-368828-planning",
       "tag": [

diff --git a/docs/examples/merging/example02-field-record.json b/docs/examples/merging/example02-field-record.json
@@ -11,7 +11,6 @@
       "releases": [
         {
           "date": "2013-07-17T16:36:56.000Z",
-          "language": "es",
           "ocid": "ocds-k50g02-13-9-368828",
           "id": "13-9-368828-planning",
           "tag": [
@@ -71,7 +70,6 @@
         },
         {
           "date": "2013-07-17T16:36:56.000Z",
-          "language": "es",
           "ocid": "ocds-k50g02-13-9-368828",
           "id": "13-9-368828-tender",
           "tag": [
@@ -143,7 +141,6 @@
         "id": "ocds-k50g02-13-9-368828-2013-07-17T16:36:56.000Z",
         "date": "2013-07-17T16:36:56.000Z",
         "ocid": "ocds-k50g02-13-9-368828",
-        "language": "es",
         "parties": [
           {
             "id": "800215546",
@@ -202,16 +199,6 @@
       },
       "versionedRelease": {
         "ocid": "ocds-k50g02-13-9-368828",
-        "language": [
-          {
-            "releaseID": "13-9-368828-planning",
-            "releaseDate": "2013-07-17T16:36:56.000Z",
-            "releaseTag": [
-              "planning"
-            ],
-            "value": "es"
-          }
-        ],
         "parties": [
           {
             "id": "800215546",

diff --git a/docs/examples/merging/example02-field-tender.json b/docs/examples/merging/example02-field-tender.json
@@ -8,7 +8,6 @@
   "releases": [
     {
       "date": "2013-07-28T09:40:10.000Z",
-      "language": "es",
       "ocid": "ocds-k50g02-13-9-368828",
       "id": "13-9-368828-tender",
       "tag": [

diff --git a/docs/examples/merging/example02-object-record.json b/docs/examples/merging/example02-object-record.json
@@ -11,7 +11,6 @@
       "releases": [
         {
           "date": "2011-10-18T08:54:21.000Z",
-          "language": "es",
           "ocid": "ocds-k50g02-11-13-651832",
           "id": "11-13-651832-tenderUpdate",
           "tag": [
@@ -83,7 +82,6 @@
         },
         {
           "date": "2011-10-14T16:26:49.000Z",
-          "language": "es",
           "ocid": "ocds-k50g02-11-13-651832",
           "id": "11-13-651832-tender",
           "tag": [
@@ -151,7 +149,6 @@
         "id": "ocds-k50g02-11-13-651832-2011-10-18T08:54:21.000Z",
         "date": "2011-10-18T08:54:21.000Z",
         "ocid": "ocds-k50g02-11-13-651832",
-        "language": "es",
         "parties": [
           {
             "id": "890701933",
@@ -215,16 +212,6 @@
       },
       "versionedRelease": {
         "ocid": "ocds-k50g02-11-13-651832",
-        "language": [
-          {
-            "releaseID": "11-13-651832-tender",
-            "releaseDate": "2011-10-14T16:26:49.000Z",
-            "releaseTag": [
-              "tender"
-            ],
-            "value": "es"
-          }
-        ],
         "parties": [
           {
             "id": "890701933",
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,8 +67,7 @@ @@
                 }
               ]
             }
-          ],
-          "language": "es"
+          ]
         }
       ]
     }