Skip to content

Commit 7f773a9

Browse files
daviddrysdaledaviddrysdale
committed
Merge metadata changes from upstream 8.6.0
Includes changes in resources/ up to and including upstream commit 242a186f1fbf: "[maven-release-plugin] prepare release v8.6.0"
1 parent 94fa13c commit 7f773a9

9 files changed

Lines changed: 169 additions & 173 deletions

File tree

‎resources/PhoneNumberMetadata.xml‎

Lines changed: 128 additions & 59 deletions
Large diffs are not rendered by default.

‎resources/PhoneNumberMetadataForTesting.xml‎

Lines changed: 3 additions & 97 deletions
Large diffs are not rendered by default.

‎resources/carrier/en/254.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
254742|Safaricom
2727
254743|Safaricom
2828
254744|Homeland Media
29+
254746|Safaricom
2930
254747|JTL
3031
254749|WiAfrica
3132
254750|Airtel

‎resources/carrier/en/508.txt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Copyright (C) 2017 The Libphonenumber Authors
2+
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# Source: www.arcep.fr
16+
17+
50840|Globaltel
18+
50855|SPM Telecom

‎resources/carrier/en/95.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,12 @@
4242
959427|ZTE
4343
95951|ZTE
4444
95955|ZTE
45+
95969|MNTC
4546
95976|Telenor
4647
95977|Telenor
4748
95978|Telenor
4849
95979|Telenor
50+
95989|MPT
4951
95995|Ooredoo
5052
95996|Ooredoo
5153
95997|Ooredoo

‎resources/carrier/en/972.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# limitations under the License.
1414

1515
97250|Pelephone
16+
97251|Xphone
1617
97252|Cellcom
1718
97253|Hot Mobile
1819
97254|Orange

‎resources/geocoding/en/95.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
951422|Yangon
16+
951423|Yangon
17+
951426|Yangon
18+
951439|Yangon
1519
951550|Bahan
1620
951551|Bahan
1721
951552|Bahan
@@ -26,7 +30,10 @@
2630
951687|Bayintnaung
2731
951688|Bayintnaung
2832
9522000|Mingalar Mandalay
33+
952426|Mandalay
34+
952439|Mandalay
2935
95256|Amarapura
36+
9543202|Rakhine
3037
954353|Buthidaung
3138
9543565|Palatwa
3239
95522221|Bago
@@ -51,6 +58,7 @@
5158
956324|Magway
5259
95642487|Shawpin
5360
956525|Ngape
61+
9567439|Naypyidaw
5462
9567550|Naypyidaw
5563
9569200|Aunglan
5664
956940|Sinpaungwae

‎resources/phonemetadata.proto‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,6 @@ message PhoneNumberDesc {
101101
// total length and leading digits.
102102
optional string national_number_pattern = 2;
103103

104-
// The possible_number_pattern represents what a potentially valid phone
105-
// number for this region may be written as. This is a superset of the
106-
// national_number_pattern above and includes numbers that have the area code
107-
// omitted. Typically the only restrictions here are in the number of digits.
108-
// This could be used to highlight tokens in a text that may be a phone
109-
// number, or to quickly prune numbers that could not possibly be a phone
110-
// number for this locale.
111-
optional string possible_number_pattern = 3;
112-
113104
// These represent the lengths a phone number from this region can be. They
114105
// will be sorted from smallest to biggest. Note that these lengths are for
115106
// the full number, without country calling code or national prefix. For
@@ -291,13 +282,8 @@ message PhoneMetadata {
291282
// should not overlap.
292283
optional string leading_digits = 23;
293284

294-
// The leading zero in a phone number is meaningful in some countries (e.g.
295-
// Italy). This means they cannot be dropped from the national number when
296-
// converting into international format. If leading zeros are possible for
297-
// valid international numbers for this region/country then set this to true.
298-
// This only needs to be set for the region that is the main_country_for_code
299-
// and all regions associated with that calling code will use the same
300-
// setting.
285+
// Deprecated: do not use. Will be deletd when there are no references to this
286+
// later.
301287
optional bool leading_zero_possible = 26 [default=false];
302288

303289
// This field is set when this country has implemented mobile number

‎resources/phonenumber.proto‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ message PhoneNumber {
6868
// dialling internationally, set this flag to true, and also set the number of
6969
// leading zeros.
7070
//
71-
// Clients who use the parsing or conversion functionality of the i18n phone
71+
// Clients who use the parsing functionality of the i18n phone
7272
// number libraries will have these fields set if necessary automatically.
7373
optional bool italian_leading_zero = 4;
7474
optional int32 number_of_leading_zeros = 8 [ default = 1 ];
@@ -87,6 +87,11 @@ message PhoneNumber {
8787
// general parsing method, but in the method that parses and keeps raw_input.
8888
// New fields could be added upon request.
8989
enum CountryCodeSource {
90+
// Default value returned if this is not set, because the phone number was
91+
// created using parse, not parseAndKeepRawInput. hasCountryCodeSource will
92+
// return false if this is the case.
93+
UNSPECIFIED = 0;
94+
9095
// The country_code is derived based on a phone number with a leading "+",
9196
// e.g. the French number "+33 1 42 68 53 00".
9297
FROM_NUMBER_WITH_PLUS_SIGN = 1;

0 commit comments

Comments
 (0)