@@ -1,5 +1,7 @@ module ISO module Countries + include GetText + COUNTRIES = { :af => N_("Afghanistan"), :ax => N_("Åland islands"), lib/country_list.rb @@ -14,7 +14,7 @@ module ActionView #:nodoc: # def iso_options_for_select(selected = nil, priority_countries = nil) countries_for_select = {} - ISO::Countries::COUNTRIES.each_pair {|code,name| countries_for_select[_(name)] = code.to_s } + ISO::Countries::COUNTRIES.each_pair {|code,name| countries_for_select[ISO::Countries.get_country(code)] = code.to_s } country_options = "" lib/iso/countries/form_helpers.rb @@ -2,7 +2,6 @@ require "rubygems" require "gettext" -include GetText stubs = %w(activesupport activerecord actionpack actionmailer activeresource) stubs.each do |stub| require stub @@ -15,12 +14,14 @@ ActiveRecord::Base.send :include, ISO::Countries::CountryField module ISO module Countries - module ClassMethods - bindtextdomain "iso_countries", :path => "#{File.dirname(__FILE__)}/../locale" + module ClassMethods + GetText.bindtextdomain "iso_countries", :path => "#{File.dirname(__FILE__)}/../locale" + GetText.locale = 'en' # Sets the language for country translation def set_language(lang) @@language = lang + GetText.bindtextdomain "iso_countries", :path => "#{File.dirname(__FILE__)}/../locale" GetText.locale = lang end @@ -44,7 +45,7 @@ module ISO end end end - + # Returns an array with all the available country codes def country_codes COUNTRIES.keys.map { |key| key.to_s } lib/iso_countries.rb @@ -2,10 +2,9 @@ require 'test/unit' require "iso_countries" class IsoCountriesTest < Test::Unit::TestCase - # Replace this with your real tests. def test_this_plugin assert_equal("Spain", ISO::Countries.get_country("es")) - assert(ISO::Countries.set_language("es"), "Should set language.") + assert_equal("es", ISO::Countries.set_language("es")) assert_equal("España", ISO::Countries.get_country("es")) end end test/iso_countries_test.rb 501ce78d0d786d3291dbfc1b53552cbef783d52d Jorge Bernal jbernal@warp.es http://github.com/koke/iso_countries/commit/69650079eae54731ff2588631a712f6baecca7ac 69650079eae54731ff2588631a712f6baecca7ac 2008-08-19T09:03:53-07:00 2008-08-19T09:03:53-07:00 Don't include GetText so we don't broke rcov 1e64a82282ca591bfe4a5afb88d3d81ac1b7169c Jorge Bernal jbernal@warp.es