diff options
| author | Zog | 2018-03-12 09:21:35 +0100 | 
|---|---|---|
| committer | Zog | 2018-03-16 16:34:09 +0100 | 
| commit | fbc2ed836e93e40ed340f57aa4276d53400ddb45 (patch) | |
| tree | aaf3da3defdd7d7a272ccd53c7a0fd6b265c7edb | |
| parent | 8417d632ff88fbd6cd0e0bddd1e9d75fb920e768 (diff) | |
| download | chouette-core-fbc2ed836e93e40ed340f57aa4276d53400ddb45.tar.bz2 | |
Use I18n.locale ads default locale (refs #6035)
| -rw-r--r-- | config/initializers/i18n.rb | 1 | 
1 files changed, 1 insertions, 0 deletions
| diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb index ae43f2ca5..21fff6ff2 100644 --- a/config/initializers/i18n.rb +++ b/config/initializers/i18n.rb @@ -1,6 +1,7 @@  module I18n    class << self      def translate_with_fallback key, options={}, original=nil +      options[:locale] ||= I18n.locale        begin          self.translate_without_fallback(key, {raise: true}.update(options))        rescue => e | 
