Skip to content

Commit da130eb

Browse files
committed
Merge branch '4.4'
* 4.4: fix case [Messenger] Removed named parameters and replaced with `?` placeholders for sqlsrv compatibility [FrameworkBundle] Detect indirect env vars in routing [Form] type cannot be a FormTypeInterface anymore [HttpClient] use "idle" instead of "inactivity" when telling about the timeout option Create mailBody with only attachments part present Remove calls to deprecated function assertAttributeX [PhpUnitBridge] make the bridge act as a polyfill for newest PHPUnit features [Intl] Order alpha2 to alpha3 mapping [Routing] added a warning about the getRouteCollection() method Allow sutFqcnResolver to return array [Messenger] Fix incompatibility with FrameworkBundle <4.3.1 Created alias to FlattenException to avoid BC break [Ldap] Add security LdapUser and provider [HttpFoundation] Revert getClientIp @return docblock
2 parents ac3c6c4 + 836c959 commit da130eb

File tree

2 files changed

+23
-21
lines changed

2 files changed

+23
-21
lines changed

Data/Generator/LanguageDataGenerator.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@ private function generateAlpha2ToAlpha3Mapping(ArrayAccessibleResourceBundle $me
205205
}
206206
}
207207

208+
asort($alpha2ToAlpha3);
209+
208210
return $alpha2ToAlpha3;
209211
}
210212
}

Resources/data/languages/meta.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -622,35 +622,29 @@
622622
"Alpha2ToAlpha3": {
623623
"aa": "aar",
624624
"ab": "abk",
625-
"dz": "dzo",
626625
"af": "afr",
627626
"ak": "aka",
628-
"sq": "sqi",
629627
"am": "amh",
630628
"ar": "ara",
631629
"an": "arg",
632-
"hy": "hye",
633630
"as": "asm",
634631
"av": "ava",
635632
"ae": "ave",
636633
"ay": "aym",
637634
"az": "aze",
638635
"ba": "bak",
639636
"bm": "bam",
640-
"eu": "eus",
641637
"be": "bel",
642638
"bn": "ben",
643639
"bi": "bis",
644640
"bo": "bod",
645641
"bs": "bos",
646642
"br": "bre",
647643
"bg": "bul",
648-
"my": "mya",
649644
"ca": "cat",
650645
"cs": "ces",
651646
"ch": "cha",
652647
"ce": "che",
653-
"zh": "zho",
654648
"cu": "chu",
655649
"cv": "chv",
656650
"kw": "cor",
@@ -660,13 +654,12 @@
660654
"da": "dan",
661655
"de": "deu",
662656
"dv": "div",
663-
"mn": "mon",
664-
"nl": "nld",
665-
"et": "est",
657+
"dz": "dzo",
666658
"el": "ell",
667659
"en": "eng",
668660
"eo": "epo",
669-
"ik": "ipk",
661+
"et": "est",
662+
"eu": "eus",
670663
"ee": "ewe",
671664
"fo": "fao",
672665
"fa": "fas",
@@ -675,8 +668,6 @@
675668
"fr": "fra",
676669
"fy": "fry",
677670
"ff": "ful",
678-
"om": "orm",
679-
"ka": "kat",
680671
"gd": "gla",
681672
"ga": "gle",
682673
"gl": "glg",
@@ -691,31 +682,34 @@
691682
"ho": "hmo",
692683
"hr": "hrv",
693684
"hu": "hun",
685+
"hy": "hye",
694686
"ig": "ibo",
695-
"is": "isl",
696687
"io": "ido",
697688
"ii": "iii",
698689
"iu": "iku",
699690
"ie": "ile",
700691
"ia": "ina",
701692
"id": "ind",
693+
"ik": "ipk",
694+
"is": "isl",
702695
"it": "ita",
703696
"jv": "jav",
704697
"ja": "jpn",
705698
"kl": "kal",
706699
"kn": "kan",
707700
"ks": "kas",
701+
"ka": "kat",
708702
"kr": "kau",
709703
"kk": "kaz",
710704
"km": "khm",
711705
"ki": "kik",
712706
"rw": "kin",
713707
"ky": "kir",
714-
"ku": "kur",
715-
"kg": "kon",
716708
"kv": "kom",
709+
"kg": "kon",
717710
"ko": "kor",
718711
"kj": "kua",
712+
"ku": "kur",
719713
"lo": "lao",
720714
"la": "lat",
721715
"lv": "lav",
@@ -725,40 +719,43 @@
725719
"lb": "ltz",
726720
"lu": "lub",
727721
"lg": "lug",
728-
"mk": "mkd",
729722
"mh": "mah",
730723
"ml": "mal",
731-
"mi": "mri",
732724
"mr": "mar",
733-
"ms": "msa",
725+
"mk": "mkd",
734726
"mg": "mlg",
735727
"mt": "mlt",
736-
"ro": "ron",
728+
"mn": "mon",
729+
"mi": "mri",
730+
"ms": "msa",
731+
"my": "mya",
737732
"na": "nau",
738733
"nv": "nav",
739734
"nr": "nbl",
740735
"nd": "nde",
741736
"ng": "ndo",
742737
"ne": "nep",
738+
"nl": "nld",
743739
"nn": "nno",
744740
"nb": "nob",
745741
"ny": "nya",
746742
"oc": "oci",
747743
"oj": "oji",
748744
"or": "ori",
745+
"om": "orm",
749746
"os": "oss",
750747
"pa": "pan",
751-
"ps": "pus",
752748
"pi": "pli",
753749
"pl": "pol",
754750
"pt": "por",
751+
"ps": "pus",
755752
"qu": "que",
756753
"rm": "roh",
754+
"ro": "ron",
757755
"rn": "run",
758756
"ru": "rus",
759757
"sg": "sag",
760758
"sa": "san",
761-
"sr": "srp",
762759
"si": "sin",
763760
"sk": "slk",
764761
"sl": "slv",
@@ -769,7 +766,9 @@
769766
"so": "som",
770767
"st": "sot",
771768
"es": "spa",
769+
"sq": "sqi",
772770
"sc": "srd",
771+
"sr": "srp",
773772
"ss": "ssw",
774773
"su": "sun",
775774
"sw": "swa",
@@ -799,6 +798,7 @@
799798
"yi": "yid",
800799
"yo": "yor",
801800
"za": "zha",
801+
"zh": "zho",
802802
"zu": "zul"
803803
}
804804
}

0 commit comments

Comments
 (0)