Skip to content
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

Handle trunkcode case in format method #3

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

Handle trunkcode case in format method #3

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
22 changes: 18 additions & 4 deletions RMPhoneFormat/RMPhoneFormat.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,10 +752,24 @@ - (NSString *)format:(NSString *)orig {
return [NSString stringWithFormat:@"%@ %@", accessCode, phone];
}
} else {
// No access code so we handle cases 3 and 4 and format the number using the user's region format.
NSString *phone = [info format:str];

return phone;
NSString *trunkCode = [info matchingTrunkCode:str];
if (trunkCode) {
NSString *phone = [str substringFromIndex:[trunkCode length]];

if ([phone length] == 0) {
// There is just an access code so far.
return trunkCode;
} else {
// We have an access code and a possibly formatted number. Combine with a space between.
return [NSString stringWithFormat:@"%@ %@", trunkCode, [info format:phone]];
}
}
else {
// No access code so we handle cases 3 and 4 and format the number using the user's region format.
NSString *phone = [info format:str];

return phone;
}
}
}

Expand Down