Merge remote-tracking branch 'upstream/pull/2075'

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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 37d3cdebfe48f7333aaea389fb68cc46c4633fb9..b4399a9f868348640deece25f915345fda95fe5a 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,47 +1,47 @@
 module I18n
 module I18n

-  original_verbosity = $VERBOSE
-  $VERBOSE = nil
-  INTERPOLATION_PATTERN = /\{\{(\w+)\}\}/
-  $VERBOSE = original_verbosity
-

   module Backend
   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]
-
-          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
-
-          @skip_syntax_deprecation = true
-        end
-      end
-    end
-

     module PluralizationFallback
       def pluralize(locale, entry, count)
         super
       rescue InvalidPluralizationData => ex
     module PluralizationFallback
       def pluralize(locale, entry, count)
         super
       rescue InvalidPluralizationData => ex

-        raise ex unless ex.entry.has_key?(:other)
+        raise ex unless ex.entry.key?(:other)
+

         ex.entry[:other]
       end
     end
   end
 end
 
         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"
+module OpenStreetMap
+  module I18n
+    module NormaliseLocales
+      def store_translations(locale, data, options = {})
+        locale = ::I18n::Locale::Tag::Rfc4646.tag(locale).to_s
+
+        super(locale, data, options)
+      end
+    end
+
+    module ValidateLocales
+      def default_fallbacks
+        super.select do |locale|
+          ::I18n.available_locales.include?(locale)
+        end
+      end
+    end
+  end
+end
+
+I18n::Backend::Simple.prepend(OpenStreetMap::I18n::NormaliseLocales)
+I18n::JS::FallbackLocales.prepend(OpenStreetMap::I18n::ValidateLocales)
+
+I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
+I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
+
+I18n.fallbacks.map("no" => "nb")

 
 

-I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
+I18n.enforce_available_locales = false
+
+Rails.configuration.after_initialize do
+  I18n.available_locales
+end