Merge pull request #249 from openSUSE/handle_invalid_locale

Fall back to 'en' when locale is invalid
openSUSE · Apr 22, 2018 · 03f09ba · 03f09ba
2 parents 65d7f36 + 172d4a7
commit 03f09ba
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