Don't put MemoryLimit class in the OSM module as it breaks autoloading

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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 54a925e3cd6ee85deab7f85cba7968be03168ce4..aae87bef9be18f8539a3946743d5babc2d72bb87 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,4 +1,38 @@
-require 'globalize/i18n/missing_translations_log_handler'
+module I18n
+  module Backend
+    module Base
+      protected
+      alias_method :old_init_translations, :init_translations
+      
+      def init_translations
+        old_init_translations
 
-I18n.missing_translations_logger = Logger.new("#{RAILS_ROOT}/log/missing_translations.log")
-I18n.exception_handler = :missing_translations_log_handler
+        merge_translations(:nb, translations[:no])
+        translations[:no] = translations[:nb]
+
+        friendly = translate('en', 'time.formats.friendly')
+
+        available_locales.each do |locale|
+          unless lookup(locale, 'time.formats.friendly')
+            store_translations(locale, :time => { :formats => { :friendly => friendly } })
+          end
+        end
+      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.send(:include, I18n::Backend::Pluralization)
+I18n::Backend::Simple.send(:include, I18n::Backend::PluralizationFallback)
+I18n.load_path << RAILS_ROOT + "/config/pluralizers.rb"
+
+I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)