made country names translatable

chrkau · Jul 17, 2013 · c56d351 · c56d351 · dgilperez · Aug 2, 2013
1 parent be3618c
commit c56d351
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/country_select.rb b/lib/country_select.rb
@@ -5,6 +5,7 @@
 #
 require 'country_select/version'
 require 'country_select/countries'
+require 'i18n'
 
 module ActionView
   module Helpers
@@ -76,7 +77,15 @@ def country_options_for_select(selected = nil, priority_countries = nil, use_iso
                    ::CountrySelect::COUNTRIES_FOR_SELECT
                  end
 
-        return country_options + options_for_select(values, selected)
+        i18n_values = {}
+        if values.kind_of?(Hash)
+          values.each do |k, v|
+            i18n_values[I18n.t(k)] = v
+          end
+        else
+          i18n_values = values.map {|v| I18n.t(v)}.sort
+        end
+        return country_options + options_for_select(i18n_values, selected)
       end
 
       # All the countries included in the country_options output.

diff --git a/lib/country_select/countries.rb b/lib/country_select/countries.rb
@@ -244,7 +244,7 @@ module CountrySelect
     "ve" => "Venezuela, Bolivarian Republic of",
     "vn" => "Viet Nam",
     "vg" => "Virgin Islands, British",
-    "vi" => "Virgin Islands, U.S.",
+    "vi" => "Virgin Islands, US",
     "wf" => "Wallis and Futuna",
     "eh" => "Western Sahara",
     "ye" => "Yemen",