diff options
| author | Zog | 2018-03-12 09:21:35 +0100 |
|---|---|---|
| committer | Luc Donnet | 2018-03-23 17:21:56 +0100 |
| commit | 6dd1ce50ff869b4d13ba9d30e4eed7e8d1881ddb (patch) | |
| tree | 1b2e2e9e772decaf4a6df4d7c9e95a7f47c71b37 | |
| parent | c3c01f592a33010013c0a1112e58453f5e936b5e (diff) | |
| download | chouette-core-6dd1ce50ff869b4d13ba9d30e4eed7e8d1881ddb.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 |