From 6424d7a700f83d026c8fb7d3d79b9468172cb479 Mon Sep 17 00:00:00 2001 From: Lara Scheidegger Date: Wed, 30 May 2012 07:12:19 +0000 Subject: [PATCH] JAVA/JS: Metadata changes only (v4.8.3). --- .../data/PhoneNumberMetadataProto_AN | Bin 293 -> 297 bytes .../data/PhoneNumberMetadataProto_ET | Bin 985 -> 998 bytes .../data/PhoneNumberMetadataProto_KW | Bin 616 -> 617 bytes .../data/PhoneNumberMetadataProto_MN | Bin 733 -> 727 bytes .../data/PhoneNumberMetadataProto_SX | Bin 451 -> 459 bytes .../data/PhoneNumberMetadataProto_TC | Bin 506 -> 507 bytes .../data/PhoneNumberMetadataProto_TL | Bin 366 -> 367 bytes java/release_notes.txt | 4 ++ javascript/i18n/phonenumbers/metadata.js | 22 +++---- javascript/i18n/phonenumbers/metadatalite.js | 22 +++---- resources/PhoneNumberMetaData.xml | 56 +++++++++++------- 11 files changed, 60 insertions(+), 44 deletions(-) diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AN index 10f648f326069d207bb54b8d77086aa93b8a6670..ba0f3984da7928bc81319507b8f94b1426a3b476 100644 GIT binary patch delta 91 zcmZ3=w3110&07Z6Dh38d1qL9&$jHEE8k16OR?Eo13Z%_zfnp5erW*EECecQ^7O@kx pmE=@FT*GJsqu3gwn3NjRXaiky%h(!=XahqtU5kl^!V_y(004^l703Vp delta 76 zcmZ3#v8|oUz#-!AkMq60MYR05gn@zsM^cMhG Cq7O#^ delta 33 pcmaFHev_SZ&07Z6Dh3AT3mZ94GI4QPMjIN%#-vo6Pkzbt7XZC>3!DG| diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW index 1f9be58891f587afa71f6709372209f08f4f331c..f1f6ed8437de8be7f0cf7c4c473ab00b2d36f157 100644 GIT binary patch delta 28 kcmaFC@{)yf&07Z6Dh39ogo&K980#l431u|c_%ojo0FHhM<^TWy delta 26 icmaFK@`8nP&07Z6Dh39o_=%je80#i33ElWBpAi6lLJ710 diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN index e4acf01c2cc08bd39408f3d32d4935c1f1707fcd..14bc955ba209b5ddc45cd8421fb5cb9bb1986aee 100644 GIT binary patch delta 92 zcmcc1dYzSX&07Z6Dh39oa}zoB7-J_|1e%&g8O~k&!`M!`{jw+QKrn#xmN#&{%ikQ9pJbbD&OLi_MaZM;HNp0vC$_ delta 98 zcmcc4dY6@R&07Z6Dh39oD-${O7*i%%1lnlWTbV{1n3`F{)|eY;#-vo6)iN@0fM^{< v0}#{Pz|hFp#MF$DkwF}&*dp4(GPcGt+7PH^;yyn%Zu4kUGt14wj7Jy&7$X@h diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX index a15f1183b2209ad4e82a708ec8bc7161fbb5140d..6d336acd814c3c5dde94126449c0b17184153c01 100644 GIT binary patch delta 68 zcmX@ie43ea&07Z6Dh39|LlZeQr4`MM3{5rctxTegbS+|QETWB!En{meqYX^WCc0@d XYECQ==Q0P1SVS8bn&@tvV9W>rh9DAu delta 79 zcmX@je3+SY&07Z6Dh39|T@yJqMWoD)3{5rctxTegbS+|QETWB!EhqYFDr!K*4WkW= cVrz_IQff@24UA39EJ11v49(0p&M;;K08aQ7L;wH) diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC index 081441986821c0dc4b12b1a5e6a5c4b14630f057..ecdaced3c1085ced2dec63c4cb9d11821714bcd1 100644 GIT binary patch delta 38 scmeyx{F|9`&07Z6Dh39|PZK%Q1#HYrEH&({jDXlU+R(^yV|_Iv0PS}RN&o-= delta 37 rcmey({EL}$&07Z6Dh39|j}tl5`K`@NEH&({jDXlU+R$iYLp37+;=2nE diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL index 9a11d90dae872ab6a8aebb6f172ca650450dacd2..f6ced143f27e70645ed69b915d9a9d0da0ff9a7d 100644 GIT binary patch delta 29 kcmaFI^qz@x&07Z6Dh39|w27P{>^$btM!F`J8Px# delta 28 jcmaFQ^p1&h&07Z6Dh39|)QOxSY~1G2M!F^&Q@9xcfGh{D diff --git a/java/release_notes.txt b/java/release_notes.txt index 2e9d0997d..a5833422c 100644 --- a/java/release_notes.txt +++ b/java/release_notes.txt @@ -1,3 +1,7 @@ +May 30th, 2012: libphonenumber-4.8.3 +* Metadata update only: + - AN, ET, KW, MN, SX, TC, TL + May 16th, 2012: libphonenumber-4.8.2 * Metadata update only: - BH, CR, EE, JO, KW, LA, QA, SI, TH diff --git a/javascript/i18n/phonenumbers/metadata.js b/javascript/i18n/phonenumbers/metadata.js index feaa37b60..e57cdfd67 100644 --- a/javascript/i18n/phonenumbers/metadata.js +++ b/javascript/i18n/phonenumbers/metadata.js @@ -398,8 +398,8 @@ i18n.phonenumbers.metadata.countryToMetadata = { ,[,,"NA","NA"] ] ,"AN":[,[,,"5\\d{6}","\\d{7}"] -,[,,"5(?:4\\d|8[239])\\d{4}","\\d{7}",,,"5451234"] -,[,,"5(?:1[01]|2[0-7]|5\\d|8[016-8])\\d{4}","\\d{7}",,,"5101234"] +,[,,"5(?:4[2-8]|8[239])\\d{4}","\\d{7}",,,"5451234"] +,[,,"5(?:1[02]|2\\d|5[0-79]|8[016-8])\\d{4}","\\d{7}",,,"5101234"] ,[,,"NA","NA"] ,[,,"NA","NA"] ,[,,"NA","NA"] @@ -1567,7 +1567,7 @@ i18n.phonenumbers.metadata.countryToMetadata = { ] ,"ET":[,[,,"[1-59]\\d{8}","\\d{7,9}"] ,[,,"(?:11(?:1(?:1[124]|2[2-57]|3[1-5]|5[5-8]|8[6-8])|2(?:13|3[6-8]|5[89]|7[05-9]|8[2-6])|3(?:2[01]|3[0-289]|4[1289]|7[1-4]|87)|4(?:1[69]|3[2-49]|4[0-3]|6[5-8])|5(?:1[57]|44|5[0-4])|6(?:18|2[69]|4[5-7]|5[1-5]|6[0-59]|8[015-8]))|2(?:2(?:11[1-9]|22[0-7]|33\\d|44[1467]|66[1-68])|5(?:11[124-6]|33[2-8]|44[1467]|55[14]|66[1-3679]|77[124-79]|880))|3(?:3(?:11[0-46-8]|22[0-6]|33[0134689]|44[04]|55[0-6]|66[01467])|4(?:44[0-8]|55[0-69]|66[0-3]|77[1-5]))|4(?:6(?:22[0-24-7]|33[1-5]|44[13-69]|55[14-689]|660|88[1-4])|7(?:11[1-9]|22[1-9]|33[13-7]|44[13-6]|55[1-689]))|5(?:7(?:227|55[05]|(?:66|77)[14-8])|8(?:11[149]|22[013-79]|33[0-68]|44[013-8]|550|66[1-5]|77\\d)))\\d{4}","\\d{7,9}",,,"111112345"] -,[,,"9[12]\\d{7}","\\d{9}",,,"911234567"] +,[,,"9(?:[1-3]\\d|5[89])\\d{6}","\\d{9}",,,"911234567"] ,[,,"NA","NA"] ,[,,"NA","NA"] ,[,,"NA","NA"] @@ -2626,7 +2626,7 @@ i18n.phonenumbers.metadata.countryToMetadata = { ] ,"KW":[,[,,"[12569]\\d{6,7}|65816\\d{6}","\\d{7,8}|\\d{11}"] ,[,,"(?:18\\d|2(?:[23]\\d{2}|4[1-35-9]\\d|5(?:0[034]|[2-46]\\d|5[1-3]|7[1-7])))\\d{4}","\\d{7,8}",,,"22345678"] -,[,,"(?:5(?:0[0-2568]|5\\d)|6(?:0[034679]|5(?:[015-79]|8(?:[02-9]|1[0-57-9]))|6\\d|7[067]|9[69])|9(?:0[09]|4[049]|6[69]|[79]\\d))\\d{5}","\\d{8}",,,"50012345"] +,[,,"(?:5(?:0[0-2568]|5\\d)|6(?:0[034679]|5(?:[015-79]|8(?:[02-9]|1[0-57-9]))|6\\d|7[067]|9[069])|9(?:0[09]|4[049]|6[69]|[79]\\d))\\d{5}","\\d{8}",,,"50012345"] ,[,,"NA","NA"] ,[,,"NA","NA"] ,[,,"NA","NA"] @@ -3091,13 +3091,13 @@ i18n.phonenumbers.metadata.countryToMetadata = { ,[,,"NA","NA"] ] ,"MN":[,[,,"[12]\\d{7,9}|[57-9]\\d{7}","\\d{6,10}"] -,[,,"[12](?:1\\d|2(?:[1-3]\\d?|7\\d)|3[2-8]\\d{1,2}|4[2-68]\\d{1,2}|5[1-4689]\\d{1,2})\\d{5}|(?:5[0568]|70)\\d{6}","\\d{6,10}",,,"70123456"] -,[,,"(?:8[89]|9[15689])\\d{6}","\\d{8}",,,"88123456"] +,[,,"[12](?:1\\d|2(?:[1-3]\\d?|7\\d)|3[2-8]\\d{1,2}|4[2-68]\\d{1,2}|5[1-4689]\\d{1,2})\\d{5}|5[0568]\\d{6}","\\d{6,10}",,,"50123456"] +,[,,"(?:8[89]|9[013-9])\\d{6}","\\d{8}",,,"88123456"] ,[,,"NA","NA"] ,[,,"NA","NA"] ,[,,"NA","NA"] ,[,,"NA","NA"] -,[,,"7[569]\\d{6}","\\d{8}",,,"75123456"] +,[,,"7[05-8]\\d{6}","\\d{8}",,,"75123456"] ,"MN",976,"001","0",,,"0",,,,[[,"([12]\\d)(\\d{2})(\\d{4})","$1 $2 $3",["[12]1"] ,"0$1","",0] ,[,"([12]2\\d)(\\d{5,6})","$1 $2",["[12]2[1-3]"] @@ -4375,8 +4375,8 @@ i18n.phonenumbers.metadata.countryToMetadata = { ,[,,"NA","NA"] ] ,"SX":[,[,,"[5789]\\d{9}","\\d{7}(?:\\d{3})?"] -,[,,"7215(?:4[2-8]|8[239])\\d{4}","\\d{7}(?:\\d{3})?",,,"7215425678"] -,[,,"7215(?:1[02]|2\\d|5[03469]|8[01678])\\d{4}","\\d{10}",,,"7215205678"] +,[,,"7215(?:4[2-8]|8[239]|9[056])\\d{4}","\\d{7}(?:\\d{3})?",,,"7215425678"] +,[,,"7215(?:1[02]|2\\d|5[034679]|8[014-8])\\d{4}","\\d{10}",,,"7215205678"] ,[,,"8(?:00|55|66|77|88)[2-9]\\d{6}","\\d{10}",,,"8002123456"] ,[,,"900[2-9]\\d{6}","\\d{10}",,,"9002123456"] ,[,,"NA","NA"] @@ -4426,7 +4426,7 @@ i18n.phonenumbers.metadata.countryToMetadata = { ] ,"TC":[,[,,"[5689]\\d{9}","\\d{7}(?:\\d{3})?"] ,[,,"649(?:712|9(?:4\\d|50))\\d{4}","\\d{7}(?:\\d{3})?",,,"6497121234"] -,[,,"649(?:2(?:3[12]|4[1-7])|3(?:3[1-39]|4[1-7])|4[34][12])\\d{4}","\\d{10}",,,"6492311234"] +,[,,"649(?:2(?:3[129]|4[1-7])|3(?:3[1-39]|4[1-7])|4[34][12])\\d{4}","\\d{10}",,,"6492311234"] ,[,,"8(?:00|55|66|77|88)[2-9]\\d{6}","\\d{10}",,,"8002345678"] ,[,,"900[2-9]\\d{6}","\\d{10}",,,"9002345678"] ,[,,"NA","NA"] @@ -4530,7 +4530,7 @@ i18n.phonenumbers.metadata.countryToMetadata = { ] ,"TL":[,[,,"[2-47-9]\\d{6}","\\d{7}"] ,[,,"(?:2[1-5]|3[1-9]|4[1-4])\\d{5}","\\d{7}",,,"2112345"] -,[,,"7[2-4]\\d{5}","\\d{7}",,,"7212345"] +,[,,"7[2-49]\\d{5}","\\d{7}",,,"7212345"] ,[,,"80\\d{5}","\\d{7}",,,"8012345"] ,[,,"90\\d{5}","\\d{7}",,,"9012345"] ,[,,"NA","NA"] diff --git a/javascript/i18n/phonenumbers/metadatalite.js b/javascript/i18n/phonenumbers/metadatalite.js index 5ce881459..063bab780 100644 --- a/javascript/i18n/phonenumbers/metadatalite.js +++ b/javascript/i18n/phonenumbers/metadatalite.js @@ -398,8 +398,8 @@ i18n.phonenumbers.metadata.countryToMetadata = { ,[,,"NA","NA"] ] ,"AN":[,[,,"5\\d{6}","\\d{7}"] -,[,,"5(?:4\\d|8[239])\\d{4}","\\d{7}"] -,[,,"5(?:1[01]|2[0-7]|5\\d|8[016-8])\\d{4}","\\d{7}"] +,[,,"5(?:4[2-8]|8[239])\\d{4}","\\d{7}"] +,[,,"5(?:1[02]|2\\d|5[0-79]|8[016-8])\\d{4}","\\d{7}"] ,[,,"NA","NA"] ,[,,"NA","NA"] ,[,,"NA","NA"] @@ -1567,7 +1567,7 @@ i18n.phonenumbers.metadata.countryToMetadata = { ] ,"ET":[,[,,"[1-59]\\d{8}","\\d{7,9}"] ,[,,"(?:11(?:1(?:1[124]|2[2-57]|3[1-5]|5[5-8]|8[6-8])|2(?:13|3[6-8]|5[89]|7[05-9]|8[2-6])|3(?:2[01]|3[0-289]|4[1289]|7[1-4]|87)|4(?:1[69]|3[2-49]|4[0-3]|6[5-8])|5(?:1[57]|44|5[0-4])|6(?:18|2[69]|4[5-7]|5[1-5]|6[0-59]|8[015-8]))|2(?:2(?:11[1-9]|22[0-7]|33\\d|44[1467]|66[1-68])|5(?:11[124-6]|33[2-8]|44[1467]|55[14]|66[1-3679]|77[124-79]|880))|3(?:3(?:11[0-46-8]|22[0-6]|33[0134689]|44[04]|55[0-6]|66[01467])|4(?:44[0-8]|55[0-69]|66[0-3]|77[1-5]))|4(?:6(?:22[0-24-7]|33[1-5]|44[13-69]|55[14-689]|660|88[1-4])|7(?:11[1-9]|22[1-9]|33[13-7]|44[13-6]|55[1-689]))|5(?:7(?:227|55[05]|(?:66|77)[14-8])|8(?:11[149]|22[013-79]|33[0-68]|44[013-8]|550|66[1-5]|77\\d)))\\d{4}","\\d{7,9}"] -,[,,"9[12]\\d{7}","\\d{9}"] +,[,,"9(?:[1-3]\\d|5[89])\\d{6}","\\d{9}"] ,[,,"NA","NA"] ,[,,"NA","NA"] ,[,,"NA","NA"] @@ -2626,7 +2626,7 @@ i18n.phonenumbers.metadata.countryToMetadata = { ] ,"KW":[,[,,"[12569]\\d{6,7}|65816\\d{6}","\\d{7,8}|\\d{11}"] ,[,,"(?:18\\d|2(?:[23]\\d{2}|4[1-35-9]\\d|5(?:0[034]|[2-46]\\d|5[1-3]|7[1-7])))\\d{4}","\\d{7,8}"] -,[,,"(?:5(?:0[0-2568]|5\\d)|6(?:0[034679]|5(?:[015-79]|8(?:[02-9]|1[0-57-9]))|6\\d|7[067]|9[69])|9(?:0[09]|4[049]|6[69]|[79]\\d))\\d{5}","\\d{8}"] +,[,,"(?:5(?:0[0-2568]|5\\d)|6(?:0[034679]|5(?:[015-79]|8(?:[02-9]|1[0-57-9]))|6\\d|7[067]|9[069])|9(?:0[09]|4[049]|6[69]|[79]\\d))\\d{5}","\\d{8}"] ,[,,"NA","NA"] ,[,,"NA","NA"] ,[,,"NA","NA"] @@ -3091,13 +3091,13 @@ i18n.phonenumbers.metadata.countryToMetadata = { ,[,,"NA","NA"] ] ,"MN":[,[,,"[12]\\d{7,9}|[57-9]\\d{7}","\\d{6,10}"] -,[,,"[12](?:1\\d|2(?:[1-3]\\d?|7\\d)|3[2-8]\\d{1,2}|4[2-68]\\d{1,2}|5[1-4689]\\d{1,2})\\d{5}|(?:5[0568]|70)\\d{6}","\\d{6,10}"] -,[,,"(?:8[89]|9[15689])\\d{6}","\\d{8}"] +,[,,"[12](?:1\\d|2(?:[1-3]\\d?|7\\d)|3[2-8]\\d{1,2}|4[2-68]\\d{1,2}|5[1-4689]\\d{1,2})\\d{5}|5[0568]\\d{6}","\\d{6,10}"] +,[,,"(?:8[89]|9[013-9])\\d{6}","\\d{8}"] ,[,,"NA","NA"] ,[,,"NA","NA"] ,[,,"NA","NA"] ,[,,"NA","NA"] -,[,,"7[569]\\d{6}","\\d{8}"] +,[,,"7[05-8]\\d{6}","\\d{8}"] ,"MN",976,"001","0",,,"0",,,,[[,"([12]\\d)(\\d{2})(\\d{4})","$1 $2 $3",["[12]1"] ,"0$1","",0] ,[,"([12]2\\d)(\\d{5,6})","$1 $2",["[12]2[1-3]"] @@ -4375,8 +4375,8 @@ i18n.phonenumbers.metadata.countryToMetadata = { ,[,,"NA","NA"] ] ,"SX":[,[,,"[5789]\\d{9}","\\d{7}(?:\\d{3})?"] -,[,,"7215(?:4[2-8]|8[239])\\d{4}","\\d{7}(?:\\d{3})?"] -,[,,"7215(?:1[02]|2\\d|5[03469]|8[01678])\\d{4}","\\d{10}"] +,[,,"7215(?:4[2-8]|8[239]|9[056])\\d{4}","\\d{7}(?:\\d{3})?"] +,[,,"7215(?:1[02]|2\\d|5[034679]|8[014-8])\\d{4}","\\d{10}"] ,[,,"8(?:00|55|66|77|88)[2-9]\\d{6}","\\d{10}"] ,[,,"900[2-9]\\d{6}","\\d{10}"] ,[,,"NA","NA"] @@ -4426,7 +4426,7 @@ i18n.phonenumbers.metadata.countryToMetadata = { ] ,"TC":[,[,,"[5689]\\d{9}","\\d{7}(?:\\d{3})?"] ,[,,"649(?:712|9(?:4\\d|50))\\d{4}","\\d{7}(?:\\d{3})?"] -,[,,"649(?:2(?:3[12]|4[1-7])|3(?:3[1-39]|4[1-7])|4[34][12])\\d{4}","\\d{10}"] +,[,,"649(?:2(?:3[129]|4[1-7])|3(?:3[1-39]|4[1-7])|4[34][12])\\d{4}","\\d{10}"] ,[,,"8(?:00|55|66|77|88)[2-9]\\d{6}","\\d{10}"] ,[,,"900[2-9]\\d{6}","\\d{10}"] ,[,,"NA","NA"] @@ -4530,7 +4530,7 @@ i18n.phonenumbers.metadata.countryToMetadata = { ] ,"TL":[,[,,"[2-47-9]\\d{6}","\\d{7}"] ,[,,"(?:2[1-5]|3[1-9]|4[1-4])\\d{5}","\\d{7}"] -,[,,"7[2-4]\\d{5}","\\d{7}"] +,[,,"7[2-49]\\d{5}","\\d{7}"] ,[,,"80\\d{5}","\\d{7}"] ,[,,"90\\d{5}","\\d{7}"] ,[,,"NA","NA"] diff --git a/resources/PhoneNumberMetaData.xml b/resources/PhoneNumberMetaData.xml index 99817224b..828ef52c6 100644 --- a/resources/PhoneNumberMetaData.xml +++ b/resources/PhoneNumberMetaData.xml @@ -684,7 +684,9 @@ + numbers through their parallel running period (which ends Sep 2012). New number ranges + added to Sint Maarten during this time will be added to the new territory only and not + here. --> @@ -698,18 +700,22 @@ 5(?: - 4\d| + 4[2-8]| 8[239] )\d{4} 5451234 + 5(?: - 1[01]| - 2[0-7]| - 5\d| + 1[02]| + 2\d| + 5[0-79]| 8[016-8] )\d{4} @@ -6526,8 +6532,14 @@ - 9[12]\d{7} + therefore somewhat more relaxed than in the ITU document. According to the ETC, the + prefix 93 is assigned to Addis Ababa Mobile and 95[89] to some CDMA providers. --> + + 9(?: + [1-3]\d| + 5[89] + )\d{6} + \d{9} 911234567 @@ -13604,7 +13616,6 @@ 22345678 - (?: 5(?: @@ -13622,7 +13633,7 @@ )| 6\d| 7[067]| - 9[69] + 9[069] )| 9(?: 0[09]| @@ -15796,19 +15807,15 @@ 4[2-68]\d{1,2}| 5[1-4689]\d{1,2} )\d{5}| - (?: - 5[0568]| - 70 - )\d{6} + 5[0568]\d{6} - 70123456 + 50123456 - (?: 8[89]| - 9[15689] + 9[013-9] )\d{6} \d{8} @@ -15816,7 +15823,9 @@ - 7[569]\d{6} + + 7[05-8]\d{6} \d{8} 75123456 @@ -21224,7 +21233,8 @@ 7215(?: 4[2-8]| - 8[239] + 8[239]| + 9[056] )\d{4} 7215425678 @@ -21236,8 +21246,8 @@ 7215(?: 1[02]| 2\d| - 5[03469]| - 8[01678] + 5[034679]| + 8[014-8] )\d{4} \d{10} @@ -21435,7 +21445,7 @@ 649(?: 2(?: - 3[12]| + 3[129]| 4[1-7] )| 3(?: @@ -21821,7 +21831,9 @@ 2112345 - 7[2-4]\d{5} + + 7[2-49]\d{5} 7212345