Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cpp/src/phonenumbers/asyoutypeformatter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -712,9 +712,9 @@ char AsYouTypeFormatter::NormalizeAndAccrueDigitsAndPlusSign(
string number;
UnicodeString(next_char).toUTF8String(number);
phone_util_.NormalizeDigitsOnly(&number);
accrued_input_without_formatting_.append(next_char);
national_number_.append(number);
normalized_char = number[0];
accrued_input_without_formatting_.append(normalized_char);
}
if (remember_position) {
position_to_remember_ = accrued_input_without_formatting_.length();
Expand Down
16 changes: 16 additions & 0 deletions cpp/test/phonenumbers/asyoutypeformatter_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,22 @@ TEST_F(AsYouTypeFormatterTest, AYTF_LongIDD_AU) {
EXPECT_EQ("0011 244 250 253 222", formatter_->InputDigit('2', &result_));
}

TEST_F(AsYouTypeFormatterTest, AYTF_With_Special_Characters) {
formatter_.reset(phone_util_.GetAsYouTypeFormatter(RegionCode::JP()));
// +81००23456
formatter_->Clear();
EXPECT_EQ("+", formatter_->InputDigit('+', &result_));
EXPECT_EQ("+8", formatter_->InputDigit('8', &result_));
EXPECT_EQ("+81 ", formatter_->InputDigit('1', &result_));
EXPECT_EQ("+81 0", formatter_->InputDigit(UnicodeString("\u0966")[0], &result_));
EXPECT_EQ("+81 00", formatter_->InputDigit(UnicodeString("\u0966")[0], &result_));
EXPECT_EQ("+81००2", formatter_->InputDigit('2', &result_));
EXPECT_EQ("+81००23", formatter_->InputDigit('3', &result_));
EXPECT_EQ("+81००234", formatter_->InputDigit('4', &result_));
EXPECT_EQ("+81००2345", formatter_->InputDigit('5', &result_));
EXPECT_EQ("+81००23456", formatter_->InputDigit('6', &result_));
}

TEST_F(AsYouTypeFormatterTest, AYTF_LongIDD_KR) {
formatter_.reset(phone_util_.GetAsYouTypeFormatter(RegionCode::KR()));
// 00300 1 650 253 2250
Expand Down
Loading