mirror of
https://github.com/codeninjasllc/discourse.git
synced 2025-03-01 09:54:52 -05:00
BUGFIX: fallback to en translation when interpolation is missing
This commit is contained in:
parent
8167cefe36
commit
17f75bbe92
1 changed files with 12 additions and 4 deletions
|
@ -16,9 +16,17 @@ module I18n
|
||||||
k = [args, config.locale, config.backend.object_id]
|
k = [args, config.locale, config.backend.object_id]
|
||||||
t = @cache.fetch(k) { found = false }
|
t = @cache.fetch(k) { found = false }
|
||||||
unless found
|
unless found
|
||||||
t = @cache[k] = translate_no_cache(*args).freeze
|
begin
|
||||||
|
t = translate_no_cache(*args)
|
||||||
|
rescue MissingInterpolationArgument
|
||||||
|
options = args.last.is_a?(Hash) ? args.pop.dup : {}
|
||||||
|
options.merge!(locale: config.default_locale)
|
||||||
|
key = args.shift
|
||||||
|
t = translate_no_cache(key, options)
|
||||||
|
ensure
|
||||||
|
t = @cache[k] = t.freeze
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
t
|
t
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue