IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 09:26:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

BUGFIX: fallback to en translation when interpolation is missing

Browse Source
This commit is contained in:
Régis Hanol 2014-02-26 18:42:16 +01:00
parent 8167cefe36
commit 17f75bbe92
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/freedom_patches/translate_accelerator.rb
View File

@ -13,12 +13,20 @@ module I18n
def translate(*args) def translate(*args)
@cache ||= LruRedux::ThreadSafeCache.new(LRU_CACHE_SIZE) @cache ||= LruRedux::ThreadSafeCache.new(LRU_CACHE_SIZE)
found = true found = true
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