Handle invalid locale

So it wont 500 when passing a not valid locale as ?locale=foo
rubygems · Jul 2, 2015 · 14bdd63 · 14bdd63
1 parent ae00cf5
commit 14bdd63
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -13,6 +13,8 @@ class ApplicationController < ActionController::Base
 
   def set_locale
     I18n.locale = params[:locale] || I18n.default_locale
+  rescue I18n::InvalidLocale
+    I18n.locale = I18n.default_locale
   end
 
   rescue_from(ActionController::ParameterMissing) do |e|

diff --git a/test/functional/home_controller_test.rb b/test/functional/home_controller_test.rb
@@ -35,4 +35,9 @@ class HomeControllerTest < ActionController::TestCase
       get :index
     end
   end
+
+  should "use default locale on GET using invalid one" do
+    get :index, locale: 'foobar'
+    assert_equal I18n.locale, I18n.default_locale
+  end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -12,8 +12,6 @@
 
 require 'helpers/gem_helpers'
 
-I18n.enforce_available_locales = false
-
 RubygemFs.mock!
 
 class MiniTest::Test