Remove redundant routes and add default format specifiers

[rails.git] / config / initializers / i18n.rb

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 6601fb15a142580151025deb825a9a74198548e5..22704901fd88a700a2c8e4f80022353a7993243f 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,5 +1,17 @@
 module I18n
   module Backend
 module I18n
   module Backend

+    class Simple
+      def init_translations_with_mn_cleanup
+        init_translations_without_mn_cleanup
+
+        translations[:mn][:errors][:template].delete(:body)
+        translations[:mn][:activemodel][:errors][:template].delete(:body)
+        translations[:mn][:activerecord][:errors][:template].delete(:body)
+      end
+
+      alias_method_chain :init_translations, :mn_cleanup
+    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) }
     module Fallbacks
       def find_first_string_or_lambda_default(defaults)
         defaults.each_with_index { |default, ix| return ix if default && !default.is_a?(Symbol) }


@@ -16,31 +28,9 @@ module I18n
       end
     end
   end
       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
 
 end
 

-I18n::Backend::Simple.include(I18n::Backend::Pluralization)

 I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
 I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)

-I18n.load_path << "#{Rails.root}/config/pluralizers.rb"
-

 I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
 
 I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
 

-I18n.fallbacks.map("nb" => "no")

 I18n.fallbacks.map("no" => "nb")
 I18n.fallbacks.map("no" => "nb")

-
-Rails.configuration.after_initialize do
-  I18n.reload!
-end