archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source 
* PHP-8.3:
  Fix intl tests for icu 77 (#18125)
This commit is contained in:
Niels Dossche 2025-03-21 14:25:18 +01:00
commit fe7f9571d2
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ext/intl/tests/locale_get_display_name8.phpt
View file

@ -112,9 +112,9 @@ disp_locale=fr : display_name=slovène #Italie, NEDIS_KIRTI#
disp_locale=de : display_name=Slowenisch #Italien, NEDIS_KIRTI#
-----------------
locale='sl_IT_nedis-a-kirti-x-xyz'
disp_locale=en : display_name=Slovenian #Italy, NEDIS_A_KIRTI_X_XYZ#
disp_locale=fr : display_name=slovène #Italie, NEDIS_A_KIRTI_X_XYZ#
disp_locale=de : display_name=Slowenisch #Italien, NEDIS_A_KIRTI_X_XYZ#
disp_locale=en : display_name=Slovenian #Italy, NEDIS_A_KIRTI(_X_XYZ)?#
disp_locale=fr : display_name=slovène #Italie, NEDIS_A_KIRTI(_X_XYZ)?#
disp_locale=de : display_name=Slowenisch #Italien, NEDIS_A_KIRTI(_X_XYZ)?#
-----------------
locale='sl_IT_rozaj'
disp_locale=en : display_name=Slovenian #Italy, Resian#
@ -317,9 +317,9 @@ disp_locale=fr : display_name=anglais #États-Unis, attribute=islamcal#
disp_locale=de : display_name=Englisch #Vereinigte Staaten, attribute=islamcal#
-----------------
locale='zh-CN-a-myExt-x-private'
disp_locale=en : display_name=Chinese #China(, A_MYEXT_X_PRIVATE)?, a=myext, Private-Use=private#
disp_locale=fr : display_name=chinois #Chine(, A_MYEXT_X_PRIVATE)?, a=myext, usage privé=private#
disp_locale=de : display_name=Chinesisch #China(, A_MYEXT_X_PRIVATE)?, a=myext, Privatnutzung=private#
disp_locale=en : display_name=Chinese #China(, A_MYEXT(_X_PRIVATE)?)?, a=myext, Private-Use=private#
disp_locale=fr : display_name=chinois #Chine(, A_MYEXT(_X_PRIVATE)?)?, a=myext, usage privé=private#
disp_locale=de : display_name=Chinesisch #China(, A_MYEXT(_X_PRIVATE)?)?, a=myext, Privatnutzung=private#
-----------------
locale='en-a-myExt-b-another'
disp_locale=en : display_name=English #(A_MYEXT_B_ANOTHER, )?a=myext, b=another#

6
ext/intl/tests/locale_get_display_variant2.phpt
View file

@ -248,9 +248,9 @@ disp_locale=fr : display_variant=
disp_locale=de : display_variant=
-----------------
locale='zh-CN-a-myExt-x-private'
disp_locale=en : display_variant=(A_MYEXT_X_PRIVATE)?
disp_locale=fr : display_variant=(A_MYEXT_X_PRIVATE)?
disp_locale=de : display_variant=(A_MYEXT_X_PRIVATE)?
disp_locale=en : display_variant=(A_MYEXT(_X_PRIVATE)?)?
disp_locale=fr : display_variant=(A_MYEXT(_X_PRIVATE)?)?
disp_locale=de : display_variant=(A_MYEXT(_X_PRIVATE)?)?
-----------------
locale='en-a-myExt-b-another'
disp_locale=en : display_variant=((A_)?MYEXT_B_ANOTHER)?