Skip to content

Commit

Permalink
Merge pull request #634 from giggsey/upstream-8.13.38
Browse files Browse the repository at this point in the history
Upstream metadata changes from Google for v8.13.38
  • Loading branch information
giggsey committed Jun 10, 2024
2 parents 536c747 + 5a9b0d6 commit 2cba3d6
Show file tree
Hide file tree
Showing 13 changed files with 40 additions and 131 deletions.
2 changes: 1 addition & 1 deletion METADATA-VERSION.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# It can be a commit, branch or tag of the https://github.com/google/libphonenumber project
#
# For more information, look at the phing tasks in build.xml
v8.13.37
v8.13.38
1 change: 1 addition & 0 deletions src/carrier/data/en/244.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
24493 => 'UNITEL',
24494 => 'UNITEL',
24495 => 'Africell',
24497 => 'UNITEL',
24499 => 'Movicel',
);
10 changes: 8 additions & 2 deletions src/carrier/data/en/40.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
407019 => 'Lycamobile',
40702 => 'Lycamobile',
40705 => 'Iristel',
40711 => 'Telekom',
40711 => 'Orange',
40712 => 'Orange',
40713 => 'Orange',
4072 => 'Vodafone',
Expand All @@ -41,6 +41,12 @@
40775 => 'Digi Mobil',
40776 => 'Digi Mobil',
40777 => 'Digi Mobil',
4078 => 'Telekom',
40780 => 'Telekom',
40783 => 'Orange',
40784 => 'Telekom',
40785 => 'Telekom',
40786 => 'Telekom',
40787 => 'Orange',
40788 => 'Telekom',
4079 => 'Vodafone',
);
8 changes: 4 additions & 4 deletions src/carrier/data/en/44.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
4474061 => 'Cheers',
4474062 => 'Cheers',
4474065 => 'Telecom2',
4474066 => '24 Seven',
4474066 => 'Sure',
4474067 => 'TGL',
4474068 => '08Direct',
4474069 => 'CardBoardFish',
Expand Down Expand Up @@ -577,7 +577,7 @@
4478928 => 'O2',
4478929 => 'O2',
4478930 => 'Magrathea',
4478931 => '24 Seven',
4478931 => 'Sure',
4478932 => 'O2',
4478933 => 'Yim Siam',
4478934 => 'O2',
Expand Down Expand Up @@ -605,9 +605,9 @@
447910 => 'EE',
4479110 => 'Marathon Telecom',
4479111 => 'JT',
4479112 => '24 Seven',
4479112 => 'Sure',
4479117 => 'JT',
4479118 => '24 Seven',
4479118 => 'Sure',
447912 => 'O2',
447913 => 'EE',
447914 => 'EE',
Expand Down
3 changes: 3 additions & 0 deletions src/carrier/data/en/46.php
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@
46720902 => 'Telavox AB',
46720908 => 'Telavox AB',
4672092 => 'Telavox AB',
46720995 => 'Telavox AB',
46720996 => 'Telavox AB',
46720999 => 'MOBIWEB LTD',
467210 => 'SVENSK KONSUMENTMOBI',
467211 => 'SVENSK KONSUMENTMOBI',
Expand Down Expand Up @@ -282,6 +284,7 @@
46726428 => 'Global Telefoni Sve',
46726429 => 'Global Telefoni Sve',
4672644 => 'Telenor Sverige',
4672648 => 'Telavox AB',
467265 => 'TeliaSonera',
4672660 => 'Telenor Sverige',
4672666 => 'Telenor Sverige',
Expand Down
1 change: 1 addition & 0 deletions src/carrier/data/en/592.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,5 @@
592741 => 'E-Networks',
592742 => 'E-Networks',
592749 => 'GTT',
59275 => 'GTT',
);
19 changes: 8 additions & 11 deletions src/carrier/data/en/691.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,15 @@
*/

return array (
69132 => 'FSMTC',
69133 => 'FSMTC',
69135 => 'FSMTC',
69137 => 'FSMTC',
6918 => 'FSMTC',
691920 => 'FSMTC',
691921 => 'FSMTC',
691922 => 'FSMTC',
691923 => 'FSMTC',
691924 => 'FSMTC',
691925 => 'FSMTC',
691926 => 'FSMTC',
691930 => 'FSMTC',
691931 => 'FSMTC',
691932 => 'FSMTC',
691933 => 'FSMTC',
69192 => 'FSMTC',
69193 => 'FSMTC',
69194 => 'FSMTC',
69195 => 'FSMTC',
69196 => 'BOOM!',
69197 => 'FSMTC',
);
2 changes: 1 addition & 1 deletion src/data/PhoneNumberMetadata_AO.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
),
'mobile' =>
array (
'NationalNumberPattern' => '9[1-59]\\d{7}',
'NationalNumberPattern' => '9[1-579]\\d{7}',
'ExampleNumber' => '923123456',
'PossibleLength' =>
array (
Expand Down
2 changes: 1 addition & 1 deletion src/data/PhoneNumberMetadata_GB.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
),
'fixedLine' =>
array (
'NationalNumberPattern' => '(?:1(?:1(?:3(?:[0-58]\\d\\d|73[0235])|4(?:(?:[0-5]\\d|70)\\d|69[7-9])|(?:(?:5[0-26-9]|[78][0-49])\\d|6(?:[0-4]\\d|50))\\d)|(?:2(?:(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\\d)\\d|1(?:[0-7]\\d|8[0-2]))|(?:3(?:0\\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))\\d)\\d)|2(?:0[013478]|3[0189]|4[017]|8[0-46-9]|9[0-2])\\d{3})\\d{4}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\\d)|76\\d)|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[5-7]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|7(?:26(?:6[13-9]|7[0-7])|(?:442|688)\\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d{3}',
'NationalNumberPattern' => '(?:1(?:1(?:3(?:[0-58]\\d\\d|73[0-35])|4(?:(?:[0-5]\\d|70)\\d|69[7-9])|(?:(?:5[0-26-9]|[78][0-49])\\d|6(?:[0-4]\\d|50))\\d)|(?:2(?:(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\\d)\\d|1(?:[0-7]\\d|8[0-3]))|(?:3(?:0\\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))\\d)\\d)|2(?:0[013478]|3[0189]|4[017]|8[0-46-9]|9[0-2])\\d{3})\\d{4}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\\d)|76\\d)|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[5-7]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|7(?:26(?:6[13-9]|7[0-7])|(?:442|688)\\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d{3}',
'ExampleNumber' => '1212345678',
'PossibleLength' =>
array (
Expand Down
2 changes: 1 addition & 1 deletion src/data/PhoneNumberMetadata_GY.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
),
'mobile' =>
array (
'NationalNumberPattern' => '(?:510|6\\d\\d|7(?:[013]\\d|2[0-25-8]|4[0-29]))\\d{4}',
'NationalNumberPattern' => '(?:510|6\\d\\d|7(?:[013]\\d|2[0-25-8]|4[0-29]|5[1-9]))\\d{4}',
'ExampleNumber' => '6091234',
'PossibleLength' =>
array (
Expand Down
2 changes: 1 addition & 1 deletion src/data/PhoneNumberMetadata_HK.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
),
'fixedLine' =>
array (
'NationalNumberPattern' => '(?:2(?:[13-9]\\d|2[013-9])\\d|3(?:(?:[1569][0-24-9]|4[0-246-9]|7[0-24-69])\\d|8(?:4[0-8]|[59]\\d|6[01]))|58(?:0[1-9]|1[2-9]))\\d{4}',
'NationalNumberPattern' => '(?:2(?:[13-9]\\d|2[013-9])\\d|3(?:(?:[1569][0-24-9]|4[0-246-9]|7[0-24-69])\\d|8(?:4[0-8]|[59]\\d|6[0-2]))|58(?:0[1-9]|1[2-9]))\\d{4}',
'ExampleNumber' => '21234567',
'PossibleLength' =>
array (
Expand Down
70 changes: 7 additions & 63 deletions src/data/PhoneNumberMetadata_MX.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
return array (
'generalDesc' =>
array (
'NationalNumberPattern' => '1(?:(?:22|44|7[27]|87|9[69])[1-9]|65[0-689])\\d{7}|(?:1(?:[01]\\d|2[13-9]|[35][1-9]|4[0-35-9]|6[0-46-9]|7[013-689]|8[1-69]|9[1-578])|[2-9]\\d)\\d{8}',
'NationalNumberPattern' => '[2-9]\\d{9}',
'PossibleLength' =>
array (
0 => 10,
1 => 11,
),
'PossibleLengthLocalOnly' =>
array (
Expand All @@ -32,7 +31,6 @@
'ExampleNumber' => '2001234567',
'PossibleLength' =>
array (
0 => 10,
),
'PossibleLengthLocalOnly' =>
array (
Expand All @@ -42,8 +40,8 @@
),
'mobile' =>
array (
'NationalNumberPattern' => '657[12]\\d{6}|(?:1(?:2(?:2[1-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-7][1-9]|3[1-8]|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1-467][1-9]|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))|2(?:2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}',
'ExampleNumber' => '12221234567',
'NationalNumberPattern' => '657[12]\\d{6}|(?:2(?:2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}',
'ExampleNumber' => '2221234567',
'PossibleLength' =>
array (
),
Expand All @@ -59,7 +57,6 @@
'ExampleNumber' => '8001234567',
'PossibleLength' =>
array (
0 => 10,
),
'PossibleLengthLocalOnly' =>
array (
Expand All @@ -71,7 +68,6 @@
'ExampleNumber' => '9001234567',
'PossibleLength' =>
array (
0 => 10,
),
'PossibleLengthLocalOnly' =>
array (
Expand All @@ -83,7 +79,6 @@
'ExampleNumber' => '3001234567',
'PossibleLength' =>
array (
0 => 10,
),
'PossibleLengthLocalOnly' =>
array (
Expand All @@ -95,7 +90,6 @@
'ExampleNumber' => '5001234567',
'PossibleLength' =>
array (
0 => 10,
),
'PossibleLengthLocalOnly' =>
array (
Expand Down Expand Up @@ -155,8 +149,6 @@
'countryCode' => 52,
'internationalPrefix' => '0[09]',
'preferredInternationalPrefix' => '00',
'nationalPrefix' => '01',
'nationalPrefixForParsing' => '0(?:[12]|4[45])|1',
'sameMobileAndFixedLinePattern' => false,
'numberFormat' =>
array (
Expand All @@ -182,7 +174,7 @@
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => true,
'nationalPrefixOptionalWhenFormatting' => false,
),
2 =>
array (
Expand All @@ -194,31 +186,7 @@
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => true,
),
3 =>
array (
'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})',
'format' => '$2 $3 $4',
'leadingDigitsPatterns' =>
array (
0 => '1(?:33|5[56]|81)',
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => true,
),
4 =>
array (
'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{4})',
'format' => '$2 $3 $4',
'leadingDigitsPatterns' =>
array (
0 => '1',
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => true,
'nationalPrefixOptionalWhenFormatting' => false,
),
),
'intlNumberFormat' =>
Expand All @@ -233,7 +201,7 @@
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => true,
'nationalPrefixOptionalWhenFormatting' => false,
),
1 =>
array (
Expand All @@ -245,31 +213,7 @@
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => true,
),
2 =>
array (
'pattern' => '(\\d)(\\d{2})(\\d{4})(\\d{4})',
'format' => '$2 $3 $4',
'leadingDigitsPatterns' =>
array (
0 => '1(?:33|5[56]|81)',
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => true,
),
3 =>
array (
'pattern' => '(\\d)(\\d{3})(\\d{3})(\\d{4})',
'format' => '$2 $3 $4',
'leadingDigitsPatterns' =>
array (
0 => '1',
),
'nationalPrefixFormattingRule' => '',
'domesticCarrierCodeFormattingRule' => '',
'nationalPrefixOptionalWhenFormatting' => true,
'nationalPrefixOptionalWhenFormatting' => false,
),
),
'mainCountryForCode' => false,
Expand Down
49 changes: 3 additions & 46 deletions src/timezone/data/map_data.php
Original file line number Diff line number Diff line change
Expand Up @@ -2155,7 +2155,8 @@
3518 => 'Atlantic/Azores&Europe/Lisbon',
3519 => 'Atlantic/Azores&Europe/Lisbon',
352 => 'Europe/Luxembourg',
353 => 'Europe/Dublin',
353 => 'Europe/Guernsey&Europe/Isle_of_Man&Europe/London',
353539253 => 'Europe/Guernsey&Europe/Isle_of_Man&Europe/London',
354 => 'Atlantic/Reykjavik',
355 => 'Europe/Tirane',
356 => 'Europe/Malta',
Expand Down Expand Up @@ -2184,7 +2185,7 @@
370 => 'Europe/Bucharest',
371 => 'Europe/Bucharest',
372 => 'Europe/Bucharest',
373 => 'Europe/Bucharest',
373 => 'Europe/Chisinau',
374 => 'Asia/Yerevan',
375 => 'Europe/Moscow',
376 => 'Europe/Andorra',
Expand Down Expand Up @@ -2274,50 +2275,6 @@
509 => 'America/Port-au-Prince',
51 => 'America/Lima',
52 => 'America/Hermosillo&America/Mazatlan&America/Mexico_City&America/New_York&America/Tijuana',
521 => 'America/Mexico_City',
521311 => 'America/Mazatlan',
521319 => 'America/Mazatlan',
521323 => 'America/Mazatlan',
521324 => 'America/Mazatlan',
521325 => 'America/Mazatlan',
521327 => 'America/Mazatlan',
521389 => 'America/Mazatlan',
521612 => 'America/Mazatlan',
521613 => 'America/Mazatlan',
521614 => 'America/Mazatlan',
521615 => 'America/Mazatlan',
521616 => 'America/Tijuana',
52162 => 'America/Mazatlan',
521626 => 'America/Hermosillo&America/Tijuana',
52163 => 'America/Mazatlan',
521636 => 'America/Hermosillo&America/Mazatlan',
52164 => 'America/Mazatlan',
521646 => 'America/Tijuana',
521647 => 'America/Mazatlan&America/Tijuana',
521651 => 'America/Mazatlan',
521652 => 'America/Mazatlan',
521653 => 'America/Mazatlan',
521656 => 'America/Hermosillo',
521658 => 'America/Tijuana',
521659 => 'America/Mazatlan',
521661 => 'America/Tijuana',
521662 => 'America/Mazatlan',
521663 => 'America/Mazatlan',
521664 => 'America/Tijuana',
521665 => 'America/Tijuana',
521667 => 'America/Mazatlan',
521668 => 'America/Mazatlan',
521669 => 'America/Mazatlan',
521672 => 'America/Mazatlan',
521673 => 'America/Mazatlan',
521686 => 'America/Tijuana',
521687 => 'America/Mazatlan',
52169 => 'America/Mazatlan',
521877 => 'America/Mexico_City&America/Tijuana',
521983 => 'America/New_York',
521984 => 'America/New_York',
521987 => 'America/New_York',
521998 => 'America/New_York',
522 => 'America/Mexico_City',
52200 => 'America/Mexico_City&America/Tijuana',
52201 => 'America/Mexico_City&America/New_York',
Expand Down

0 comments on commit 2cba3d6

Please sign in to comment.