Skip to content

fix(cpp): use RFC3966 extension syntax in FormatByPattern #4087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thevilledev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(cpp): use RFC3966 extension syntax in FormatByPattern #4087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cpp/src/phonenumbers/phonenumberutil.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,8 @@ void PhoneNumberUtil::FormatByPattern(
FormatNsnUsingPattern(national_significant_number, num_format_copy,
number_format, formatted_number);
}
MaybeAppendFormattedExtension(number, *metadata, NATIONAL, formatted_number);
MaybeAppendFormattedExtension(number, *metadata, number_format,
formatted_number);
PrefixNumberWithCountryCallingCode(country_calling_code, number_format,
formatted_number);
}
Expand Down
6 changes: 6 additions & 0 deletions cpp/test/phonenumbers/phonenumberutil_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,6 +1333,12 @@ TEST_F(PhoneNumberUtilTest, FormatByPattern) {
number_formats,
&formatted_number);
EXPECT_EQ("tel:+1-650-253-0000", formatted_number);
PhoneNumber test_number_with_extension(test_number);
test_number_with_extension.set_extension("1234");
phone_util_.FormatByPattern(test_number_with_extension,
PhoneNumberUtil::RFC3966, number_formats,
&formatted_number);
EXPECT_EQ("tel:+1-650-253-0000;ext=1234", formatted_number);

// $NP is set to '1' for the US. Here we check that for other NANPA countries
// the US rules are followed.
Expand Down
3 changes: 2 additions & 1 deletion pending_code_changes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@

Code changes:
- Fixed FormatByPattern in the C++ version to format the extension for the requested number format, so RFC3966 output uses ";ext=" as in the Java version.
Loading