Fix JP 060 number format.

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

diff --git a/java/resources/com/google/i18n/phonenumbers/src/PhoneNumberMetaData.xml b/java/resources/com/google/i18n/phonenumbers/src/PhoneNumberMetaData.xml
index f4e3e3d..e3035ee 100644 (file)
--- a/java/resources/com/google/i18n/phonenumbers/src/PhoneNumberMetaData.xml
+++ b/java/resources/com/google/i18n/phonenumbers/src/PhoneNumberMetaData.xml
@@ -9667,6 +9667,7 @@
               [2-589]|
               39
             )|
+            60|
             8(?:
               [46-9]|
               3[279]|
@@ -9704,6 +9705,7 @@
               [2-589]|
               39[67]
             )|
+            60|
             8(?:
               [46-9]|
               3[279]|
@@ -9744,6 +9746,7 @@
               [2-589]|
               39[67]
             )|
+            60|
             8(?:
               [46-9]|
               3[279]|
@@ -9774,11 +9777,12 @@
         </numberFormat>
         <numberFormat pattern="(\d)(\d{4})(\d{4})">
           <leadingDigits>
-            [36]|
+            3|
             4(?:
               2[09]|
               7[01]
-            )
+            )|
+            6[1-9]
           </leadingDigits>
           <format>$1-$2-$3</format>
         </numberFormat>

diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP
index 230c63b..9650864 100644 (file)
Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP differ