Better to set the default locale in an initializer than in a before_filter

2010-10-31 21:55:49 +01:00 · 2010-10-31 21:55:49 +01:00 · cf82a0a9c8
commit cf82a0a9c8
parent bfb132280a
2 changed files with 1 additions and 2 deletions
--- 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
--- 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