Drop country_select
We are using i18n_data directly.
This commit is contained in:
parent
94ec47dcc5
commit
d9f86d0564
4 changed files with 5 additions and 16 deletions
2
Gemfile
2
Gemfile
|
|
@ -137,7 +137,7 @@ gem 'leaflet-rails'
|
||||||
gem 'gravtastic'
|
gem 'gravtastic'
|
||||||
|
|
||||||
# for country selects
|
# for country selects
|
||||||
gem 'country_select'
|
gem 'i18n_data'
|
||||||
|
|
||||||
# as PDF generator
|
# as PDF generator
|
||||||
gem 'prawn-qrcode'
|
gem 'prawn-qrcode'
|
||||||
|
|
|
||||||
14
Gemfile.lock
14
Gemfile.lock
|
|
@ -170,12 +170,6 @@ GEM
|
||||||
concurrent-ruby (1.2.2)
|
concurrent-ruby (1.2.2)
|
||||||
countable-rails (0.0.1)
|
countable-rails (0.0.1)
|
||||||
railties (>= 3.1)
|
railties (>= 3.1)
|
||||||
countries (5.0.2)
|
|
||||||
i18n_data (~> 0.16.0)
|
|
||||||
sixarm_ruby_unaccent (~> 1.1)
|
|
||||||
country_select (7.0.0)
|
|
||||||
countries (~> 5.0)
|
|
||||||
sort_alphabetical (~> 1.1)
|
|
||||||
crack (0.4.5)
|
crack (0.4.5)
|
||||||
rexml
|
rexml
|
||||||
crass (1.0.6)
|
crass (1.0.6)
|
||||||
|
|
@ -256,7 +250,7 @@ GEM
|
||||||
domain_name (~> 0.5)
|
domain_name (~> 0.5)
|
||||||
i18n (1.13.0)
|
i18n (1.13.0)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
i18n_data (0.16.0)
|
i18n_data (0.17.1)
|
||||||
simple_po_parser (~> 1.1)
|
simple_po_parser (~> 1.1)
|
||||||
icalendar (2.8.0)
|
icalendar (2.8.0)
|
||||||
ice_cube (~> 0.16)
|
ice_cube (~> 0.16)
|
||||||
|
|
@ -552,14 +546,11 @@ GEM
|
||||||
simplecov (~> 0.19)
|
simplecov (~> 0.19)
|
||||||
simplecov-html (0.12.3)
|
simplecov-html (0.12.3)
|
||||||
simplecov_json_formatter (0.1.4)
|
simplecov_json_formatter (0.1.4)
|
||||||
sixarm_ruby_unaccent (1.2.0)
|
|
||||||
skylight (5.3.4)
|
skylight (5.3.4)
|
||||||
activesupport (>= 5.2.0)
|
activesupport (>= 5.2.0)
|
||||||
snaky_hash (2.0.1)
|
snaky_hash (2.0.1)
|
||||||
hashie
|
hashie
|
||||||
version_gem (~> 1.1, >= 1.1.1)
|
version_gem (~> 1.1, >= 1.1.1)
|
||||||
sort_alphabetical (1.1.0)
|
|
||||||
unicode_utils (>= 1.2.2)
|
|
||||||
sprockets (4.2.0)
|
sprockets (4.2.0)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
rack (>= 2.2.4, < 4)
|
rack (>= 2.2.4, < 4)
|
||||||
|
|
@ -594,7 +585,6 @@ GEM
|
||||||
unf_ext
|
unf_ext
|
||||||
unf_ext (0.0.8.2)
|
unf_ext (0.0.8.2)
|
||||||
unicode-display_width (2.4.2)
|
unicode-display_width (2.4.2)
|
||||||
unicode_utils (1.4.0)
|
|
||||||
unobtrusive_flash (3.3.1)
|
unobtrusive_flash (3.3.1)
|
||||||
railties
|
railties
|
||||||
version_gem (1.1.2)
|
version_gem (1.1.2)
|
||||||
|
|
@ -647,7 +637,6 @@ DEPENDENCIES
|
||||||
cloudinary
|
cloudinary
|
||||||
cocoon
|
cocoon
|
||||||
countable-rails
|
countable-rails
|
||||||
country_select
|
|
||||||
daemons
|
daemons
|
||||||
dalli
|
dalli
|
||||||
database_cleaner
|
database_cleaner
|
||||||
|
|
@ -663,6 +652,7 @@ DEPENDENCIES
|
||||||
gravtastic
|
gravtastic
|
||||||
haml-rails
|
haml-rails
|
||||||
haml_lint
|
haml_lint
|
||||||
|
i18n_data
|
||||||
icalendar
|
icalendar
|
||||||
iso-639
|
iso-639
|
||||||
jquery-datatables-rails
|
jquery-datatables-rails
|
||||||
|
|
|
||||||
|
|
@ -20,8 +20,7 @@ class Venue < ApplicationRecord
|
||||||
end
|
end
|
||||||
|
|
||||||
def country_name
|
def country_name
|
||||||
name = ISO3166::Country[country]
|
I18nData.countries[country]
|
||||||
name&.iso_short_name
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def location?
|
def location?
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
= sanitize link_to(venue.name, venue.website)
|
= sanitize link_to(venue.name, venue.website)
|
||||||
- else
|
- else
|
||||||
= venue.city
|
= venue.city
|
||||||
- if venue.country_name != 'US'
|
- if venue.country_name
|
||||||
•
|
•
|
||||||
= venue.country_name
|
= venue.country_name
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue