@@ -14,7 +14,7 @@ class ApplicationController < ActionController::Base end def available_locales - I18n.available_locales + I18n.available_locales.map(&:to_s).sort end def current_locale?(l) @@ -29,8 +29,7 @@ class ApplicationController < ActionController::Base # Get locale from request parameters def extract_locale_from_params - return nil unless params[:locale] - (available_locales.include? params[:locale].to_sym) ? params[:locale] : nil + (available_locales.include? params[:locale].to_s) ? params[:locale] : nil end # Get locale code from request top-level domain (like http://application.it:3000) @@ -41,8 +40,7 @@ class ApplicationController < ActionController::Base # in your /etc/hosts file to try this out locally def extract_locale_from_tld parsed_locale = request.host.split('.').last - return nil unless parsed_locale - (available_locales.include? parsed_locale.to_sym) ? parsed_locale : nil + (available_locales.include? parsed_locale.to_s) ? parsed_locale : nil end # Get locale code from request subdomain (like http://it.application.local:3000) @@ -51,8 +49,7 @@ class ApplicationController < ActionController::Base # in your /etc/hosts file to try this out locally def extract_locale_from_subdomain parsed_locale = request.subdomains.first - return nil unless parsed_locale - (available_locales.include? parsed_locale.to_sym) ? parsed_locale : nil + (available_locales.include? parsed_locale.to_s) ? parsed_locale : nil end end app/controllers/application_controller.rb @@ -6,9 +6,7 @@ class HomeControllerTest < ActionController::TestCase def test_should_return_available_locales assert_nothing_raised { @controller.available_locales } assert @controller.available_locales.is_a? Array - assert @controller.available_locales.include?(:cz) - assert @controller.available_locales.include?(:de) - assert @controller.available_locales.include?(:en) + assert_equal ["cz", "de", "en"], @controller.available_locales end def test_should_render_proper_en_us_locale_by_default test/functional/home_controller_test.rb eff9988506e2b685882b4d7f68b8bea9629fb50b Karel Minarik karmi@karmi.cz http://github.com/karmi/rails_i18n_demo_app/commit/67d9966a26057b7d61a5e357e7c38462a4ab44e7 67d9966a26057b7d61a5e357e7c38462a4ab44e7 2009-05-01T09:44:42-07:00 2009-05-01T09:44:42-07:00 Err, fixing stupid code written in haste 40198a41f1b544eeae4027dc48009869dd2e82c3 Karel Minarik karmi@karmi.cz