JS: libphonenumber v5.2

Review URL: https://codereview.appspot.com/6821053

git-svn-id: http://libphonenumber.googlecode.com/svn/trunk@538 ee073f10-1060-11df-b6a4-87a95322a99c

1 files changed, 20 insertions, 32 deletions

diff --git a/javascript/i18n/phonenumbers/metadatalite.js b/javascript/i18n/phonenumbers/metadatalite.js
index 318422b..bb36de8 100644
--- a/javascript/i18n/phonenumbers/metadatalite.js
+++ b/javascript/i18n/phonenumbers/metadatalite.js
@@ -185,7 +185,7 @@ i18n.phonenumbers.metadata.countryCodeToRegionCodeMap = {
 ,596:["MQ"]
 ,597:["SR"]
 ,598:["UY"]
-,599:["CW","AN","BQ"]
+,599:["CW","BQ"]
 ,670:["TL"]
 ,672:["NF"]
 ,673:["BN"]
@@ -399,20 +399,6 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,[,,"10[123]","\\d{3}"]
 ,[,,"NA","NA"]
 ]
-,"AN":[,[,,"5\\d{6}","\\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"]
-,[,,"NA","NA"]
-,[,,"NA","NA"]
-,"AN",599,"00",,,,,,,,,,[,,"NA","NA"]
-,,,[,,"NA","NA"]
-,[,,"NA","NA"]
-,,[,,"112|911","\\d{3}"]
-,[,,"NA","NA"]
-]
 ,"AO":[,[,,"[29]\\d{8}","\\d{9}"]
 ,[,,"2\\d(?:[26-9]\\d|\\d[26-9])\\d{5}","\\d{9}"]
 ,[,,"9[1-4]\\d{7}","\\d{9}"]
@@ -1369,13 +1355,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"180\\d{5,11}","\\d{8,14}"]
 ,[,,"700\\d{8}","\\d{11}"]
 ,[,,"NA","NA"]
-,"DE",49,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{4,11})","$1/$2",["3[02]|40|[68]9"]
+,"DE",49,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{4,11})","$1 $2",["3[02]|40|[68]9"]
 ,"0$1","",0]
-,[,"(\\d{3})(\\d{3,11})","$1/$2",["2(?:\\d1|0[2389]|1[24]|28|34)|3(?:[3-9][15]|40)|[4-8][1-9]1|9(?:06|[1-9]1)"]
+,[,"(\\d{3})(\\d{3,11})","$1 $2",["2(?:\\d1|0[2389]|1[24]|28|34)|3(?:[3-9][15]|40)|[4-8][1-9]1|9(?:06|[1-9]1)"]
 ,"0$1","",0]
-,[,"(\\d{4})(\\d{2,11})","$1/$2",["[24-6]|[7-9](?:\\d[1-9]|[1-9]\\d)|3(?:[3569][02-46-9]|4[2-4679]|7[2-467]|8[2-46-8])","[24-6]|[7-9](?:\\d[1-9]|[1-9]\\d)|3(?:3(?:0[1-467]|2[127-9]|3[124578]|[46][1246]|7[1257-9]|8[1256]|9[145])|4(?:2[135]|3[1357]|4[13578]|6[1246]|7[1356]|9[1346])|5(?:0[14]|2[1-3589]|3[1357]|4[1246]|6[1-4]|7[1346]|8[13568]|9[1246])|6(?:0[356]|2[1-489]|3[124-6]|4[1347]|6[13]|7[12579]|8[1-356]|9[135])|7(?:2[1-7]|3[1357]|4[145]|6[1-5]|7[1-4])|8(?:21|3[1468]|4[1347]|6[0135-9]|7[1467]|8[136])|9(?:0[12479]|2[1358]|3[1357]|4[134679]|6[1-9]|7[136]|8[147]|9[1468]))"]
+,[,"(\\d{4})(\\d{2,11})","$1 $2",["[24-6]|[7-9](?:\\d[1-9]|[1-9]\\d)|3(?:[3569][02-46-9]|4[2-4679]|7[2-467]|8[2-46-8])","[24-6]|[7-9](?:\\d[1-9]|[1-9]\\d)|3(?:3(?:0[1-467]|2[127-9]|3[124578]|[46][1246]|7[1257-9]|8[1256]|9[145])|4(?:2[135]|3[1357]|4[13578]|6[1246]|7[1356]|9[1346])|5(?:0[14]|2[1-3589]|3[1357]|4[1246]|6[1-4]|7[1346]|8[13568]|9[1246])|6(?:0[356]|2[1-489]|3[124-6]|4[1347]|6[13]|7[12579]|8[1-356]|9[135])|7(?:2[1-7]|3[1357]|4[145]|6[1-5]|7[1-4])|8(?:21|3[1468]|4[1347]|6[0135-9]|7[1467]|8[136])|9(?:0[12479]|2[1358]|3[1357]|4[134679]|6[1-9]|7[136]|8[147]|9[1468]))"]
 ,"0$1","",0]
-,[,"(\\d{5})(\\d{1,10})","$1/$2",["3"]
+,[,"(\\d{5})(\\d{1,10})","$1 $2",["3"]
 ,"0$1","",0]
 ,[,"(1\\d{2})(\\d{7,8})","$1 $2",["1[5-7]"]
 ,"0$1","",0]
@@ -1945,7 +1931,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"GR":[,[,,"[26-9]\\d{9}","\\d{10}"]
-,[,,"2(?:1\\d{2}|2(?:3[1-8]|4[1-7]|5[1-4]|6[1-8]|7[1-5]|[289][1-9])|3(?:1\\d|2[1-5]|3[1-4]|[45][1-3]|7[1-7]|8[1-6]|9[1-79])|4(?:1\\d|2[1-8]|3[1-4]|4[13-5]|6[1-578]|9[1-5])|5(?:1\\d|2[1-3]|4[124]|5[1-6]|[39][1-4])|6(?:1\\d|3[124]|4[1-7]|5[13-9]|[269][1-6]|7[14]|8[1-5])|7(?:1\\d|2[1-5]|3[1-6]|4[1-7]|5[1-57]|6[134]|9[15-7])|8(?:1\\d|2[1-5]|[34][1-4]|9[1-7]))\\d{6}","\\d{10}"]
+,[,,"2(?:1\\d{2}|2(?:3[1-8]|4[1-7]|5[1-4]|6[1-8]|7[1-5]|[289][1-9])|3(?:1\\d|2[1-57]|3[1-4]|[45][1-3]|7[1-7]|8[1-6]|9[1-79])|4(?:1\\d|2[1-8]|3[1-4]|4[13-5]|6[1-578]|9[1-5])|5(?:1\\d|2[1-3]|4[124]|5[1-6]|[39][1-4])|6(?:1\\d|3[124]|4[1-7]|5[13-9]|[269][1-6]|7[14]|8[1-5])|7(?:1\\d|2[1-5]|3[1-6]|4[1-7]|5[1-57]|6[134]|9[15-7])|8(?:1\\d|2[1-5]|[34][1-4]|9[1-7]))\\d{6}","\\d{10}"]
 ,[,,"69\\d{8}","\\d{10}"]
 ,[,,"800\\d{7}","\\d{10}"]
 ,[,,"90[19]\\d{7}","\\d{10}"]
@@ -2070,16 +2056,18 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"HR":[,[,,"[1-7]\\d{5,8}|[89]\\d{6,11}","\\d{6,12}"]
-,[,,"(?:1|6[029])\\d{7}|(?:2[0-3]|3[1-5]|4[02-47-9]|5[1-3])\\d{6}","\\d{6,9}"]
+,[,,"1\\d{7}|(?:2[0-3]|3[1-5]|4[02-47-9]|5[1-3])\\d{6}","\\d{6,8}"]
 ,[,,"9[1257-9]\\d{6,10}","\\d{8,12}"]
 ,[,,"80[01]\\d{4,7}","\\d{7,10}"]
-,[,,"6[145]\\d{4,7}","\\d{6,9}"]
+,[,,"6(?:[09]\\d{7}|[145]\\d{4,7})","\\d{6,9}"]
 ,[,,"NA","NA"]
 ,[,,"7[45]\\d{4,7}","\\d{6,9}"]
 ,[,,"NA","NA"]
 ,"HR",385,"00","0",,,"0",,,,[[,"(1)(\\d{4})(\\d{3})","$1 $2 $3",["1"]
 ,"0$1","",0]
-,[,"(6[029])(\\d{4})(\\d{3})","$1 $2 $3",["6[029]"]
+,[,"(6[09])(\\d{4})(\\d{3})","$1 $2 $3",["6[09]"]
+,"0$1","",0]
+,[,"(62)(\\d{3})(\\d{3,4})","$1 $2 $3",["62"]
 ,"0$1","",0]
 ,[,"([2-5]\\d)(\\d{3})(\\d{3})","$1 $2 $3",["[2-5]"]
 ,"0$1","",0]
@@ -2100,7 +2088,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
-,[,,"NA","NA"]
+,[,,"62\\d{6,7}","\\d{8,9}"]
 ,,[,,"1(?:12|92)|9[34]","\\d{2,3}"]
 ,[,,"NA","NA"]
 ]
@@ -3613,9 +3601,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,[,,"111","\\d{3}"]
 ,[,,"NA","NA"]
 ]
-,"OM":[,[,,"(?:2[3-6]|5|9[2-9])\\d{6}|800\\d{5,6}","\\d{7,9}"]
-,[,,"2[3-6]\\d{6}","\\d{8}"]
-,[,,"9[2-9]\\d{6}","\\d{8}"]
+,"OM":[,[,,"(?:2[2-6]|5|9[1-9])\\d{6}|800\\d{5,6}","\\d{7,9}"]
+,[,,"2[2-6]\\d{6}","\\d{8}"]
+,[,,"9[1-9]\\d{6}","\\d{8}"]
 ,[,,"8007\\d{4,5}|500\\d{4}","\\d{7,9}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -4061,15 +4049,15 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,[,,"99[7-9]","\\d{3}"]
 ,[,,"NA","NA"]
 ]
-,"SB":[,[,,"[1-8]\\d{4,6}","\\d{5,7}"]
+,"SB":[,[,,"[1-9]\\d{4,6}","\\d{5,7}"]
 ,[,,"(?:1[4-79]|[23]\\d|4[01]|5[03]|6[0-37])\\d{3}","\\d{5}"]
-,[,,"48\\d{3}|7(?:4\\d|5[025-8]|6[0-6])\\d{4}|8[4-8]\\d{5}","\\d{5,7}"]
+,[,,"48\\d{3}|7(?:[46-8]\\d|5[025-9]|90)\\d{4}|8[4-8]\\d{5}|9(?:[46]\\d|5[0-46-9]|7[0-689]|8[0-79]|9[0-8])\\d{4}","\\d{5,7}"]
 ,[,,"1[38]\\d{3}","\\d{5}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"5[12]\\d{3}","\\d{5}"]
-,"SB",677,"0[01]",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[78]"]
+,"SB",677,"0[01]",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[7-9]"]
 ,"","",0]
 ]
 ,,[,,"NA","NA"]
@@ -5027,7 +5015,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"(?:1[0-8]|2[1-478]|3[1-69]|4\\d|5[1346-8])\\d{7}","\\d{8,9}"]
 ,[,,"(?:7[1-4689]|8[1-5789])\\d{3,7}","\\d{5,9}"]
 ,[,,"80\\d{7}","\\d{9}"]
-,[,,"86[1-9]\\d{6}","\\d{9}"]
+,[,,"86[2-9]\\d{6}","\\d{9}"]
 ,[,,"860\\d{6}","\\d{9}"]
 ,[,,"NA","NA"]
 ,[,,"87\\d{7}","\\d{9}"]
@@ -5042,7 +5030,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
-,[,,"NA","NA"]
+,[,,"861\\d{6}","\\d{9}"]
 ,,[,,"1(?:01(?:11|77)|12)","\\d{3,5}"]
 ,[,,"NA","NA"]
 ]