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 b2af5004e463abee8834b404a7864396651de934..22704901fd88a700a2c8e4f80022353a7993243f 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,30 +1,36 @@
-require 'globalize/i18n/missing_translations_log_handler'
-
-I18n.missing_translations_logger = Logger.new("#{RAILS_ROOT}/log/missing_translations.log")
-I18n.exception_handler = :missing_translations_log_handler
-
 module I18n
   module Backend
     class Simple
-      protected
-      alias_method :old_init_translations, :init_translations
-      
-      def init_translations
-        old_init_translations
+      def init_translations_with_mn_cleanup
+        init_translations_without_mn_cleanup
 
-        merge_translations(:nb, translations[:no])
-        translations[:no] = translations[:nb]
+        translations[:mn][:errors][:template].delete(:body)
+        translations[:mn][:activemodel][:errors][:template].delete(:body)
+        translations[:mn][:activerecord][:errors][:template].delete(:body)
+      end
 
-        friendly = translate('en', 'time.formats.friendly')
+      alias_method_chain :init_translations, :mn_cleanup
+    end
 
-        available_locales.each do |locale|
-          time_formats = I18n.t('time.formats', :locale => locale)
+    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
 
-          unless time_formats.has_key?(:friendly)
-            store_translations(locale, :time => { :formats => { :friendly => friendly } })
-          end
-        end
+    module PluralizationFallback
+      def pluralize(locale, entry, count)
+        super
+      rescue InvalidPluralizationData => ex
+        raise ex unless ex.entry.has_key?(:other)
+        ex.entry[:other]
       end
     end
   end
 end
+
+I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
+I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
+
+I18n.fallbacks.map("no" => "nb")