Skip to content

Commit 2746ae0

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.3
* 3.4: [Intl] Update the ICU data to 65.1 [VarDumper] fix dumping uninitialized SplFileInfo Added missing translations. Fixed invalid VarDumper upgrade doc. [HttpFoundation] Check if data passed to SessionBagProxy::initialize is an array Don't let falsey usernames slip through
2 parents 41ddd6c + 3f40bc9 commit 2746ae0

File tree

890 files changed

+6050
-3639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

890 files changed

+6050
-3639
lines changed

‎Intl.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public static function getIcuDataVersion()
256256
*/
257257
public static function getIcuStubVersion()
258258
{
259-
return '64.2';
259+
return '65.1';
260260
}
261261

262262
/**

‎Resources/data/currencies/af.json‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"Version": "2.1.48.17",
2+
"Version": "36",
33
"Names": {
44
"AED": [
55
"AED",
6-
"Verenigde Arabiese Emirate dirham"
6+
"Verenigde Arabiese Emirate-dirham"
77
],
88
"AFN": [
99
"AFN",
@@ -91,11 +91,11 @@
9191
],
9292
"BWP": [
9393
"BWP",
94-
"Botswana pula"
94+
"Botswana-pula"
9595
],
9696
"BYN": [
9797
"BYN",
98-
"Belo-Russiese roebel"
98+
"Belarusiese roebel"
9999
],
100100
"BYR": [
101101
"BYR",
@@ -106,7 +106,7 @@
106106
"Beliziese dollar"
107107
],
108108
"CAD": [
109-
"CA$",
109+
"CAD",
110110
"Kanadese dollar"
111111
],
112112
"CDF": [
@@ -123,11 +123,11 @@
123123
],
124124
"CNH": [
125125
"CNH",
126-
"Chinese joean"
126+
"Chinese joean (buiteland)"
127127
],
128128
"CNY": [
129129
"CN¥",
130-
"Sjinese joean renminbi"
130+
"Chinese joean"
131131
],
132132
"COP": [
133133
"COP",
@@ -155,7 +155,7 @@
155155
],
156156
"DJF": [
157157
"DJF",
158-
"Djiboeti frank"
158+
"Djiboeti-frank"
159159
],
160160
"DKK": [
161161
"DKK",
@@ -191,7 +191,7 @@
191191
],
192192
"FKP": [
193193
"FKP",
194-
"Falkland-eilande pond"
194+
"Falkland-eilandse pond"
195195
],
196196
"GBP": [
197197
"£",
@@ -235,7 +235,7 @@
235235
],
236236
"HKD": [
237237
"HK$",
238-
"Hong Kong dollar"
238+
"Hongkongse dollar"
239239
],
240240
"HNL": [
241241
"HNL",
@@ -323,7 +323,7 @@
323323
],
324324
"KYD": [
325325
"KYD",
326-
"Cayman-eilande dollar"
326+
"Cayman-eilandse dollar"
327327
],
328328
"KZT": [
329329
"KZT",
@@ -335,7 +335,7 @@
335335
],
336336
"LBP": [
337337
"LBP",
338-
"Lebanese pond"
338+
"Libanese pond"
339339
],
340340
"LKR": [
341341
"LKR",
@@ -399,7 +399,7 @@
399399
],
400400
"MUR": [
401401
"MUR",
402-
"Mauritiaanse rupee"
402+
"Mauritiaanse roepee"
403403
],
404404
"MVR": [
405405
"MVR",
@@ -447,7 +447,7 @@
447447
],
448448
"NZD": [
449449
"NZ$",
450-
"Nieu-Seeland dollar"
450+
"Nieu-Seelandse dollar"
451451
],
452452
"OMR": [
453453
"OMR",
@@ -491,27 +491,27 @@
491491
],
492492
"RSD": [
493493
"RSD",
494-
"Serbiese dinar"
494+
"Serwiese dinar"
495495
],
496496
"RUB": [
497497
"RUB",
498498
"Russiese roebel"
499499
],
500500
"RWF": [
501501
"RWF",
502-
"Rwandiese frank"
502+
"Rwandese frank"
503503
],
504504
"SAR": [
505505
"SAR",
506506
"Saoedi-Arabiese riyal"
507507
],
508508
"SBD": [
509509
"SBD",
510-
"Salomonseilande dollar"
510+
"Salomonseilandse dollar"
511511
],
512512
"SCR": [
513513
"SCR",
514-
"Seychellese rupee"
514+
"Seychellese roepee"
515515
],
516516
"SDG": [
517517
"SDG",
@@ -527,11 +527,11 @@
527527
],
528528
"SGD": [
529529
"SGD",
530-
"Singapoer dollar"
530+
"Singapoer-dollar"
531531
],
532532
"SHP": [
533533
"SHP",
534-
"Sint Helena pond"
534+
"Sint Helena-pond"
535535
],
536536
"SLL": [
537537
"SLL",
@@ -555,7 +555,7 @@
555555
],
556556
"STN": [
557557
"STN",
558-
"São Tomé en Príncipe dobra"
558+
"São Tomé en Príncipe-dobra"
559559
],
560560
"SYP": [
561561
"SYP",
@@ -571,7 +571,7 @@
571571
],
572572
"TJS": [
573573
"TJS",
574-
"Tadjikse roebel"
574+
"Tadjikse somoni"
575575
],
576576
"TMT": [
577577
"TMT",
@@ -591,11 +591,11 @@
591591
],
592592
"TRY": [
593593
"TRY",
594-
"Turkse lier"
594+
"Turkse lira"
595595
],
596596
"TTD": [
597597
"TTD",
598-
"Trinidad en Tobago dollar"
598+
"Trinidad en Tobago-dollar"
599599
],
600600
"TWD": [
601601
"NT$",
@@ -614,8 +614,8 @@
614614
"Ugandese sjieling"
615615
],
616616
"USD": [
617-
"US$",
618-
"Amerikaanse dollar"
617+
"USD",
618+
"VSA-dollar"
619619
],
620620
"UYU": [
621621
"UYU",
@@ -631,7 +631,7 @@
631631
],
632632
"VES": [
633633
"VES",
634-
"Venezolaanse Bolívar"
634+
"Venezolaanse bolívar"
635635
],
636636
"VND": [
637637
"₫",
@@ -647,15 +647,15 @@
647647
],
648648
"XAF": [
649649
"FCFA",
650-
"CFA frank BEAC"
650+
"Sentraal Afrikaanse CFA-frank"
651651
],
652652
"XCD": [
653653
"EC$",
654-
"Oos-Karibbiese dollar"
654+
"Oos-Karibiese dollar"
655655
],
656656
"XOF": [
657657
"CFA",
658-
"CFA frank BCEAO"
658+
"Wes-Afrikaanse CFA-frank"
659659
],
660660
"XPF": [
661661
"CFPF",

‎Resources/data/currencies/af_NA.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.48.22",
2+
"Version": "36",
33
"Names": {
44
"NAD": [
55
"$",

‎Resources/data/currencies/ak.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.47.82",
2+
"Version": "36",
33
"Names": {
44
"AED": [
55
"AED",

‎Resources/data/currencies/am.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.49.82",
2+
"Version": "36",
33
"Names": {
44
"AED": [
55
"AED",

‎Resources/data/currencies/ar.json‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.49.82",
2+
"Version": "36",
33
"Names": {
44
"ADP": [
55
"ADP",
@@ -105,10 +105,6 @@
105105
"BEL",
106106
"فرنك بلجيكي مالي"
107107
],
108-
"BGL": [
109-
"BGL",
110-
"BGL"
111-
],
112108
"BGN": [
113109
"BGN",
114110
"ليف بلغاري"
@@ -314,7 +310,7 @@
314310
"فرنك فرنسي"
315311
],
316312
"GBP": [
317-
"£",
313+
"UK£",
318314
"جنيه إسترليني"
319315
],
320316
"GEL": [

‎Resources/data/currencies/ar_DJ.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.47.69",
2+
"Version": "36",
33
"Names": {
44
"DJF": [
55
"Fdj",

‎Resources/data/currencies/ar_ER.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.47.69",
2+
"Version": "36",
33
"Names": {
44
"ERN": [
55
"Nfk",

‎Resources/data/currencies/ar_KM.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.47.69",
2+
"Version": "36",
33
"Names": {
44
"KMF": [
55
"CF",

‎Resources/data/currencies/ar_LB.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.47.69",
2+
"Version": "36",
33
"Names": {
44
"SDG": [
55
"SDG",

0 commit comments

Comments
 (0)