don't auto select as local language a disabled language (e.g DE)

biodivportal · Sep 5, 2024 · 138c268 · 138c268
1 parent bc06fff
commit 138c268
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -13,7 +13,7 @@
 # Likewise, all the methods added will be available for all controllers.
 
 class ApplicationController < ActionController::Base
-  include InternationalisationHelper
+  include InternationalisationHelper, MultiLanguagesHelper
 
   before_action :set_locale
 
@@ -26,6 +26,9 @@ def set_locale
     I18n.locale = cookies[:locale] || detect_locale
     cookies.permanent[:locale] = I18n.locale if cookies[:locale].nil?
     logger.debug "* Locale set to '#{I18n.locale}'"
+
+    I18n.locale = portal_lang if portal_language_enabled?(I18n.locale)
+
     session[:locale] = I18n.locale
   end
 

diff --git a/app/controllers/language_controller.rb b/app/controllers/language_controller.rb
@@ -1,11 +1,12 @@
 class LanguageController < ApplicationController
 
+    include MultiLanguagesHelper
     # set locale to the language selected by the user
     def set_locale_language
         language = params[:language].strip.downcase.to_sym
         supported_languages = I18n.available_locales
-
-        if language
+        
+        if language && portal_language_enabled?(language)
             if supported_languages.include?(language)
                  cookies.permanent[:locale] = language
             else

diff --git a/app/helpers/multi_languages_helper.rb b/app/helpers/multi_languages_helper.rb
@@ -22,6 +22,10 @@ def portal_languages
     }
   end
 
+  def portal_language_enabled?(lang)
+    portal_languages.reject { |_k, x| x[:disabled] }.keys.include?(lang)
+  end
+
   def portal_language_selector
     languages = portal_languages
     selected_language = portal_lang