diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt index 22a43f22..f76b458a 100644 --- a/METADATA-VERSION.txt +++ b/METADATA-VERSION.txt @@ -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.25 +v8.13.26 diff --git a/src/carrier/data/en/228.php b/src/carrier/data/en/228.php index 87e0014b..99371d5a 100644 --- a/src/carrier/data/en/228.php +++ b/src/carrier/data/en/228.php @@ -11,13 +11,13 @@ */ return array ( - 22870 => 'TOGOCEL', - 22871 => 'TOGOCEL', + 22870 => 'Togo Telecom', + 22871 => 'Togo Telecom', 22879 => 'Moov', - 22890 => 'TOGOCEL', - 22891 => 'TOGOCEL', - 22892 => 'TOGOCEL', - 22893 => 'TOGOCEL', + 22890 => 'Togo Telecom', + 22891 => 'Togo Telecom', + 22892 => 'Togo Telecom', + 22893 => 'Togo Telecom', 22896 => 'Moov', 22897 => 'TOGOCEL', 22898 => 'Moov', diff --git a/src/carrier/data/en/385.php b/src/carrier/data/en/385.php index a8ced352..d43cf364 100644 --- a/src/carrier/data/en/385.php +++ b/src/carrier/data/en/385.php @@ -20,6 +20,7 @@ 3859751 => 'Telefocus', 3859754 => 'Lancelot Telecom', 3859757 => 'Mobile One', + 38597595 => 'YATECO', 38597596 => 'Altavox', 38597597 => 'INNOVAC', 385976 => 'Hrvatski Telekom', diff --git a/src/carrier/data/en/40.php b/src/carrier/data/en/40.php index 9fae2a7b..81e473b0 100644 --- a/src/carrier/data/en/40.php +++ b/src/carrier/data/en/40.php @@ -11,6 +11,7 @@ */ return array ( + 406 => 'Vodafone', 407000 => 'Enigma-System', 407013 => 'Lycamobile', 407014 => 'Lycamobile', diff --git a/src/carrier/data/en/45.php b/src/carrier/data/en/45.php index 33436ecb..7847831f 100644 --- a/src/carrier/data/en/45.php +++ b/src/carrier/data/en/45.php @@ -38,15 +38,16 @@ 45227 => 'telenor', 45228 => 'telenor', 45229 => 'telenor', - 45231 => 'tdc', - 45232 => 'tdc', - 45233 => 'tdc', - 45234 => 'tdc', - 45235 => 'tdc', - 45236 => 'tdc', + 45231 => 'Nuuday', + 45232 => 'Nuuday', + 45233 => 'Nuuday', + 45234 => 'Nuuday', + 45235 => 'Nuuday', + 4523561 => 'telenor', + 45236 => 'Nuuday', 45237 => 'tdc', - 45238 => 'tdc', - 45239 => 'tdc', + 45238 => 'Nuuday', + 45239 => 'Nuuday', 452395 => 'telia', 45241 => 'tdc', 45242 => 'tdc', diff --git a/src/carrier/data/en/852.php b/src/carrier/data/en/852.php index 594ca14e..038e3dce 100644 --- a/src/carrier/data/en/852.php +++ b/src/carrier/data/en/852.php @@ -26,6 +26,7 @@ 8524614 => 'HKT', 8524615 => 'China Unicom', 8524616 => 'China Unicom', + 8524617 => 'China Mobile', 8524620 => 'China Mobile', 8524621 => 'China Mobile', 8524622 => 'China Mobile', @@ -61,6 +62,8 @@ 8524678 => 'HKT', 8524679 => 'HKT', 852468 => 'China Mobile', + 852469 => 'China Mobile', + 8524699 => 'South China Telecommunications', 852510 => 'China Mobile', 852511 => 'HKT', 852512 => 'China Mobile', @@ -180,6 +183,7 @@ 852592 => 'HKT', 852593 => 'China Mobile', 852594 => 'HKT', + 852595 => 'China Mobile', 852596 => '3', 852597 => '3', 852598 => 'China Mobile', @@ -276,7 +280,12 @@ 852695 => 'China Mobile', 852697 => 'HKT', 852699 => 'China Mobile', - 852707 => 'SmarTone', + 8527071 => 'SmarTone', + 8527072 => 'SmarTone', + 8527073 => 'SmarTone', + 8527074 => 'SmarTone', + 8527075 => 'SmarTone', + 8527076 => 'China Mobile', 852708 => 'HKT', 852840 => 'China Mobile', 8528480 => 'HKT', diff --git a/src/carrier/data/en/86.php b/src/carrier/data/en/86.php index 20e27b9d..9927be14 100644 --- a/src/carrier/data/en/86.php +++ b/src/carrier/data/en/86.php @@ -72,6 +72,6 @@ 86195 => 'China Mobile', 86196 => 'China Unicom', 86197 => 'China Mobile', - 86198 => 'China Telecom', + 86198 => 'China Mobile', 86199 => 'China Telecom', ); diff --git a/src/carrier/data/en/92.php b/src/carrier/data/en/92.php index e51ade33..d863b08e 100644 --- a/src/carrier/data/en/92.php +++ b/src/carrier/data/en/92.php @@ -18,4 +18,5 @@ 9234 => 'Telenor', 9235 => 'Special Communications Organization', 9236 => 'Instaphone', + 9237 => 'Zong', ); diff --git a/src/carrier/data/en/992.php b/src/carrier/data/en/992.php index 90f2efb3..e0ef377f 100644 --- a/src/carrier/data/en/992.php +++ b/src/carrier/data/en/992.php @@ -27,6 +27,12 @@ 99230 => 'O-Mobile', 99240 => 'ZET-MOBILE', 99241 => 'Megafon', + 992440 => 'ZET-MOBILE', + 992442 => 'ZET-MOBILE', + 992443 => 'ZET-MOBILE', + 992444 => 'ZET-MOBILE', + 992447 => 'ZET-MOBILE', + 992449 => 'ZET-MOBILE', 99250 => 'Tcell', 99255 => 'Megafon', 99270 => 'Tcell', diff --git a/src/carrier/data/zh/852.php b/src/carrier/data/zh/852.php index 311f5d69..cbc286dd 100644 --- a/src/carrier/data/zh/852.php +++ b/src/carrier/data/zh/852.php @@ -26,6 +26,7 @@ 8524614 => '香港移动通讯', 8524615 => '中国联通', 8524616 => '中国联通', + 8524617 => '中国移动', 8524620 => '中国移动', 8524621 => '中国移动', 8524622 => '中国移动', @@ -60,6 +61,8 @@ 8524678 => '香港移动通讯', 8524679 => '香港移动通讯', 852468 => '中国移动', + 852469 => '中国移动', + 8524699 => '中國南方電信(香港)有限公司', 852510 => '中国移动', 852511 => '香港移动通讯', 852512 => '中国移动', @@ -160,6 +163,7 @@ 852592 => '香港移动通讯', 852593 => '中国移动', 852594 => '香港移动通讯', + 852595 => '中国移动', 852598 => '中国移动', 852599 => '香港移动通讯', 852601 => '数码通', @@ -240,7 +244,12 @@ 852695 => '中国移动', 852697 => '香港移动通讯', 852699 => '中国移动', - 852707 => '数码通', + 8527071 => '数码通', + 8527072 => '数码通', + 8527073 => '数码通', + 8527074 => '数码通', + 8527075 => '数码通', + 8527076 => '中国移动', 852708 => '香港移动通讯', 852840 => '中国移动', 8528480 => '香港移动通讯', diff --git a/src/carrier/data/zh/86.php b/src/carrier/data/zh/86.php index 47f631e5..05699448 100644 --- a/src/carrier/data/zh/86.php +++ b/src/carrier/data/zh/86.php @@ -71,6 +71,6 @@ 86195 => '中国移动', 86196 => '中国联通', 86197 => '中国移动', - 86198 => '中国电信', + 86198 => '中国移动', 86199 => '中国电信', ); diff --git a/src/data/PhoneNumberMetadata_EH.php b/src/data/PhoneNumberMetadata_EH.php index c33ee033..7cdc4de6 100644 --- a/src/data/PhoneNumberMetadata_EH.php +++ b/src/data/PhoneNumberMetadata_EH.php @@ -47,7 +47,7 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '80\\d{7}', + 'NationalNumberPattern' => '80[0-7]\\d{6}', 'ExampleNumber' => '801234567', 'PossibleLength' => array ( @@ -89,7 +89,7 @@ ), 'voip' => array ( - 'NationalNumberPattern' => '592(?:4[0-2]|93)\\d{4}', + 'NationalNumberPattern' => '(?:592(?:4[0-2]|93)|80[89]\\d\\d)\\d{4}', 'ExampleNumber' => '592401234', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_HK.php b/src/data/PhoneNumberMetadata_HK.php index 2c8834e8..7b039aaa 100644 --- a/src/data/PhoneNumberMetadata_HK.php +++ b/src/data/PhoneNumberMetadata_HK.php @@ -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(?:[45][0-8]|6[01]|9\\d))|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[01]))|58(?:0[1-9]|1[2-9]))\\d{4}', 'ExampleNumber' => '21234567', 'PossibleLength' => array ( @@ -42,7 +42,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:4(?:44[5-9]|6(?:1[0-6]|4[0-57-9]|6[0-4]))|573[0-6]|6(?:26[013-8]|66[0-3])|70(?:7[1-5]|8[0-4])|848[0-25-9]|9(?:29[013-9]|59[0-4]|899))\\d{4}|(?:4(?:4[015]|6[023578])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|84[09]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}', + 'NationalNumberPattern' => '(?:4(?:44[5-9]|6(?:1[0-7]|4[0-57-9]|6[0-4]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-6]|8[0-4])|848[0-25-9]|9(?:29[013-9]|59[0-4]|899))\\d{4}|(?:4(?:4[015]|6[02357-9])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|84[09]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}', 'ExampleNumber' => '51234567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_HR.php b/src/data/PhoneNumberMetadata_HR.php index c3924503..4754ec15 100644 --- a/src/data/PhoneNumberMetadata_HR.php +++ b/src/data/PhoneNumberMetadata_HR.php @@ -43,7 +43,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '9(?:(?:0[1-9]|[12589]\\d)\\d\\d|7(?:[0679]\\d\\d|5(?:[01]\\d|44|77|9[67])))\\d{4}|98\\d{6}', + 'NationalNumberPattern' => '9(?:(?:0[1-9]|[12589]\\d)\\d\\d|7(?:[0679]\\d\\d|5(?:[01]\\d|44|77|9[5-7])))\\d{4}|98\\d{6}', 'ExampleNumber' => '921234567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_MA.php b/src/data/PhoneNumberMetadata_MA.php index 6523eab5..8201d08e 100644 --- a/src/data/PhoneNumberMetadata_MA.php +++ b/src/data/PhoneNumberMetadata_MA.php @@ -25,7 +25,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '5293[01]\\d{4}|5(?:2(?:[0-25-7]\\d|3[1-578]|4[02-46-8]|8[0235-7]|9[0-289])|3(?:[0-47]\\d|5[02-9]|6[02-8]|8[0189]|9[3-9])|(?:4[067]|5[03])\\d)\\d{5}', + 'NationalNumberPattern' => '5(?:2(?:[0-25-79]\\d|3[1-578]|4[02-46-8]|8[0235-7])|3(?:[0-47]\\d|5[02-9]|6[02-8]|8[014-9]|9[3-9])|(?:4[067]|5[03])\\d)\\d{5}', 'ExampleNumber' => '520123456', 'PossibleLength' => array ( @@ -47,7 +47,7 @@ ), 'tollFree' => array ( - 'NationalNumberPattern' => '80\\d{7}', + 'NationalNumberPattern' => '80[0-7]\\d{6}', 'ExampleNumber' => '801234567', 'PossibleLength' => array ( @@ -89,7 +89,7 @@ ), 'voip' => array ( - 'NationalNumberPattern' => '592(?:4[0-2]|93)\\d{4}', + 'NationalNumberPattern' => '(?:592(?:4[0-2]|93)|80[89]\\d\\d)\\d{4}', 'ExampleNumber' => '592401234', 'PossibleLength' => array ( @@ -147,20 +147,6 @@ 'numberFormat' => array ( 0 => - array ( - 'pattern' => '(\\d{5})(\\d{4})', - 'format' => '$1-$2', - 'leadingDigitsPatterns' => - array ( - 0 => '5(?:29|38)', - 1 => '5(?:29[1289]|389)', - 2 => '529(?:1[1-46-9]|2[013-8]|90)|5(?:298|389)[0-46-9]', - ), - 'nationalPrefixFormattingRule' => '0$1', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, - ), - 1 => array ( 'pattern' => '(\\d{3})(\\d{2})(\\d{2})(\\d{2})', 'format' => '$1 $2 $3 $4', @@ -172,20 +158,20 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 2 => + 1 => array ( 'pattern' => '(\\d{4})(\\d{5})', 'format' => '$1-$2', 'leadingDigitsPatterns' => array ( - 0 => '5(?:2[2-489]|3[5-9]|9)|892', - 1 => '5(?:2(?:[2-49]|8[235-9])|3[5-9]|9)|892', + 0 => '5(?:2[2-489]|3[5-9]|9)|8(?:0[89]|92)', + 1 => '5(?:2(?:[2-49]|8[235-9])|3[5-9]|9)|8(?:0[89]|92)', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 3 => + 2 => array ( 'pattern' => '(\\d{2})(\\d{7})', 'format' => '$1-$2', @@ -197,7 +183,7 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 4 => + 3 => array ( 'pattern' => '(\\d{3})(\\d{6})', 'format' => '$1-$2', diff --git a/src/data/PhoneNumberMetadata_MK.php b/src/data/PhoneNumberMetadata_MK.php index 499bc331..92ae63ff 100644 --- a/src/data/PhoneNumberMetadata_MK.php +++ b/src/data/PhoneNumberMetadata_MK.php @@ -40,7 +40,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '7(?:3555|(?:474|9[019]7)7)\\d{3}|7(?:[0-25-8]\\d\\d|3(?:[1-48]\\d|60|7[01578])|4(?:2\\d|60|7[01578])|9(?:[2-4]\\d|5[01]|7[015]))\\d{4}', + 'NationalNumberPattern' => '7(?:3555|(?:474|9[019]7)7)\\d{3}|7(?:[0-25-8]\\d\\d|3(?:[1-48]\\d|6[01]|7[01578])|4(?:2\\d|60|7[01578])|9(?:[2-4]\\d|5[01]|7[015]))\\d{4}', 'ExampleNumber' => '72345678', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_PK.php b/src/data/PhoneNumberMetadata_PK.php index d3560dd3..27b74ff8 100644 --- a/src/data/PhoneNumberMetadata_PK.php +++ b/src/data/PhoneNumberMetadata_PK.php @@ -49,7 +49,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '3(?:[0-24]\\d|3[0-79]|55|64)\\d{7}', + 'NationalNumberPattern' => '3(?:[0-247]\\d|3[0-79]|55|64)\\d{7}', 'ExampleNumber' => '3012345678', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_RO.php b/src/data/PhoneNumberMetadata_RO.php index 425d2069..b56b55ec 100644 --- a/src/data/PhoneNumberMetadata_RO.php +++ b/src/data/PhoneNumberMetadata_RO.php @@ -14,7 +14,7 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '(?:[2378]\\d|90)\\d{7}|[23]\\d{5}', + 'NationalNumberPattern' => '(?:[2378]\\d|62|90)\\d{7}|[23]\\d{5}', 'PossibleLength' => array ( 0 => 6, @@ -37,7 +37,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '7020\\d{5}|7(?:0[013-9]|1[0-3]|[2-7]\\d|8[03-8]|9[0-29])\\d{6}', + 'NationalNumberPattern' => '7020\\d{5}|(?:62\\d|7(?:0[013-9]|1[0-3]|[2-7]\\d|8[03-8]|9[0-39]))\\d{6}', 'ExampleNumber' => '712034567', 'PossibleLength' => array ( @@ -197,7 +197,7 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[237-9]', + 0 => '[236-9]', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/data/PhoneNumberMetadata_TJ.php b/src/data/PhoneNumberMetadata_TJ.php index af3ea269..4e1b10a6 100644 --- a/src/data/PhoneNumberMetadata_TJ.php +++ b/src/data/PhoneNumberMetadata_TJ.php @@ -29,7 +29,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:3(?:1[3-5]|2[245]|3[12]|4[24-7]|5[25]|72)|4(?:4[046]|74|87))\\d{6}', + 'NationalNumberPattern' => '(?:3(?:1[3-5]|2[245]|3[12]|4[24-7]|5[25]|72)|4(?:46|74|87))\\d{6}', 'ExampleNumber' => '372123456', 'PossibleLength' => array ( @@ -44,7 +44,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:41[18]|81[1-9])\\d{6}|(?:0[0-57-9]|1[017]|2[02]|[34]0|5[05]|7[0178]|8[078]|9\\d)\\d{7}', + 'NationalNumberPattern' => '(?:4(?:1[18]|4[02-479])|81[1-9])\\d{6}|(?:0[0-57-9]|1[017]|2[02]|[34]0|5[05]|7[0178]|8[078]|9\\d)\\d{7}', 'ExampleNumber' => '917123456', 'PossibleLength' => array ( @@ -169,7 +169,7 @@ 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '44[04]|[34]7', + 0 => '44[02-479]|[34]7', ), 'nationalPrefixFormattingRule' => '', 'domesticCarrierCodeFormattingRule' => '', diff --git a/src/geocoding/data/en/212.php b/src/geocoding/data/en/212.php index 6940a87d..49e8b9bd 100644 --- a/src/geocoding/data/en/212.php +++ b/src/geocoding/data/en/212.php @@ -41,9 +41,11 @@ 2125287 => 'Guelmim/Tan Tan', 2125288 => 'Agadir/Es-Semara/Tarfaya', 2125289 => 'Dakhla/Laayoune', - 2125290 => 'Casablanca', - 21252980 => 'Marrakech area', - 21252990 => 'Agadir area', + 212529 => 'Casablanca', + 2125296 => 'Marrakech', + 2125297 => 'Agadir', + 2125298 => 'Marrakech', + 2125299 => 'Agadir', 212530 => 'Rabat/Kènitra', 212531 => 'Tangier/Al Hoceima/Larache/Tètouan/Chefchaouen', 212532 => 'Fès/Errachidia/Meknès/Nador/Oujda/Taza', @@ -69,9 +71,14 @@ 2125377 => 'Rabat', 2125378 => 'Salé', 2125379 => 'Souk Larbaa', - 2125380 => 'Rabat area', - 2125388 => 'Tangier area', - 21253890 => 'Fès/Meknès areas', + 2125380 => 'Rabat', + 2125381 => 'Rabat', + 2125384 => 'Tangier', + 2125385 => 'Tangier', + 2125386 => 'Fez/Meknes', + 2125387 => 'Fez/Meknes', + 2125388 => 'Tangier', + 2125389 => 'Fez/Meknes', 2125393 => 'Tangier', 2125394 => 'Asilah', 2125395 => 'Larache', diff --git a/src/geocoding/data/fr/212.php b/src/geocoding/data/fr/212.php index c5411cf3..6d20dee6 100644 --- a/src/geocoding/data/fr/212.php +++ b/src/geocoding/data/fr/212.php @@ -21,16 +21,17 @@ 2125285 => 'Taroudannt/Oulad Teima', 2125288 => 'Es-Semara/Agadir/Tarfaya', 2125289 => 'Laayoune/Dakhla', - 21252980 => 'Marrakech et alentours', - 21252990 => 'Agadir et alentours', 212530 => 'Rabat/Kénitra', 212531 => 'Tanger/Tétouan/Larache/Al Hoceima/Cherfchaouen', 212532 => 'Fès/Oujda/Meknès/Taza/Nador/Errachidia', 2125366 => 'Oujda/Figuig', 2125367 => 'Oujda/Bouarfa', - 2125380 => 'Rabat et alentours', - 2125388 => 'Tanger et alentours', - 21253890 => 'Fès/Maknès et alentours', + 2125384 => 'Tanger', + 2125385 => 'Tanger', + 2125386 => 'Fès/Maknès', + 2125387 => 'Fès/Maknès', + 2125388 => 'Tanger', + 2125389 => 'Fès/Maknès', 2125393 => 'Tanger', 2125399 => 'Tanger/Larache/Al Hoceima', );