From ece52c818feb85e0a28787f753b17bf95ff68526 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 29 Dec 2011 15:06:14 +0000 Subject: [PATCH] Remove fallback from nb to no Now that we are using nb for our translations we can drop the fallback from nb to no and just have one the other way. This also allows us to drop the monkey patch to support mutually recursive fallbacks. --- config/initializers/i18n.rb | 15 --------------- config/locales/no.yml | 2 -- 2 files changed, 17 deletions(-) delete mode 100644 config/locales/no.yml diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb index 6601fb15a..3c3ba872c 100644 --- a/config/initializers/i18n.rb +++ b/config/initializers/i18n.rb @@ -16,20 +16,6 @@ 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) @@ -38,7 +24,6 @@ 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 diff --git a/config/locales/no.yml b/config/locales/no.yml deleted file mode 100644 index cc64ac147..000000000 --- a/config/locales/no.yml +++ /dev/null @@ -1,2 +0,0 @@ -no: - dummy: dummy -- 2.39.5