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
3 changes: 2 additions & 1 deletion app/components/phone_input_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ def translated_country_code_names
end

def international_phone_codes
translated_international_codes = PhoneNumberCapabilities.translated_international_codes
supported_country_codes.
map do |code_key|
code_data = PhoneNumberCapabilities.translated_international_codes[code_key]
code_data = translated_international_codes[code_key]

[
international_phone_code_label(code_data),
Expand Down
15 changes: 10 additions & 5 deletions app/services/phone_number_capabilities.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,17 @@ def self.load_config
attr_reader :phone, :phone_confirmed

def self.translated_international_codes
translated_international_codes_data = {}
INTERNATIONAL_CODES.each do |k, value|
translated_international_codes_data[k] =
value.merge('name' => I18n.t("countries.#{k.downcase}"))
@translated_intl_codes_data = nil if Rails.env.development?
return @translated_intl_codes_data[I18n.locale] if @translated_intl_codes_data

@translated_intl_codes_data = Hash.new { |h, k| h[k] = {} }
I18n.available_locales.each do |locale|
INTERNATIONAL_CODES.each do |k, value|
@translated_intl_codes_data[locale][k] =
value.merge('name' => I18n.t("countries.#{k.downcase}", locale: locale))
end
end
translated_international_codes_data
@translated_intl_codes_data[I18n.locale]
end

def initialize(phone, phone_confirmed:)
Expand Down
16 changes: 8 additions & 8 deletions spec/components/phone_input_component_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,11 @@

context 'with delivery unsupported country' do
before do
stub_const(
'PhoneNumberCapabilities::INTERNATIONAL_CODES',
PhoneNumberCapabilities::INTERNATIONAL_CODES.merge(
'US' => PhoneNumberCapabilities::INTERNATIONAL_CODES['US'].merge('supports_sms' => false),
allow(PhoneNumberCapabilities).to receive(:translated_international_codes).and_return(
PhoneNumberCapabilities.translated_international_codes.merge(
'US' => PhoneNumberCapabilities.translated_international_codes['US'].merge(
'supports_sms' => false,
),
),
)
end
Expand All @@ -159,10 +160,9 @@

context 'with delivery unsupported unconfirmed country' do
before do
stub_const(
'PhoneNumberCapabilities::INTERNATIONAL_CODES',
PhoneNumberCapabilities::INTERNATIONAL_CODES.merge(
'US' => PhoneNumberCapabilities::INTERNATIONAL_CODES['US'].merge(
allow(PhoneNumberCapabilities).to receive(:translated_international_codes).and_return(
PhoneNumberCapabilities.translated_international_codes.merge(
'US' => PhoneNumberCapabilities.translated_international_codes['US'].merge(
'supports_sms_unconfirmed' => false,
),
),
Expand Down