Drop the contents of <script> and <style> tags when we strip them

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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 37d3cdebfe48f7333aaea389fb68cc46c4633fb9..22704901fd88a700a2c8e4f80022353a7993243f 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,31 +1,21 @@
 module I18n
-  original_verbosity = $VERBOSE
-  $VERBOSE = nil
-  INTERPOLATION_PATTERN = /\{\{(\w+)\}\}/
-  $VERBOSE = original_verbosity
-
   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]
+      def init_translations_with_mn_cleanup
+        init_translations_without_mn_cleanup
 
-          friendly = translate('en', 'time.formats.friendly')
+        translations[:mn][:errors][:template].delete(:body)
+        translations[:mn][:activemodel][:errors][:template].delete(:body)
+        translations[:mn][:activerecord][:errors][:template].delete(:body)
+      end
 
-          available_locales.each do |locale|
-            unless lookup(locale, 'time.formats.friendly')
-              store_translations(locale, :time => { :formats => { :friendly => friendly } })
-            end
-          end
+      alias_method_chain :init_translations, :mn_cleanup
+    end
 
-          @skip_syntax_deprecation = true
-        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) }
+        nil
       end
     end
 
@@ -40,8 +30,7 @@ module I18n
   end
 end
 
-I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization)
-I18n::Backend::Simple.send(:include, I18n::Backend::PluralizationFallback)
-I18n.load_path << RAILS_ROOT + "/config/pluralizers.rb"
+I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
+I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
 
-I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
+I18n.fallbacks.map("no" => "nb")