Update to rails 3.1.1

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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index ac4ad81d62bce072b94291c2beea0a786c951634..2561c07f21149ba5526e1db94c92e8194f9e0268 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,27 +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
-

 module I18n
   module Backend
     class Simple
 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
+        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
           end

+
+          @skip_syntax_deprecation = true

         end
       end
     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
   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)