Remove fallback from nb to no
authorTom Hughes <tom@compton.nu>
Thu, 29 Dec 2011 15:06:14 +0000 (15:06 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 29 Dec 2011 15:11:45 +0000 (15:11 +0000)
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
config/locales/no.yml [deleted file]

index 6601fb15a142580151025deb825a9a74198548e5..3c3ba872c2c33e851e5bc3a7f1ddaa0d49d0764b 100644 (file)
@@ -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 (file)
index cc64ac1..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-no:
-  dummy: dummy