Fall back to en when locale is invalid

openSUSE · Apr 19, 2018 · 172d4a7 · 172d4a7
1 parent ed62e46
commit 172d4a7
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -50,10 +50,8 @@ def set_language
     # the short form without underscore
     unless LANGUAGES.include? requested_locale
       requested_locale = requested_locale.split('_').first
-      if LANGUAGES.include? requested_locale
-        params[:locale] = requested_locale
-        set_gettext_locale
-      end
+      params[:locale] = LANGUAGES.include?(requested_locale) ? requested_locale : 'en'
+      set_gettext_locale
     end
     @lang = FastGettext.locale
   end