Skip to content

Commit d9837d2

Browse files
javawizardjavawizard
committed
Embed (+1) in country name translations
Refs CNVS-29196 Test plan: - Make sure countries display exactly the same in the create communication channel dialog Change-Id: Ib46eccba9f65ea83dc3c48bfcb2822c90b743cf6 Reviewed-on: https://gerrit.instructure.com/82812 Reviewed-by: Jeremy Stanley <jeremy@instructure.com> Tested-by: Jenkins QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com> Product-Review: Alex Boyd <aboyd@instructure.com>
1 parent 930ea5b commit d9837d2

2 files changed

Lines changed: 45 additions & 45 deletions

File tree

‎app/models/communication_channel.rb‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -59,50 +59,50 @@ class CommunicationChannel < ActiveRecord::Base
5959
def self.country_codes
6060
# [country code, name, true if email should be used instead of Twilio]
6161
[
62-
['54', I18n.t('Argentina'), false],
63-
['61', I18n.t('Australia'), false],
64-
['43', I18n.t('Austria'), false],
65-
['32', I18n.t('Belgium'), false],
66-
['591', I18n.t('Bolivia'), false],
67-
['55', I18n.t('Brazil'), false],
68-
['1', I18n.t('Canada'), false],
69-
['56', I18n.t('Chile'), false],
70-
['57', I18n.t('Colombia'), false],
71-
['506', I18n.t('Costa Rica'), false],
72-
['45', I18n.t('Denmark'), false],
73-
['593', I18n.t('Ecuador'), false],
74-
['358', I18n.t('Finland'), false],
75-
['33', I18n.t('France'), false],
76-
['49', I18n.t('Germany'), false],
77-
['504', I18n.t('Honduras'), false],
78-
['852', I18n.t('Hong Kong'), false],
79-
['91', I18n.t('India'), false],
80-
['353', I18n.t('Ireland'), false],
81-
['972', I18n.t('Israel'), false],
82-
['39', I18n.t('Italy'), false],
83-
['81', I18n.t('Japan'), false],
84-
['352', I18n.t('Luxembourg'), false],
85-
['60', I18n.t('Malaysia'), false],
86-
['52', I18n.t('Mexico'), false],
87-
['31', I18n.t('Netherlands'), false],
88-
['64', I18n.t('New Zealand'), false],
89-
['47', I18n.t('Norway'), false],
90-
['507', I18n.t('Panama'), false],
91-
['595', I18n.t('Paraguay'), false],
92-
['51', I18n.t('Peru'), false],
93-
['63', I18n.t('Philippines'), false],
94-
['48', I18n.t('Poland'), false],
95-
['974', I18n.t('Qatar'), false],
96-
['966', I18n.t('Saudi Arabia'), false],
97-
['65', I18n.t('Singapore'), false],
98-
['82', I18n.t('South Korea'), false],
99-
['34', I18n.t('Spain'), false],
100-
['46', I18n.t('Sweden'), false],
101-
['41', I18n.t('Switzerland'), false],
102-
['971', I18n.t('United Arab Emirates'), false],
103-
['44', I18n.t('United Kingdom'), false],
104-
['1', I18n.t('United States'), true ],
105-
['598', I18n.t('Uruguay'), false]
62+
['54', I18n.t('Argentina (+54)'), false],
63+
['61', I18n.t('Australia (+61)'), false],
64+
['43', I18n.t('Austria (+43)'), false],
65+
['32', I18n.t('Belgium (+32)'), false],
66+
['591', I18n.t('Bolivia (+591)'), false],
67+
['55', I18n.t('Brazil (+55)'), false],
68+
['1', I18n.t('Canada (+1)'), false],
69+
['56', I18n.t('Chile (+56)'), false],
70+
['57', I18n.t('Colombia (+57)'), false],
71+
['506', I18n.t('Costa Rica (+506)'), false],
72+
['45', I18n.t('Denmark (+45)'), false],
73+
['593', I18n.t('Ecuador (+593)'), false],
74+
['358', I18n.t('Finland (+358)'), false],
75+
['33', I18n.t('France (+33)'), false],
76+
['49', I18n.t('Germany (+49)'), false],
77+
['504', I18n.t('Honduras (+504)'), false],
78+
['852', I18n.t('Hong Kong (+852)'), false],
79+
['91', I18n.t('India (+91)'), false],
80+
['353', I18n.t('Ireland (+353)'), false],
81+
['972', I18n.t('Israel (+972)'), false],
82+
['39', I18n.t('Italy (+39)'), false],
83+
['81', I18n.t('Japan (+81)'), false],
84+
['352', I18n.t('Luxembourg (+352)'), false],
85+
['60', I18n.t('Malaysia (+60)'), false],
86+
['52', I18n.t('Mexico (+52)'), false],
87+
['31', I18n.t('Netherlands (+31)'), false],
88+
['64', I18n.t('New Zealand (+64)'), false],
89+
['47', I18n.t('Norway (+47)'), false],
90+
['507', I18n.t('Panama (+507)'), false],
91+
['595', I18n.t('Paraguay (+595)'), false],
92+
['51', I18n.t('Peru (+51)'), false],
93+
['63', I18n.t('Philippines (+63)'), false],
94+
['48', I18n.t('Poland (+48)'), false],
95+
['974', I18n.t('Qatar (+974)'), false],
96+
['966', I18n.t('Saudi Arabia (+966)'), false],
97+
['65', I18n.t('Singapore (+65)'), false],
98+
['82', I18n.t('South Korea (+82)'), false],
99+
['34', I18n.t('Spain (+34)'), false],
100+
['46', I18n.t('Sweden (+46)'), false],
101+
['41', I18n.t('Switzerland (+41)'), false],
102+
['971', I18n.t('United Arab Emirates (+971)'), false],
103+
['44', I18n.t('United Kingdom (+44)'), false],
104+
['1', I18n.t('United States (+1)'), true ],
105+
['598', I18n.t('Uruguay (+598)'), false]
106106
].sort_by{ |a| Canvas::ICU.collation_key(a[1]) }
107107
end
108108

‎app/views/profile/_ways_to_contact.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
<select class="user_selected country" id="communication_channel_sms_country" name="communication_channel_sms_country">
178178
<option value="undecided">[<%= t('Select Country') %>]</option>
179179
<% CommunicationChannel.country_codes.each do |(numeric_code, name, use_email)| %>
180-
<option value="<%= numeric_code %>" data-use-email="<%= use_email %>"><%= name %> (+<%= numeric_code %>)</option>
180+
<option value="<%= numeric_code %>" data-use-email="<%= use_email %>"><%= name %></option>
181181
<% end %>
182182
</select>
183183
</div>

0 commit comments

Comments
 (0)