Skip to content

Fix incorrect normalization for Singapore #556

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

Merged
floere merged 2 commits into from
Dec 13, 2025
Merged

Fix incorrect normalization for Singapore #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37aa67b
Fix Rubocop
weppos Nov 27, 2025
b935050
Singapore numbers have no trunk
weppos Nov 27, 2025
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
8 changes: 5 additions & 3 deletions lib/phony/countries.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
match(/^(800|90\d)\d+$/) >> split(2, 3) | # Toll free service and premium numbers
match(/^(46[056789])\d{6}$/) >> split(2, 2, 2) | # Mobile (Lycamobile, Telenet, Join Experience, Proximus 0460)
match(/^(4[789]\d)\d{6}$/) >> split(2, 2, 2) | # Mobile
match(/^(45[156])\d{6}$/) >> split(2, 2, 2) | # Mobile Vikings, Digi and Voo
match(/^(45[156])\d{6}$/) >> split(2, 2, 2) | # Mobile Vikings, Digi and Voo
one_of('2', '3', '4', '9') >> split(3, 2, 2) | # Short NDCs
fixed(2) >> split(2, 2, 2) # 2-digit NDCs

Expand Down Expand Up @@ -251,7 +251,7 @@
match(/^(13)\d+$/) >> split(2, 2) | # 13 local rate
fixed(1) >> split(4, 4) # Rest

# country '62' # Indonesia (Republic of), see special file
# country '62' # Indonesia (Republic of), see special file

# Philippines (Republic of the)
# https://www.numberingplans.com/?page=plans&sub=phonenr&alpha_2_input=PH
Expand Down Expand Up @@ -279,7 +279,9 @@

# Singapore (Republic of).
#
# There is no trunk code for this country and some numbers start with 0.
country '65',
trunk('', normalize: false) |
none >> matched_split(
/^(800)\d{7}$/ => [3, 3, 4], # International Toll Free Service (ITFS) and Home Country Direct Service (HCDS) Numbers
/^\d{8}$/ => [4, 4] # TODO: Short Codes
Expand Down Expand Up @@ -375,7 +377,7 @@

# Benin http://www.itu.int/oth/T0202000017/en
#
# There is no trunk code for this country and prefixes start with 0
# There is no trunk code for this country and prefixes start with 0.
country '229',
trunk('', normalize: false) |
none >> matched_split(
Expand Down
1 change: 1 addition & 0 deletions spec/lib/phony/countries_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,7 @@ def self.it_splits(number, expected)

describe 'Singapore' do
it_splits '6561231234', ['65', false, '6123', '1234'] # Fixed line
it_splits '6501234567', ['65', false, '0123', '4567'] # Fixed line starting with 0
it_splits '658008521234', ['65', false, '800', '852', '1234'] # International Toll Free Service (ITFS) and Home Country Direct Service (HCDS) Numbers
end

Expand Down
Loading