Skip to content

Commit e734471

Browse files
daviddrysdaledaviddrysdale
committed
Merge metadata changes from upstream 7.2.7
Includes changes in resources/ up to and including upstream commit 73f64b69c5bf "[maven-release-plugin] prepare release libphonenumber-7.2.7"
1 parent 5eb00df commit e734471

5 files changed

Lines changed: 147 additions & 68 deletions

File tree

‎resources/PhoneNumberMetadata.xml‎

Lines changed: 53 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4864,39 +4864,6 @@
48644864
</leadingDigits>
48654865
<format>$1 $2 $3</format>
48664866
</numberFormat>
4867-
<numberFormat nationalPrefixFormattingRule="$NP$FG" pattern="(\d{3})(\d{4})(\d{4})"
4868-
nationalPrefixOptionalWhenFormatting="true"
4869-
carrierCodeFormattingRule="$CC $FG">
4870-
<leadingDigits>
4871-
3(?:
4872-
11|
4873-
7[179]
4874-
)|
4875-
4(?:
4876-
[15]1|
4877-
3[12]
4878-
)|
4879-
5(?:
4880-
1|
4881-
2[37]|
4882-
3[12]|
4883-
51|
4884-
7[13-79]|
4885-
9[15]
4886-
)|
4887-
7(?:
4888-
31|
4889-
5[457]|
4890-
6[09]|
4891-
91
4892-
)|
4893-
8(?:
4894-
[57]1|
4895-
98
4896-
)
4897-
</leadingDigits>
4898-
<format>$1 $2 $3</format>
4899-
</numberFormat>
49004867
<numberFormat nationalPrefixFormattingRule="$NP$FG" pattern="(\d{3})(\d{3})(\d{4})"
49014868
nationalPrefixOptionalWhenFormatting="true"
49024869
carrierCodeFormattingRule="$CC $FG">
@@ -4957,6 +4924,39 @@
49574924
)
49584925
</leadingDigits>
49594926
<format>$1 $2 $3</format>
4927+
</numberFormat>
4928+
<numberFormat nationalPrefixFormattingRule="$NP$FG" pattern="(\d{3})(\d{4})(\d{4})"
4929+
nationalPrefixOptionalWhenFormatting="true"
4930+
carrierCodeFormattingRule="$CC $FG">
4931+
<leadingDigits>
4932+
3(?:
4933+
11|
4934+
7[179]
4935+
)|
4936+
4(?:
4937+
[15]1|
4938+
3[12]
4939+
)|
4940+
5(?:
4941+
1|
4942+
2[37]|
4943+
3[12]|
4944+
51|
4945+
7[13-79]|
4946+
9[15]
4947+
)|
4948+
7(?:
4949+
31|
4950+
5[457]|
4951+
6[09]|
4952+
91
4953+
)|
4954+
8(?:
4955+
[57]1|
4956+
98
4957+
)
4958+
</leadingDigits>
4959+
<format>$1 $2 $3</format>
49604960
</numberFormat>
49614961
<numberFormat pattern="(\d{3})(\d{4})(\d{4})" carrierCodeFormattingRule="$CC $FG">
49624962
<leadingDigits>1[3-578]</leadingDigits>
@@ -10509,7 +10509,7 @@
1050910509
<leadingDigits>
1051010510
7(?:
1051110511
[0257]|
10512-
3[0157-9]|
10512+
3[013-57-9]|
1051310513
4[0-389]|
1051410514
6[0-35-9]|
1051510515
8[0-79]
@@ -10539,6 +10539,8 @@
1053910539
3(?:
1054010540
[058]|
1054110541
1[09]|
10542+
31|
10543+
48|
1054210544
7[3679]|
1054310545
9[689]
1054410546
)|
@@ -11006,6 +11008,8 @@
1100611008
3(?:
1100711009
[058]\d|
1100811010
1[09]|
11011+
31|
11012+
48|
1100911013
7[3679]|
1101011014
9[689]
1101111015
)|
@@ -16163,7 +16167,7 @@
1616316167
<nationalNumberPattern>
1616416168
6(?:
1616516169
[2356]\d|
16166-
8[18]
16170+
8[158]
1616716171
)\d{5}
1616816172
</nationalNumberPattern>
1616916173
<exampleNumber>66123456</exampleNumber>
@@ -22047,17 +22051,25 @@
2204722051
<sourceUrl>http://www.itu.int/oth/T02020000D2/en</sourceUrl>
2204822052
</references>
2204922053
<generalDesc>
22050-
<nationalNumberPattern>[2-9]\d{3}</nationalNumberPattern>
22051-
<possibleNumberPattern>\d{4}</possibleNumberPattern>
22054+
<nationalNumberPattern>[2-47]\d{3,6}</nationalNumberPattern>
22055+
<possibleNumberPattern>\d{4,7}</possibleNumberPattern>
2205222056
</generalDesc>
2205322057
<fixedLine>
22054-
<nationalNumberPattern>[2-4]\d{3}</nationalNumberPattern>
22058+
<nationalNumberPattern>
22059+
(?:
22060+
2[2-4]|
22061+
[34]\d
22062+
)\d{2,5}
22063+
</nationalNumberPattern>
2205522064
<!-- The example number is the contact number from the ITU document. -->
22056-
<exampleNumber>3010</exampleNumber>
22065+
<exampleNumber>3101</exampleNumber>
2205722066
</fixedLine>
22067+
<!-- No evidence has been found for prefixes 5, 6, 8, and 9 which are
22068+
described as non-geographic service numbers, so these prefixes are
22069+
excluded until more information is found. -->
2205822070
<mobile>
22059-
<nationalNumberPattern>[5-9]\d{3}</nationalNumberPattern>
22060-
<exampleNumber>5190</exampleNumber>
22071+
<nationalNumberPattern>7[2-4]\d{2,5}</nationalNumberPattern>
22072+
<exampleNumber>7290</exampleNumber>
2206122073
</mobile>
2206222074
</territory>
2206322075

‎resources/ShortNumberMetadata.xml‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3544,6 +3544,7 @@
35443544
)|
35453545
8\d{3}
35463546
)|
3547+
9[167]|
35473548
[578]
35483549
)|
35493550
2(?:
@@ -3584,7 +3585,8 @@
35843585
[0459]|
35853586
6\d{3}|
35863587
871[03]
3587-
)
3588+
)|
3589+
9[167]
35883590
)|
35893591
224|
35903592
3(?:
@@ -3689,19 +3691,30 @@
36893691
</emergency>
36903692
<expandedEmergency>
36913693
<nationalNumberPattern>
3692-
116(?:
3693-
000|
3694-
111
3694+
1(?:
3695+
1(?:
3696+
[459]|
3697+
6(?:
3698+
000|
3699+
111
3700+
)
3701+
)|
3702+
9[167]
36953703
)
36963704
</nationalNumberPattern>
3697-
<possibleNumberPattern>\d{6}</possibleNumberPattern>
3705+
<possibleNumberPattern>\d{3,6}</possibleNumberPattern>
36983706
<exampleNumber>116111</exampleNumber>
36993707
</expandedEmergency>
37003708
<!-- https://clients.txtnation.com/entries/22523777-France-Premium-SMS-Short-Code-Regulations
37013709
-->
37023710
<smsServices>
3703-
<nationalNumberPattern>[3-8]\d{4}</nationalNumberPattern>
3704-
<possibleNumberPattern>\d{5}</possibleNumberPattern>
3711+
<nationalNumberPattern>
3712+
(?:
3713+
114|
3714+
[3-8]\d{4}
3715+
)
3716+
</nationalNumberPattern>
3717+
<possibleNumberPattern>\d{3,5}</possibleNumberPattern>
37053718
<exampleNumber>33700</exampleNumber>
37063719
</smsServices>
37073720
<carrierSelectionCodes>

‎resources/carrier/en/853.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,16 @@
309309
8536812|CTM
310310
8536813|CTM
311311
8536814|CTM
312+
8536815|SmarTone
313+
8536816|SmarTone
314+
8536817|SmarTone
315+
8536818|SmarTone
316+
8536819|SmarTone
317+
8536850|3
318+
8536851|3
319+
8536852|3
320+
8536853|3
321+
8536854|3
312322
8536880|CTM
313323
8536881|CTM
314324
8536882|CTM

‎resources/phonemetadata.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ message NumberFormat {
8282
// commonly seen this number written by people without the leading 0, for
8383
// example as (20) XXXX XXXX, this field would be set to true. This will be
8484
// inherited from the value set for the territory in the XML file, unless a
85-
// national_prefix_formatting_rule is defined specifically for this
85+
// national_prefix_optional_when_formatting is defined specifically for this
8686
// NumberFormat.
8787
optional bool national_prefix_optional_when_formatting = 6;
8888

0 commit comments

Comments
 (0)