Commits

Anonymous committed d857a3b

JAVA/JS: Metadata changes only (v4.8.3).

Comments (0)

Files changed (11)

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AN

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL

Binary file modified.

java/release_notes.txt

+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

javascript/i18n/phonenumbers/metadata.js

 ,[,,"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"]
 ]
 ,"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"]
 ]
 ,"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"]
 ,[,,"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"]
-,[,,"NA","NA"]
-,[,,"NA","NA"]
-,[,,"NA","NA"]
-,[,,"NA","NA"]
-,[,,"7[569]\\d{6}","\\d{8}",,,"75123456"]
+,[,,"[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[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]"]
 ,[,,"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"]
 ]
 ,"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"]
 ]
 ,"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"]

javascript/i18n/phonenumbers/metadatalite.js

 ,[,,"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"]
 ]
 ,"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"]
 ]
 ,"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"]
 ,[,,"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}"]
-,[,,"NA","NA"]
-,[,,"NA","NA"]
-,[,,"NA","NA"]
-,[,,"NA","NA"]
-,[,,"7[569]\\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[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]"]
 ,[,,"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"]
 ]
 ,"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"]
 ]
 ,"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"]

resources/PhoneNumberMetaData.xml

 
     <!-- Netherlands Antilles -->
     <!-- Note this country no longer exists. This metadata exists only to validate old Sint Maarten
-         numbers through their parallel running period (which ends Sep 2012). -->
+         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. -->
     <!-- The link below no longer works, since ITU deleted this document since this country no
          longer exists. We keep it here as a record of the last place we found information on this
          country. -->
       <fixedLine>
         <nationalNumberPattern>
           5(?:
-            4\d|
+            4[2-8]|
             8[239]
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>5451234</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- The code 555 was NOT migrated when the new country calling code (+1 721) was assigned
+             for Sint Maarten, so it is supported here but not there. The codes 55[12] also seem
+             to not have been migrated: although they were not explicitly mentioned in the migration
+             instructions, they are not in the new plan for SX. -->
         <nationalNumberPattern>
           5(?:
-            1[01]|
-            2[0-7]|
-            5\d|
+            1[02]|
+            2\d|
+            5[0-79]|
             8[016-8]
           )\d{4}
         </nationalNumberPattern>
       <mobile>
         <!-- The data here is not regularly updated by the Ethiopian authorities, and many more
              numbers are visible online than are reported in the ITU document. This pattern is
-             therefore somewhat more relaxed than in the ITU document. -->
-        <nationalNumberPattern>9[12]\d{7}</nationalNumberPattern>
+             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. -->
+             <nationalNumberPattern>
+          9(?:
+            [1-3]\d|
+            5[89]
+          )\d{6}
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>911234567</exampleNumber>
       </mobile>
         <exampleNumber>22345678</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Added 969 from an opensource report that this is now in use by Zain. -->
         <nationalNumberPattern>
           (?:
             5(?:
               )|
               6\d|
               7[067]|
-              9[69]
+              9[069]
             )|
             9(?:
               0[09]|
             4[2-68]\d{1,2}|
             5[1-4689]\d{1,2}
           )\d{5}|
-          (?:
-            5[0568]|
-            70
-          )\d{6}
-        </nationalNumberPattern>
-        <exampleNumber>70123456</exampleNumber>
-      </fixedLine>
-      <mobile>
-        <!-- Adding prefix 98 from numbers found on the internet. -->
+          5[0568]\d{6}
+        </nationalNumberPattern>
+        <exampleNumber>50123456</exampleNumber>
+      </fixedLine>
+      <mobile>
         <nationalNumberPattern>
           (?:
             8[89]|
-            9[15689]
+            9[013-9]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </mobile>
       <!-- No tollFree or premiumRate information can be found. -->
       <voip>
-        <nationalNumberPattern>7[569]\d{6}</nationalNumberPattern>
+        <!-- According to the document this could be stricter, but there are counter examples
+             online. -->
+        <nationalNumberPattern>7[05-8]\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>75123456</exampleNumber>
       </voip>
         <nationalNumberPattern>
           7215(?:
             4[2-8]|
-            8[239]
+            8[239]|
+            9[056]
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>7215425678</exampleNumber>
           7215(?:
             1[02]|
             2\d|
-            5[03469]|
-            8[01678]
+            5[034679]|
+            8[014-8]
           )\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <nationalNumberPattern>
           649(?:
             2(?:
-              3[12]|
+              3[129]|
               4[1-7]
             )|
             3(?:
         <exampleNumber>2112345</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>7[2-4]\d{5}</nationalNumberPattern>
+        <!-- The prefix 79 is assigned to "pagers" in the numbering plan, but it seems from numbers
+             found online that it is in fact assigned to mobile users. -->
+        <nationalNumberPattern>7[2-49]\d{5}</nationalNumberPattern>
         <exampleNumber>7212345</exampleNumber>
       </mobile>
       <tollFree>