Upgrade to CLDR 33.1

php-gettext · Jun 21, 2018 · 1b74377 · 1b74377
1 parent da2048d
commit 1b74377
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 11 deletions.
diff --git a/src/cldr-data/main/en-US/languages.json b/src/cldr-data/main/en-US/languages.json
@@ -3,8 +3,8 @@
     "en-US": {
       "identity": {
         "version": {
-          "_number": "$Revision: 13133 $",
-          "_cldrVersion": "31"
+          "_number": "$Revision: 13869 $",
+          "_cldrVersion": "33.1"
         },
         "language": "en",
         "territory": "US"
@@ -99,6 +99,7 @@
           "car": "Carib",
           "cay": "Cayuga",
           "cch": "Atsam",
+          "ccp": "Chakma",
           "ce": "Chechen",
           "ceb": "Cebuano",
           "cgg": "Chiga",
@@ -334,6 +335,7 @@
           "ln": "Lingala",
           "lo": "Lao",
           "lol": "Mongo",
+          "lou": "Louisiana Creole",
           "loz": "Lozi",
           "lrc": "Northern Luri",
           "lt": "Lithuanian",
@@ -525,6 +527,7 @@
           "sog": "Sogdien",
           "sq": "Albanian",
           "sr": "Serbian",
+          "sr-ME": "Montenegrin",
           "srn": "Sranan Tongo",
           "srr": "Serer",
           "ss": "Swati",

diff --git a/src/cldr-data/main/en-US/scripts.json b/src/cldr-data/main/en-US/scripts.json
@@ -3,8 +3,8 @@
     "en-US": {
       "identity": {
         "version": {
-          "_number": "$Revision: 13133 $",
-          "_cldrVersion": "31"
+          "_number": "$Revision: 13869 $",
+          "_cldrVersion": "33.1"
         },
         "language": "en",
         "territory": "US"
@@ -44,6 +44,7 @@
           "Cyrl": "Cyrillic",
           "Cyrs": "Old Church Slavonic Cyrillic",
           "Deva": "Devanagari",
+          "Dogr": "Dogra",
           "Dsrt": "Deseret",
           "Dupl": "Duployan shorthand",
           "Egyd": "Egyptian demotic",
@@ -54,6 +55,8 @@
           "Geok": "Georgian Khutsuri",
           "Geor": "Georgian",
           "Glag": "Glagolitic",
+          "Gong": "Gunjala Gondi",
+          "Gonm": "Masaram Gondi",
           "Goth": "Gothic",
           "Gran": "Grantha",
           "Grek": "Greek",
@@ -103,10 +106,12 @@
           "Lyci": "Lycian",
           "Lydi": "Lydian",
           "Mahj": "Mahajani",
+          "Maka": "Makasar",
           "Mand": "Mandaean",
           "Mani": "Manichaean",
           "Marc": "Marchen",
           "Maya": "Mayan hieroglyphs",
+          "Medf": "Medefaidrin",
           "Mend": "Mende",
           "Merc": "Meroitic Cursive",
           "Mero": "Meroitic",
@@ -141,6 +146,7 @@
           "Plrd": "Pollard Phonetic",
           "Prti": "Inscriptional Parthian",
           "Rjng": "Rejang",
+          "Rohg": "Hanifi Rohingya",
           "Roro": "Rongorongo",
           "Runr": "Runic",
           "Samr": "Samaritan",
@@ -153,7 +159,10 @@
           "Sidd": "Siddham",
           "Sind": "Khudawadi",
           "Sinh": "Sinhala",
+          "Sogd": "Sogdian",
+          "Sogo": "Old Sogdian",
           "Sora": "Sora Sompeng",
+          "Soyo": "Soyombo",
           "Sund": "Sundanese",
           "Sylo": "Syloti Nagri",
           "Syrc": "Syriac",
@@ -184,6 +193,7 @@
           "Xsux": "Sumero-Akkadian Cuneiform",
           "Xsux-alt-short": "S-A Cuneiform",
           "Yiii": "Yi",
+          "Zanb": "Zanabazar Square",
           "Zinh": "Inherited",
           "Zmth": "Mathematical Notation",
           "Zsye": "Emoji",

diff --git a/src/cldr-data/main/en-US/territories.json b/src/cldr-data/main/en-US/territories.json
@@ -3,8 +3,8 @@
     "en-US": {
       "identity": {
         "version": {
-          "_number": "$Revision: 13133 $",
-          "_cldrVersion": "31"
+          "_number": "$Revision: 13869 $",
+          "_cldrVersion": "33.1"
         },
         "language": "en",
         "territory": "US"
@@ -40,6 +40,7 @@
           "151": "Eastern Europe",
           "154": "Northern Europe",
           "155": "Western Europe",
+          "202": "Sub-Saharan Africa",
           "419": "Latin America",
           "AC": "Ascension Island",
           "AD": "Andorra",

diff --git a/src/cldr-data/supplemental/plurals.json b/src/cldr-data/supplemental/plurals.json
@@ -1,9 +1,9 @@
 {
   "supplemental": {
     "version": {
-      "_number": "$Revision: 13253 $",
-      "_unicodeVersion": "9.0.0",
-      "_cldrVersion": "31"
+      "_number": "$Revision: 13898 $",
+      "_unicodeVersion": "11.0.0",
+      "_cldrVersion": "33.1"
     },
     "plurals-type-cardinal": {
       "af": {
@@ -298,6 +298,10 @@
       "in": {
         "pluralRule-count-other": " @integer 0~15, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
       },
+      "io": {
+        "pluralRule-count-one": "i = 1 and v = 0 @integer 1",
+        "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+      },
       "is": {
         "pluralRule-count-one": "t = 0 and i % 10 = 1 and i % 100 != 11 or t != 0 @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, … @decimal 0.1~1.6, 10.1, 100.1, 1000.1, …",
         "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
@@ -458,8 +462,8 @@
         "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
       },
       "mk": {
-        "pluralRule-count-one": "v = 0 and i % 10 = 1 or f % 10 = 1 @integer 1, 11, 21, 31, 41, 51, 61, 71, 101, 1001, … @decimal 0.1, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1, 10.1, 100.1, 1000.1, …",
-        "pluralRule-count-other": " @integer 0, 2~10, 12~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0, 0.2~1.0, 1.2~1.7, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+        "pluralRule-count-one": "v = 0 and i % 10 = 1 and i % 100 != 11 or f % 10 = 1 and f % 100 != 11 @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, … @decimal 0.1, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1, 10.1, 100.1, 1000.1, …",
+        "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0, 0.2~1.0, 1.2~1.7, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
       },
       "ml": {
         "pluralRule-count-one": "n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000",
@@ -585,6 +589,10 @@
         "pluralRule-count-one": "i = 0..1 @integer 0, 1 @decimal 0.0~1.5",
         "pluralRule-count-other": " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
       },
+      "pt-PT": {
+        "pluralRule-count-one": "i = 1 and v = 0 @integer 1",
+        "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+      },
       "rm": {
         "pluralRule-count-one": "n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000",
         "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
@@ -618,6 +626,14 @@
         "pluralRule-count-one": "n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000",
         "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
       },
+      "scn": {
+        "pluralRule-count-one": "i = 1 and v = 0 @integer 1",
+        "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+      },
+      "sd": {
+        "pluralRule-count-one": "n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000",
+        "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+      },
       "sdh": {
         "pluralRule-count-one": "n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000",
         "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"

diff --git a/tests/Get/GetTest.php b/tests/Get/GetTest.php
@@ -46,4 +46,31 @@ public function testGetById()
         $this->assertNotNull($language);
         $this->assertNotNull($language->script);
     }
+
+    public function testPortuguese()
+    {
+        $pt = Language::getById('pt');
+        $this->assertSame('Portuguese', $pt->name);
+        $this->assertSame(2, count($pt->categories));
+        $this->assertSame('one', $pt->categories[0]->id);
+
+        $ptPT = Language::getById('pt-PT');
+        $this->assertSame('European Portuguese', $ptPT->name);
+        $this->assertSame(2, count($ptPT->categories));
+        $this->assertSame('one', $ptPT->categories[0]->id);
+
+        $ptBR = Language::getById('pt-BR');
+        $this->assertSame('Brazilian Portuguese', $ptBR->name);
+        $this->assertSame(2, count($ptBR->categories));
+        $this->assertSame('one', $ptBR->categories[0]->id);
+
+        $ptCV = Language::getById('pt-CV');
+        $this->assertSame('Portuguese (Cape Verde)', $ptCV->name);
+        $this->assertSame(2, count($ptCV->categories));
+        $this->assertSame('one', $ptCV->categories[0]->id);
+
+        $this->assertSame($pt->formula, $ptBR->formula);
+        $this->assertNotSame($pt->formula, $ptPT->formula);
+        $this->assertSame($ptBR->formula, $ptCV->formula);
+    }
 }