diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3e32d4c27..2ab2838c2 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -35,7 +35,6 @@ class ApplicationController < ActionController::Base end def set_locale - I18n.default_locale = DEFAULT_LANGUAGE if current_user I18n.locale = current_user.language else diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb index 08d3923b0..395a55d68 100644 --- a/config/initializers/locale.rb +++ b/config/initializers/locale.rb @@ -4,4 +4,4 @@ # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. I18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')] -I18n.default_locale = :en +I18n.default_locale = DEFAULT_LANGUAGE