I18n fix 1

jamesperet 10 years ago
parent
commit
17e3e654d7
2 changed files with 1 additions and 2 deletions
  1. 1 1
      app/controllers/application_controller.rb
  2. 0 1
      config/application.rb

+ 1 - 1
app/controllers/application_controller.rb

@@ -21,7 +21,7 @@ class ApplicationController < ActionController::Base
21 21
   def config_site  
22 22
     @config = Info.first
23 23
     #I18n.config.enforce_available_locales = false
24
-    I18n.default_locale = @config.default_language
24
+    I18n.locale = @config.default_language
25 25
   end
26 26
   
27 27
   def analytics

+ 0 - 1
config/application.rb

@@ -20,6 +20,5 @@ module Avalanche2
20 20
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
21 21
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
22 22
     # config.i18n.default_locale = :de
23
-    config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
24 23
   end
25 24
 end