Merge pull request #48 from lomography/master

Use namespaced countries gem in order to not pollute namespace.
gcorreaq · Feb 14, 2014 · a67ae46 · a67ae46
2 parents 4f31104 + 51ac2df
commit a67ae46
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/country_select/countries.rb b/lib/country_select/countries.rb
@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'countries'
+require 'iso3166'
 
 module CountrySelect
   def self.use_iso_codes
@@ -21,7 +21,7 @@ def self.countries(with_locale=nil)
     ISO3166::Country.all.inject({}) do |hash,country_pair|
       default_name = country_pair.first
       code = country_pair.last
-      country = Country.new(code)
+      country = ISO3166::Country.new(code)
       localized_name = country.translations[with_locale.to_s]
 
       # Codes should not be downcased, but they were previous to 1.3