Use normal fallbacks to handle the no/nb confusion
This requires (for now) a monkey patch to the i18n fallback code, which has been offered upstream as https://github.com/svenfuchs/i18n/pull/130.
This commit is contained in:
parent
5f0868bd49
commit
d5561dd27a
1 changed files with 17 additions and 16 deletions
|
@ -1,21 +1,5 @@
|
|||
module I18n
|
||||
module Backend
|
||||
class Simple
|
||||
module Implementation
|
||||
protected
|
||||
alias_method :old_init_translations, :init_translations
|
||||
|
||||
def init_translations
|
||||
old_init_translations
|
||||
|
||||
store_translations(:nb, translations[:no])
|
||||
translations[:no] = translations[:nb]
|
||||
|
||||
@skip_syntax_deprecation = true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
module Fallbacks
|
||||
def find_first_string_or_lambda_default(defaults)
|
||||
defaults.each_with_index { |default, ix| return ix if default && !default.is_a?(Symbol) }
|
||||
|
@ -32,6 +16,20 @@ module I18n
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
module Locale
|
||||
class Fallbacks
|
||||
def compute(tags, include_defaults = true, exclude = [])
|
||||
result = Array(tags).collect do |tag|
|
||||
tags = I18n::Locale::Tag.tag(tag).self_and_parents.map! { |t| t.to_sym } - exclude
|
||||
tags.each { |_tag| tags += compute(@map[_tag], false, exclude + tags) if @map[_tag] }
|
||||
tags
|
||||
end.flatten
|
||||
result.push(*defaults) if include_defaults
|
||||
result.uniq.compact
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
I18n::Backend::Simple.include(I18n::Backend::Pluralization)
|
||||
|
@ -40,6 +38,9 @@ I18n.load_path << "#{Rails.root}/config/pluralizers.rb"
|
|||
|
||||
I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
|
||||
|
||||
I18n.fallbacks.map("nb" => "no")
|
||||
I18n.fallbacks.map("no" => "nb")
|
||||
|
||||
Rails.configuration.after_initialize do
|
||||
I18n.reload!
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue