From ed95f1b3c78c90b008ff22647e35a41c1b1bcb82 Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Sat, 15 Aug 2015 20:34:50 +0100 Subject: [PATCH] Use i18n_country_select instead of country_code_select --- Gemfile | 2 +- Gemfile.lock | 12 +++++++++--- app/models/user.rb | 1 - 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 90228f6..5c15cb9 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ gem 'bluecloth', '~> 2.2.0' gem 'newrelic_rpm', '~> 3.7.2.195' gem 'will_paginate', '~> 3.0.5' 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 'rmagick', '~> 2.13.4', require: false gem 'steam-condenser', github: 'koraktor/steam-condenser-ruby' diff --git a/Gemfile.lock b/Gemfile.lock index e1143b0..60f692b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -91,8 +91,6 @@ GEM execjs coffee-script-source (1.9.1.1) columnize (0.8.9) - country_code_select (1.0.1) - activesupport (>= 3.0) dalli (2.7.1) database_cleaner (1.2.0) debug_inspector (0.0.2) @@ -119,6 +117,13 @@ GEM haml (4.0.5) tilt 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) railties (>= 3.1.0, < 5.0) thor (~> 0.14) @@ -244,6 +249,7 @@ GEM uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) + unicode_utils (1.4.0) websocket (1.0.7) websocket-driver (0.5.4) websocket-extensions (>= 0.1.0) @@ -271,7 +277,6 @@ DEPENDENCIES carrierwave (~> 0.10.0) codeclimate-test-reporter (~> 0.3.0) coffee-rails (~> 4.0.0) - country_code_select (~> 1.0.1) dalli (~> 2.7.0) database_cleaner (~> 1.2.0) dotenv-rails (~> 0.10.0) @@ -281,6 +286,7 @@ DEPENDENCIES faraday (~> 0.9.0) font-awesome-sass (~> 4.1.0.0) haml (~> 4.0.5) + i18n_country_select (~> 1.1.5) jquery-rails (~> 2.0.2) mysql2 (~> 0.3.15) neat (~> 1.6.0) diff --git a/app/models/user.rb b/app/models/user.rb index 36b9a4c..28fd617 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -21,7 +21,6 @@ # public_email :boolean default(FALSE), not null # -require 'country_code_select/countries' require 'digest/md5' class User < ActiveRecord::Base