Skip to content

Commit 4d61d67

Browse files
mlocatimlocati
authored
Merge pull request #47 from php-gettext/cldr-42
Update CLDR data from 40 to 42
2 parents ed56dd2 + 737cb57 commit 4d61d67

7 files changed

Lines changed: 75 additions & 25 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: "7.2"
19+
php-version: "8.1"
2020
extensions: mbstring, zip
2121
tools: composer:2, php-cs-fixer:3
2222
coverage: none
@@ -44,11 +44,14 @@ jobs:
4444
- "7.4"
4545
- "8.0"
4646
- "8.1"
47+
- "8.2"
4748
include:
4849
- os: windows-latest
49-
php-version: "5.5"
50+
php-version: "5.6"
5051
- os: windows-latest
5152
php-version: "7.4"
53+
- os: windows-latest
54+
php-version: "8.1"
5255
runs-on: ${{ matrix.os }}
5356
steps:
5457
- name: Setup PHP

‎src/CldrData.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,15 +301,11 @@ private static function getData($key)
301301
}
302302
// Fix the languages for which we have plurals
303303
$formerCodes = array(
304-
'in' => 'id', // former Indonesian
305-
'iw' => 'he', // former Hebrew
306-
'ji' => 'yi', // former Yiddish
307304
'jw' => 'jv', // former Javanese
308305
'mo' => 'ro_MD', // former Moldavian
309306
);
310307
$knownMissingLanguages = array(
311308
'guw' => 'Gun',
312-
'hnj' => 'Mong Njua',
313309
'nah' => 'Nahuatl',
314310
'smi' => 'Sami',
315311
);

‎src/FormulaConverter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ private static function expandAtom($atom)
162162
}
163163
switch ($op) {
164164
case '==':
165-
return '(' . implode(' || ', $chunks) . ')'; break;
165+
return '(' . implode(' || ', $chunks) . ')';
166166
case '!=':
167167
return implode(' && ', $chunks);
168168
}

‎src/cldr-data/main/en-US/languages.json‎

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"en-US": {
44
"identity": {
55
"version": {
6-
"_cldrVersion": "40"
6+
"_cldrVersion": "42"
77
},
88
"language": "en",
99
"territory": "US"
@@ -31,6 +31,7 @@
3131
"am": "Amharic",
3232
"an": "Aragonese",
3333
"ang": "Old English",
34+
"ann": "Obolo",
3435
"anp": "Angika",
3536
"ar": "Arabic",
3637
"ar-001": "Modern Standard Arabic",
@@ -48,6 +49,7 @@
4849
"asa": "Asu",
4950
"ase": "American Sign Language",
5051
"ast": "Asturian",
52+
"atj": "Atikamekw",
5153
"av": "Avaric",
5254
"avk": "Kotava",
5355
"awa": "Awadhi",
@@ -70,14 +72,16 @@
7072
"bfd": "Bafut",
7173
"bfq": "Badaga",
7274
"bg": "Bulgarian",
75+
"bgc": "Haryanvi",
7376
"bgn": "Western Balochi",
7477
"bho": "Bhojpuri",
7578
"bi": "Bislama",
7679
"bik": "Bikol",
7780
"bin": "Bini",
7881
"bjn": "Banjar",
7982
"bkm": "Kom",
80-
"bla": "Siksika",
83+
"bla": "Siksiká",
84+
"blt": "Tai Dam",
8185
"bm": "Bambara",
8286
"bn": "Bangla",
8387
"bo": "Tibetan",
@@ -117,16 +121,25 @@
117121
"ckb": "Central Kurdish",
118122
"ckb-alt-menu": "Kurdish, Central",
119123
"ckb-alt-variant": "Kurdish, Sorani",
124+
"clc": "Chilcotin",
120125
"co": "Corsican",
121126
"cop": "Coptic",
122127
"cps": "Capiznon",
123128
"cr": "Cree",
124-
"crh": "Crimean Turkish",
129+
"crg": "Michif",
130+
"crh": "Crimean Tatar",
131+
"crj": "Southern East Cree",
132+
"crk": "Plains Cree",
133+
"crl": "Northern East Cree",
134+
"crm": "Moose Cree",
135+
"crr": "Carolina Algonquian",
125136
"crs": "Seselwa Creole French",
126137
"cs": "Czech",
127138
"csb": "Kashubian",
139+
"csw": "Swampy Cree",
128140
"cu": "Church Slavic",
129141
"cv": "Chuvash",
142+
"cwd": "Woods Cree",
130143
"cy": "Welsh",
131144
"da": "Danish",
132145
"dak": "Dakota",
@@ -180,7 +193,7 @@
180193
"fa-AF": "Dari",
181194
"fan": "Fang",
182195
"fat": "Fanti",
183-
"ff": "Fulah",
196+
"ff": "Fula",
184197
"fi": "Finnish",
185198
"fil": "Filipino",
186199
"fit": "Tornedalen Finnish",
@@ -230,19 +243,25 @@
230243
"hai": "Haida",
231244
"hak": "Hakka Chinese",
232245
"haw": "Hawaiian",
246+
"hax": "Southern Haida",
247+
"hdn": "Northern Haida",
233248
"he": "Hebrew",
234249
"hi": "Hindi",
250+
"hi-Latn": "Hindi (Latin)",
251+
"hi-Latn-alt-variant": "Hinglish",
235252
"hif": "Fiji Hindi",
236253
"hil": "Hiligaynon",
237254
"hit": "Hittite",
238255
"hmn": "Hmong",
256+
"hnj": "Hmong Njua",
239257
"ho": "Hiri Motu",
240258
"hr": "Croatian",
241259
"hsb": "Upper Sorbian",
242260
"hsn": "Xiang Chinese",
243261
"ht": "Haitian Creole",
244262
"hu": "Hungarian",
245263
"hup": "Hupa",
264+
"hur": "Halkomelem",
246265
"hy": "Armenian",
247266
"hz": "Herero",
248267
"ia": "Interlingua",
@@ -253,6 +272,8 @@
253272
"ig": "Igbo",
254273
"ii": "Sichuan Yi",
255274
"ik": "Inupiaq",
275+
"ike": "Eastern Canadian Inuktitut",
276+
"ikt": "Western Canadian Inuktitut",
256277
"ilo": "Iloko",
257278
"inh": "Ingush",
258279
"io": "Ido",
@@ -319,19 +340,21 @@
319340
"kut": "Kutenai",
320341
"kv": "Komi",
321342
"kw": "Cornish",
343+
"kwk": "Kwakʼwala",
322344
"ky": "Kyrgyz",
323345
"ky-alt-variant": "Kirghiz",
324346
"la": "Latin",
325347
"lad": "Ladino",
326348
"lag": "Langi",
327-
"lah": "Lahnda",
349+
"lah": "Western Panjabi",
328350
"lam": "Lamba",
329351
"lb": "Luxembourgish",
330352
"lez": "Lezghian",
331353
"lfn": "Lingua Franca Nova",
332354
"lg": "Ganda",
333355
"li": "Limburgish",
334356
"lij": "Ligurian",
357+
"lil": "Lillooet",
335358
"liv": "Livonian",
336359
"lkt": "Lakota",
337360
"lmo": "Lombard",
@@ -341,6 +364,7 @@
341364
"lou": "Louisiana Creole",
342365
"loz": "Lozi",
343366
"lrc": "Northern Luri",
367+
"lsm": "Saamia",
344368
"lt": "Lithuanian",
345369
"ltg": "Latgalian",
346370
"lu": "Luba-Katanga",
@@ -379,6 +403,7 @@
379403
"mn": "Mongolian",
380404
"mnc": "Manchu",
381405
"mni": "Manipuri",
406+
"moe": "Innu-aimun",
382407
"moh": "Mohawk",
383408
"mos": "Mossi",
384409
"mr": "Marathi",
@@ -432,6 +457,12 @@
432457
"nzi": "Nzima",
433458
"oc": "Occitan",
434459
"oj": "Ojibwa",
460+
"ojb": "Northwestern Ojibwa",
461+
"ojc": "Central Ojibwa",
462+
"ojg": "Eastern Ojibwa",
463+
"ojs": "Oji-Cree",
464+
"ojw": "Western Ojibwa",
465+
"oka": "Okanagan",
435466
"om": "Oromo",
436467
"or": "Odia",
437468
"os": "Ossetic",
@@ -451,10 +482,12 @@
451482
"pfl": "Palatine German",
452483
"phn": "Phoenician",
453484
"pi": "Pali",
485+
"pis": "Pijin",
454486
"pl": "Polish",
455487
"pms": "Piedmontese",
456488
"pnt": "Pontic",
457489
"pon": "Pohnpeian",
490+
"pqm": "Maliseet-Passamaquoddy",
458491
"prg": "Prussian",
459492
"pro": "Old Provençal",
460493
"ps": "Pashto",
@@ -486,7 +519,7 @@
486519
"rwk": "Rwa",
487520
"sa": "Sanskrit",
488521
"sad": "Sandawe",
489-
"sah": "Sakha",
522+
"sah": "Yakut",
490523
"sam": "Samaritan Aramaic",
491524
"saq": "Samburu",
492525
"sas": "Sasak",
@@ -518,6 +551,7 @@
518551
"sid": "Sidamo",
519552
"sk": "Slovak",
520553
"sl": "Slovenian",
554+
"slh": "Southern Lushootseed",
521555
"sli": "Lower Silesian",
522556
"sly": "Selayar",
523557
"sm": "Samoan",
@@ -542,6 +576,7 @@
542576
"ssy": "Saho",
543577
"st": "Southern Sotho",
544578
"stq": "Saterland Frisian",
579+
"str": "Straits Salish",
545580
"su": "Sundanese",
546581
"suk": "Sukuma",
547582
"sus": "Susu",
@@ -554,14 +589,17 @@
554589
"syr": "Syriac",
555590
"szl": "Silesian",
556591
"ta": "Tamil",
592+
"tce": "Southern Tutchone",
557593
"tcy": "Tulu",
558594
"te": "Telugu",
559595
"tem": "Timne",
560596
"teo": "Teso",
561597
"ter": "Tereno",
562598
"tet": "Tetum",
563599
"tg": "Tajik",
600+
"tgx": "Tagish",
564601
"th": "Thai",
602+
"tht": "Tahltan",
565603
"ti": "Tigrinya",
566604
"tig": "Tigre",
567605
"tiv": "Tiv",
@@ -576,14 +614,17 @@
576614
"tn": "Tswana",
577615
"to": "Tongan",
578616
"tog": "Nyasa Tonga",
617+
"tok": "Toki Pona",
579618
"tpi": "Tok Pisin",
580619
"tr": "Turkish",
581620
"tru": "Turoyo",
582621
"trv": "Taroko",
622+
"trw": "Torwali",
583623
"ts": "Tsonga",
584624
"tsd": "Tsakonian",
585625
"tsi": "Tsimshian",
586626
"tt": "Tatar",
627+
"ttm": "Northern Tutchone",
587628
"ttt": "Muslim Tat",
588629
"tum": "Tumbuka",
589630
"tvl": "Tuvalu",

‎src/cldr-data/main/en-US/scripts.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"en-US": {
44
"identity": {
55
"version": {
6-
"_cldrVersion": "40"
6+
"_cldrVersion": "42"
77
},
88
"language": "en",
99
"territory": "US"
@@ -90,6 +90,7 @@
9090
"Jurc": "Jurchen",
9191
"Kali": "Kayah Li",
9292
"Kana": "Katakana",
93+
"Kawi": "Kawi",
9394
"Khar": "Kharoshthi",
9495
"Khmr": "Khmer",
9596
"Khoj": "Khojki",
@@ -129,6 +130,7 @@
129130
"Mtei": "Meitei Mayek",
130131
"Mult": "Multani",
131132
"Mymr": "Myanmar",
133+
"Nagm": "Nag Mundari",
132134
"Nand": "Nandinagari",
133135
"Narb": "Old North Arabian",
134136
"Nbat": "Nabataean",

‎src/cldr-data/main/en-US/territories.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"en-US": {
44
"identity": {
55
"version": {
6-
"_cldrVersion": "40"
6+
"_cldrVersion": "42"
77
},
88
"language": "en",
99
"territory": "US"
@@ -230,6 +230,7 @@
230230
"NR": "Nauru",
231231
"NU": "Niue",
232232
"NZ": "New Zealand",
233+
"NZ-alt-variant": "Aotearoa New Zealand",
233234
"OM": "Oman",
234235
"PA": "Panama",
235236
"PE": "Peru",
@@ -289,6 +290,7 @@
289290
"TN": "Tunisia",
290291
"TO": "Tonga",
291292
"TR": "Turkey",
293+
"TR-alt-variant": "Türkiye",
292294
"TT": "Trinidad & Tobago",
293295
"TV": "Tuvalu",
294296
"TW": "Taiwan",

0 commit comments

Comments
 (0)