ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2025-02-05 07:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use i18n_country_select instead of country_code_select

Browse source
This commit is contained in:
Luke Barratt 2015-08-15 20:34:50 +01:00
parent 320fc67e4c
commit ed95f1b3c7
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -19,7 +19,7 @@ gem 'bluecloth', '~> 2.2.0'
gem 'newrelic_rpm', '~> 3.7.2.195' gem 'newrelic_rpm', '~> 3.7.2.195'
gem 'will_paginate', '~> 3.0.5' gem 'will_paginate', '~> 3.0.5'
gem 'dynamic_form', '~> 1.1.4' gem 'dynamic_form', '~> 1.1.4'
gem 'country_code_select', '~> 1.0.1' gem 'i18n_country_select', '~> 1.1.5'
gem 'active_link_to', '~> 1.0.2' gem 'active_link_to', '~> 1.0.2'
gem 'rmagick', '~> 2.13.4', require: false gem 'rmagick', '~> 2.13.4', require: false
gem 'steam-condenser', github: 'koraktor/steam-condenser-ruby' gem 'steam-condenser', github: 'koraktor/steam-condenser-ruby'

12
Gemfile.lock
View file

@ -91,8 +91,6 @@ GEM
execjs execjs
coffee-script-source (1.9.1.1) coffee-script-source (1.9.1.1)
columnize (0.8.9) columnize (0.8.9)
country_code_select (1.0.1)
activesupport (>= 3.0)
dalli (2.7.1) dalli (2.7.1)
database_cleaner (1.2.0) database_cleaner (1.2.0)
debug_inspector (0.0.2) debug_inspector (0.0.2)
@ -119,6 +117,13 @@ GEM
haml (4.0.5) haml (4.0.5)
tilt tilt
i18n (0.7.0) i18n (0.7.0)
i18n-country-translations (1.2.2)
i18n (~> 0.5)
railties (>= 3.0)
i18n_country_select (1.1.5)
i18n (~> 0.5)
i18n-country-translations (~> 1.0, >= 1.0.3)
unicode_utils (~> 1.0, >= 1.0.0)
jquery-rails (2.0.3) jquery-rails (2.0.3)
railties (>= 3.1.0, < 5.0) railties (>= 3.1.0, < 5.0)
thor (~> 0.14) thor (~> 0.14)
@ -244,6 +249,7 @@ GEM
uglifier (2.5.0) uglifier (2.5.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)
unicode_utils (1.4.0)
websocket (1.0.7) websocket (1.0.7)
websocket-driver (0.5.4) websocket-driver (0.5.4)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
@ -271,7 +277,6 @@ DEPENDENCIES
carrierwave (~> 0.10.0) carrierwave (~> 0.10.0)
codeclimate-test-reporter (~> 0.3.0) codeclimate-test-reporter (~> 0.3.0)
coffee-rails (~> 4.0.0) coffee-rails (~> 4.0.0)
country_code_select (~> 1.0.1)
dalli (~> 2.7.0) dalli (~> 2.7.0)
database_cleaner (~> 1.2.0) database_cleaner (~> 1.2.0)
dotenv-rails (~> 0.10.0) dotenv-rails (~> 0.10.0)
@ -281,6 +286,7 @@ DEPENDENCIES
faraday (~> 0.9.0) faraday (~> 0.9.0)
font-awesome-sass (~> 4.1.0.0) font-awesome-sass (~> 4.1.0.0)
haml (~> 4.0.5) haml (~> 4.0.5)
i18n_country_select (~> 1.1.5)
jquery-rails (~> 2.0.2) jquery-rails (~> 2.0.2)
mysql2 (~> 0.3.15) mysql2 (~> 0.3.15)
neat (~> 1.6.0) neat (~> 1.6.0)

1
app/models/user.rb
View file

@ -21,7 +21,6 @@
# public_email :boolean default(FALSE), not null # public_email :boolean default(FALSE), not null
# #
require 'country_code_select/countries'
require 'digest/md5' require 'digest/md5'
class User < ActiveRecord::Base class User < ActiveRecord::Base