diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-25 22:00:07 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-25 22:10:11 +0100 |
| commit | 1177a40e68b6661d6d2cb4aefdd9a805459cd936 (patch) | |
| tree | 642dfb90bd938a9bab69dcd5d730afa2f2631aad /activesupport | |
| parent | c6104e6514d7e0af8dca92fcb40a6adb72e16611 (diff) | |
| download | rails-1177a40e68b6661d6d2cb4aefdd9a805459cd936.tar.gz rails-1177a40e68b6661d6d2cb4aefdd9a805459cd936.tar.bz2 rails-1177a40e68b6661d6d2cb4aefdd9a805459cd936.zip | |
Fix i18n locales order test.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/railtie.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/railtie.rb b/activesupport/lib/active_support/railtie.rb index bc0f99869c..a80fa77e1e 100644 --- a/activesupport/lib/active_support/railtie.rb +++ b/activesupport/lib/active_support/railtie.rb @@ -33,6 +33,7 @@ module I18n railtie_name :i18n # Initialize I18n load paths to an array + config.i18n.engines_load_path = [] config.i18n.load_path = [] initializer :initialize_i18n do @@ -47,7 +48,10 @@ module I18n # the load_path which should be appended to what's already set instead of overwritten. config.after_initialize do |app| app.config.i18n.each do |setting, value| - if setting == :load_path + case setting + when :engines_load_path + app.config.i18n.load_path.unshift(*value) + when :load_path I18n.load_path += value else I18n.send("#{setting}=", value) |