diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt index a4bddf06..52792f4f 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.43 +v8.13.44 diff --git a/src/carrier/data/en/220.php b/src/carrier/data/en/220.php index 63e6c82f..1ca5238d 100644 --- a/src/carrier/data/en/220.php +++ b/src/carrier/data/en/220.php @@ -13,6 +13,9 @@ return array ( 2202 => 'Africell', 2203 => 'QCell', + 22040 => 'Africell', + 22041 => 'Africell', + 22045 => 'Africell', 22050 => 'QCell', 22051 => 'QCell', 22052 => 'QCell', diff --git a/src/carrier/data/en/226.php b/src/carrier/data/en/226.php index a452936e..b423bf82 100644 --- a/src/carrier/data/en/226.php +++ b/src/carrier/data/en/226.php @@ -14,6 +14,7 @@ 22601 => 'Onatel', 22602 => 'Onatel', 22603 => 'Onatel', + 22604 => 'Orange', 22605 => 'Orange', 22606 => 'Orange', 22607 => 'Orange', diff --git a/src/carrier/data/en/32.php b/src/carrier/data/en/32.php index efbc0627..ee833da0 100644 --- a/src/carrier/data/en/32.php +++ b/src/carrier/data/en/32.php @@ -11,7 +11,8 @@ */ return array ( - 3245001 => 'Gateway Communications', + 3245001 => 'GATEWAY COMMUNICATIONS S.A.', + 324510 => 'DIGI Communications', 32455 => 'VOO', 32456 => 'Mobile Vikings/JIM Mobile', 32460 => 'Proximus', diff --git a/src/carrier/data/en/40.php b/src/carrier/data/en/40.php index 80201be7..7a1223c7 100644 --- a/src/carrier/data/en/40.php +++ b/src/carrier/data/en/40.php @@ -14,7 +14,6 @@ 4060 => 'Telekom', 4062 => 'Vodafone', 4063 => 'Digi Mobil', - 4064 => 'Orange', 407000 => 'Enigma-System', 407013 => 'Lycamobile', 407014 => 'Lycamobile', diff --git a/src/carrier/data/en/65.php b/src/carrier/data/en/65.php index 3bc5a768..77430148 100644 --- a/src/carrier/data/en/65.php +++ b/src/carrier/data/en/65.php @@ -61,6 +61,7 @@ 658095 => 'SingTel', 658096 => 'Simba', 658098 => 'Simba', + 658099 => 'SingTel', 6581 => 'StarHub', 65810 => 'M1', 65812 => 'SingTel', @@ -78,6 +79,7 @@ 658228 => 'SingTel', 65826 => 'SingTel', 65827 => 'M1', + 658274 => 'Simba', 65828 => 'SingTel', 658282 => 'M1', 658288 => 'M1', diff --git a/src/carrier/data/en/673.php b/src/carrier/data/en/673.php index 98e80fdc..da78a5d5 100644 --- a/src/carrier/data/en/673.php +++ b/src/carrier/data/en/673.php @@ -13,16 +13,19 @@ return array ( 673228 => 'DSTCom', 673229 => 'DSTCom', - 67371 => 'DSTCom', - 67372 => 'DSTCom', - 67373 => 'DSTCom', - 67374 => 'Imagine', - 67377 => 'DSTCom', - 67381 => 'Progresif Cellular', - 67382 => 'Progresif Cellular', - 67383 => 'Progresif Cellular', - 67386 => 'DSTCom', - 67387 => 'DSTCom', - 67388 => 'DSTCom', - 67389 => 'DSTCom', + 67371 => 'UNN', + 67372 => 'UNN', + 67373 => 'UNN', + 67374 => 'UNN', + 67376 => 'UNN', + 67377 => 'UNN', + 67379 => 'UNN', + 67381 => 'UNN', + 67382 => 'UNN', + 67383 => 'UNN', + 67384 => 'UNN', + 67386 => 'UNN', + 67387 => 'UNN', + 67388 => 'UNN', + 67389 => 'UNN', ); diff --git a/src/carrier/data/en/992.php b/src/carrier/data/en/992.php index 3b849045..b253348f 100644 --- a/src/carrier/data/en/992.php +++ b/src/carrier/data/en/992.php @@ -11,15 +11,11 @@ */ return array ( + 9920 => 'ZET-MOBILE', 99200 => 'Megafon', 99201 => 'Megafon', 99202 => 'Megafon', - 99203 => 'ZET-MOBILE', - 99204 => 'ZET-MOBILE', - 99205 => 'ZET-MOBILE', 99207 => 'Megafon', - 99208 => 'ZET-MOBILE', - 99209 => 'ZET-MOBILE', 99210 => 'O-Mobile', 99211 => 'Tcell', 99217 => 'Babilon-M', diff --git a/src/data/PhoneNumberMetadata_BF.php b/src/data/PhoneNumberMetadata_BF.php index 9a648a37..1b0bd9a0 100644 --- a/src/data/PhoneNumberMetadata_BF.php +++ b/src/data/PhoneNumberMetadata_BF.php @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:0[1-35-7]|5[0-8]|[67]\\d)\\d{6}', + 'NationalNumberPattern' => '(?:0[1-7]|5[0-8]|[67]\\d)\\d{6}', 'ExampleNumber' => '70123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_CD.php b/src/data/PhoneNumberMetadata_CD.php index 38c17588..213ed5b4 100644 --- a/src/data/PhoneNumberMetadata_CD.php +++ b/src/data/PhoneNumberMetadata_CD.php @@ -14,11 +14,13 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '[189]\\d{8}|[1-68]\\d{6}', + 'NationalNumberPattern' => '(?:(?:[189]|5\\d)\\d|2)\\d{7}|[1-68]\\d{6}', 'PossibleLength' => array ( 0 => 7, - 1 => 9, + 1 => 8, + 2 => 9, + 3 => 10, ), 'PossibleLengthLocalOnly' => array ( @@ -26,7 +28,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '12\\d{7}|[1-6]\\d{6}', + 'NationalNumberPattern' => '(?:(?:12|573)\\d\\d|276)\\d{5}|[1-6]\\d{6}', 'ExampleNumber' => '1234567', 'PossibleLength' => array ( @@ -41,6 +43,8 @@ 'ExampleNumber' => '991234567', 'PossibleLength' => array ( + 0 => 7, + 1 => 9, ), 'PossibleLengthLocalOnly' => array ( @@ -169,6 +173,18 @@ 'nationalPrefixOptionalWhenFormatting' => false, ), 2 => + array ( + 'pattern' => '(\\d{2})(\\d{2})(\\d{4})', + 'format' => '$1 $2 $3', + 'leadingDigitsPatterns' => + array ( + 0 => '2', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ), + 3 => array ( 'pattern' => '(\\d{2})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', @@ -180,7 +196,7 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 3 => + 4 => array ( 'pattern' => '(\\d{3})(\\d{3})(\\d{3})', 'format' => '$1 $2 $3', @@ -192,6 +208,18 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), + 5 => + array ( + 'pattern' => '(\\d{2})(\\d{2})(\\d{3})(\\d{3})', + 'format' => '$1 $2 $3 $4', + 'leadingDigitsPatterns' => + array ( + 0 => '5', + ), + 'nationalPrefixFormattingRule' => '0$1', + 'domesticCarrierCodeFormattingRule' => '', + 'nationalPrefixOptionalWhenFormatting' => false, + ), ), 'intlNumberFormat' => array ( diff --git a/src/data/PhoneNumberMetadata_GM.php b/src/data/PhoneNumberMetadata_GM.php index ce17b14b..74a90450 100644 --- a/src/data/PhoneNumberMetadata_GM.php +++ b/src/data/PhoneNumberMetadata_GM.php @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:[23679]\\d|5[0-489])\\d{5}', + 'NationalNumberPattern' => '(?:[23679]\\d|4[015]|5[0-489])\\d{5}', 'ExampleNumber' => '3012345', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_NG.php b/src/data/PhoneNumberMetadata_NG.php index 5896fbbb..0b0bc3d3 100644 --- a/src/data/PhoneNumberMetadata_NG.php +++ b/src/data/PhoneNumberMetadata_NG.php @@ -14,37 +14,35 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '2[0-24-9]\\d{8}|[78]\\d{10,13}|[7-9]\\d{9}|[1-9]\\d{7}|[124-7]\\d{6}', + 'NationalNumberPattern' => '38\\d{6}|[78]\\d{9,13}|(?:20|9\\d)\\d{8}', 'PossibleLength' => array ( - 0 => 7, - 1 => 8, - 2 => 10, - 3 => 11, - 4 => 12, - 5 => 13, - 6 => 14, + 0 => 8, + 1 => 10, + 2 => 11, + 3 => 12, + 4 => 13, + 5 => 14, ), 'PossibleLengthLocalOnly' => array ( - 0 => 5, - 1 => 6, + 0 => 6, + 1 => 7, ), ), 'fixedLine' => array ( - 'NationalNumberPattern' => '20(?:[1259]\\d|3[013-9]|4[1-8]|6[024-689]|7[1-79]|8[2-9])\\d{6}|(?:(?:[1-356]\\d|4[02-8]|8[2-9])\\d|9(?:0[3-9]|[1-9]\\d))\\d{5}|7(?:0(?:[013-689]\\d|2[0-24-9])\\d{3,4}|[1-79]\\d{6})|(?:[12]\\d|4[147]|5[14579]|6[1578]|7[1-3578])\\d{5}', - 'ExampleNumber' => '18040123', + 'NationalNumberPattern' => '(?:20(?:[1259]\\d|3[013-9]|4[1-8]|6[024-689]|7[1-79]|8[2-9])|38)\\d{6}', + 'ExampleNumber' => '2033123456', 'PossibleLength' => array ( - 0 => 7, - 1 => 8, - 2 => 10, + 0 => 8, + 1 => 10, ), 'PossibleLengthLocalOnly' => array ( - 0 => 5, - 1 => 6, + 0 => 6, + 1 => 7, ), ), 'mobile' => @@ -170,42 +168,18 @@ 'numberFormat' => array ( 0 => - array ( - 'pattern' => '(\\d{2})(\\d{2})(\\d{3})', - 'format' => '$1 $2 $3', - 'leadingDigitsPatterns' => - array ( - 0 => '78', - ), - 'nationalPrefixFormattingRule' => '0$1', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, - ), - 1 => - array ( - 'pattern' => '(\\d)(\\d{3})(\\d{3,4})', - 'format' => '$1 $2 $3', - 'leadingDigitsPatterns' => - array ( - 0 => '[12]|9(?:0[3-9]|[1-9])', - ), - 'nationalPrefixFormattingRule' => '0$1', - 'domesticCarrierCodeFormattingRule' => '', - 'nationalPrefixOptionalWhenFormatting' => false, - ), - 2 => array ( 'pattern' => '(\\d{2})(\\d{3})(\\d{2,3})', 'format' => '$1 $2 $3', 'leadingDigitsPatterns' => array ( - 0 => '[3-6]|7(?:0[0-689]|[1-79])|8[2-9]', + 0 => '3', ), 'nationalPrefixFormattingRule' => '0$1', 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 3 => + 1 => array ( 'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})', 'format' => '$1 $2 $3', @@ -217,7 +191,7 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 4 => + 2 => array ( 'pattern' => '(\\d{3})(\\d{3})(\\d{4})', 'format' => '$1 $2 $3', @@ -229,7 +203,7 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 5 => + 3 => array ( 'pattern' => '(\\d{4})(\\d{2})(\\d{4})', 'format' => '$1 $2 $3', @@ -241,7 +215,7 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 6 => + 4 => array ( 'pattern' => '(\\d{3})(\\d{4})(\\d{4,5})', 'format' => '$1 $2 $3', @@ -253,7 +227,7 @@ 'domesticCarrierCodeFormattingRule' => '', 'nationalPrefixOptionalWhenFormatting' => false, ), - 7 => + 5 => array ( 'pattern' => '(\\d{3})(\\d{5})(\\d{5,6})', 'format' => '$1 $2 $3', diff --git a/src/data/PhoneNumberMetadata_RO.php b/src/data/PhoneNumberMetadata_RO.php index 78276899..9f770b58 100644 --- a/src/data/PhoneNumberMetadata_RO.php +++ b/src/data/PhoneNumberMetadata_RO.php @@ -37,7 +37,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:630|702)0\\d{5}|(?:6(?:[04]0|2\\d)|7(?:0[013-9]|1[0-3]|[2-7]\\d|8[03-8]|9[0-39]))\\d{6}', + 'NationalNumberPattern' => '(?:630|702)0\\d{5}|(?:6(?:00|2\\d)|7(?:0[013-9]|1[0-3]|[2-7]\\d|8[03-8]|9[0-39]))\\d{6}', 'ExampleNumber' => '712034567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_SG.php b/src/data/PhoneNumberMetadata_SG.php index 4ba342a9..66211840 100644 --- a/src/data/PhoneNumberMetadata_SG.php +++ b/src/data/PhoneNumberMetadata_SG.php @@ -39,7 +39,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '8(?:09[0-68]|95[0-2])\\d{4}|(?:8(?:0[1-8]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}', + 'NationalNumberPattern' => '8(?:09[0-689]|95[0-2])\\d{4}|(?:8(?:0[1-8]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}', 'ExampleNumber' => '81234567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_SN.php b/src/data/PhoneNumberMetadata_SN.php index db75a0c1..013deae9 100644 --- a/src/data/PhoneNumberMetadata_SN.php +++ b/src/data/PhoneNumberMetadata_SN.php @@ -36,7 +36,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '7(?:(?:[06-8]\\d|21|90)\\d|5(?:01|[19]0|25|[38]3|[4-7]\\d))\\d{5}', + 'NationalNumberPattern' => '7(?:(?:[06-8]\\d|21|90)\\d|5(?:0[01]|[19]0|2[25]|[38]3|[4-7]\\d))\\d{5}', 'ExampleNumber' => '701234567', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_TJ.php b/src/data/PhoneNumberMetadata_TJ.php index f1433b4e..6aa2b26e 100644 --- a/src/data/PhoneNumberMetadata_TJ.php +++ b/src/data/PhoneNumberMetadata_TJ.php @@ -44,7 +44,7 @@ ), 'mobile' => array ( - 'NationalNumberPattern' => '(?:33[03-9]|4(?:1[18]|4[02-479])|81[1-9])\\d{6}|(?:0[0-57-9]|1[017]|2[02]|[34]0|5[05]|7[01578]|8[078]|9\\d)\\d{7}', + 'NationalNumberPattern' => '(?:33[03-9]|4(?:1[18]|4[02-479])|81[1-9])\\d{6}|(?:[09]\\d|1[017]|2[02]|[34]0|5[05]|7[01578]|8[078])\\d{7}', 'ExampleNumber' => '917123456', 'PossibleLength' => array ( diff --git a/src/data/PhoneNumberMetadata_UY.php b/src/data/PhoneNumberMetadata_UY.php index e23b8c5f..2d703fc3 100644 --- a/src/data/PhoneNumberMetadata_UY.php +++ b/src/data/PhoneNumberMetadata_UY.php @@ -32,7 +32,7 @@ ), 'fixedLine' => array ( - 'NationalNumberPattern' => '(?:1(?:770|9(?:20|87))|(?:2\\d|4[2-7])\\d\\d)\\d{4}', + 'NationalNumberPattern' => '(?:1(?:770|9(?:20|[89]7))|(?:2\\d|4[2-7])\\d\\d)\\d{4}', 'ExampleNumber' => '21231234', 'PossibleLength' => array ( diff --git a/src/data/ShortNumberMetadata_CA.php b/src/data/ShortNumberMetadata_CA.php index 05979158..a3acf2ff 100644 --- a/src/data/ShortNumberMetadata_CA.php +++ b/src/data/ShortNumberMetadata_CA.php @@ -14,13 +14,12 @@ return array ( 'generalDesc' => array ( - 'NationalNumberPattern' => '[1-9]\\d\\d(?:\\d\\d(?:\\d(?:\\d{2})?)?)?', + 'NationalNumberPattern' => '[1-9]\\d\\d(?:\\d{2,3})?', 'PossibleLength' => array ( 0 => 3, 1 => 5, 2 => 6, - 3 => 8, ), 'PossibleLengthLocalOnly' => array ( @@ -62,7 +61,7 @@ ), 'shortCode' => array ( - 'NationalNumberPattern' => '112|30000\\d{3}|[1-35-9]\\d{4,5}|[2-8]11|9(?:11|88)', + 'NationalNumberPattern' => '[1-35-9]\\d{4,5}|112|[2-8]11|9(?:11|88)', 'ExampleNumber' => '112', 'PossibleLength' => array ( @@ -95,13 +94,12 @@ ), 'smsServices' => array ( - 'NationalNumberPattern' => '300\\d{5}|[1-35-9]\\d{4,5}', + 'NationalNumberPattern' => '[1-35-9]\\d{4,5}', 'ExampleNumber' => '10000', 'PossibleLength' => array ( 0 => 5, 1 => 6, - 2 => 8, ), 'PossibleLengthLocalOnly' => array ( diff --git a/src/geocoding/data/en/234.php b/src/geocoding/data/en/234.php index 8327a963..a88bc634 100644 --- a/src/geocoding/data/en/234.php +++ b/src/geocoding/data/en/234.php @@ -11,9 +11,8 @@ */ return array ( - 2341 => 'Lagos', - 2342 => 'Ibadan', 234201 => 'Lagos', + 234202 => 'Ibadan', 2342030 => 'Ado Ekiti', 2342031 => 'Ilorin', 2342033 => 'New Bussa', @@ -65,75 +64,5 @@ 2342088 => 'Umuahia', 2342089 => 'Yenagoa', 234209 => 'Abuja', - 23430 => 'Ado Ekiti', - 23431 => 'Ilorin', - 23433 => 'New Bussa', - 23434 => 'Akura', - 23435 => 'Oshogbo', - 23436 => 'Ile Ife', - 23437 => 'Ijebu Ode', - 23438 => 'Oyo', - 23439 => 'Abeokuta', - 23441 => 'Wukari', - 23442 => 'Enugu', - 23443 => 'Abakaliki', - 23444 => 'Makurdi', - 23445 => 'Ogoja', - 23446 => 'Onitsha', - 23447 => 'Lafia', - 23448 => 'Awka', - 23450 => 'Ikare', - 23451 => 'Owo', - 23452 => 'Benin', - 23453 => 'Warri', - 23454 => 'Sapele', - 23455 => 'Agbor', - 23456 => 'Asaba', - 23457 => 'Auchi', - 23458 => 'Lokoja', - 23459 => 'Okitipupa', - 23460 => 'Sokobo', - 23461 => 'Kafanchau', - 23462 => 'Kaduna', - 23463 => 'Gusau', - 23464 => 'Kano', - 23465 => 'Katsina', - 23466 => 'Minna', - 23467 => 'Kontagora', - 23468 => 'Birnin-Kebbi', - 23469 => 'Zaria', - 2347020 => 'Pank Shin', - 23471 => 'Azare', - 23472 => 'Gombe', - 23473 => 'Jos', - 23474 => 'Damaturu', - 23475 => 'Yola', - 23476 => 'Maiduguri', - 23477 => 'Bauchi', - 23478 => 'Hadejia', - 23479 => 'Jalingo', - 23482 => 'Aba', - 23483 => 'Owerri', - 23484 => 'Port Harcourt', - 23485 => 'Uyo', - 23486 => 'Ahoada', - 23487 => 'Calabar', - 23488 => 'Umuahia', - 23489 => 'Yenegoa', - 234903 => 'Abuja', - 234904 => 'Abuja', - 234905 => 'Abuja', - 234906 => 'Abuja', - 234907 => 'Abuja', - 234908 => 'Abuja', - 234909 => 'Abuja', - 23491 => 'Abuja', - 23492 => 'Abuja', - 23493 => 'Abuja', - 23494 => 'Abuja', - 23495 => 'Abuja', - 23496 => 'Abuja', - 23497 => 'Abuja', - 23498 => 'Abuja', - 23499 => 'Abuja', + 2343 => 'Oyo', ); diff --git a/src/geocoding/data/fr/243.php b/src/geocoding/data/fr/243.php index 98255991..663a8e61 100644 --- a/src/geocoding/data/fr/243.php +++ b/src/geocoding/data/fr/243.php @@ -16,5 +16,6 @@ 2433 => 'Bas-Congo/Bandundu', 2434 => 'Kasai-Oriental/Kasai-Occidental', 2435 => 'Province Orientale (Kisanga/Mbandaka)', + 243573 => 'Oriental Province (Kisanga/Mbandaka)', 2436 => 'Nord-Kivu/Sud-Kivu/Maniema', );