Merge branch 'master' into openid

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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 52a02313a42f867fa50aa0400d55c058c84fc9f6..8aadeaacf8edcba856e819b196777b6bfa927522 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,31 +1,42 @@
-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
-I18n.load_path += Dir[ File.join(RAILS_ROOT, 'config', 'legales', '*.yml') ]
-
 module I18n
   module Backend
     class Simple
-      protected
-      alias_method :old_init_translations, :init_translations
+      module Implementation
+        protected
+        alias_method :old_init_translations, :init_translations
       
-      def init_translations
-        old_init_translations
-
-        merge_translations(:nb, translations[:no])
-        translations[:no] = translations[:nb]
+        def init_translations
+          old_init_translations
 
-        friendly = translate('en', 'time.formats.friendly')
+          store_translations(:nb, translations[:no])
+          translations[:no] = translations[:nb]
 
-        available_locales.each do |locale|
-          time_formats = I18n.t('time.formats', :locale => locale)
+          friendly = translate('en', 'time.formats.friendly')
 
-          unless time_formats.has_key?(:friendly)
-            store_translations(locale, :time => { :formats => { :friendly => friendly } })
+          available_locales.each do |locale|
+            unless lookup(locale, 'time.formats.friendly')
+              store_translations(locale, :time => { :formats => { :friendly => friendly } })
+            end
           end
+
+          @skip_syntax_deprecation = true
         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)