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

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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 6601fb15a142580151025deb825a9a74198548e5..6e09300170d239d2fbc9171d90ffca06cc2d265d 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,46 +1,47 @@
 module I18n
   module Backend
 module I18n
   module Backend

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

     module PluralizationFallback
       def pluralize(locale, entry, count)
         super
     module PluralizationFallback
       def pluralize(locale, entry, count)
         super

-      rescue InvalidPluralizationData => ex
-        raise ex unless ex.entry.has_key?(:other)
-        ex.entry[:other]
+      rescue InvalidPluralizationData => e
+        raise e unless e.entry.key?(:other)
+
+        e.entry[:other]

       end
     end
   end
       end
     end
   end

+end
+
+module OpenStreetMap
+  module I18n
+    module NormaliseLocales
+      def store_translations(locale, data, options = {})
+        locale = ::I18n::Locale::Tag::Rfc4646.tag(locale).to_s

 
 

-  module Locale
-    class Fallbacks
-      def compute(tags, include_defaults = true, exclude = [])
-        result = Array(tags).collect do |tag|
-          tags = I18n::Locale::Tag.tag(tag).self_and_parents.map! { |t| t.to_sym } - exclude
-          tags.each { |_tag| tags += compute(@map[_tag], false, exclude + tags) if @map[_tag] }
-          tags
-        end.flatten
-        result.push(*defaults) if include_defaults
-        result.uniq.compact
+        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
 
       end
     end
   end
 end
 

-I18n::Backend::Simple.include(I18n::Backend::Pluralization)
-I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
-I18n.load_path << "#{Rails.root}/config/pluralizers.rb"
+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::Backend::Simple.include(I18n::Backend::Fallbacks)
 

-I18n.fallbacks.map("nb" => "no")

 I18n.fallbacks.map("no" => "nb")
 
 I18n.fallbacks.map("no" => "nb")
 

+I18n.enforce_available_locales = false
+

 Rails.configuration.after_initialize do
 Rails.configuration.after_initialize do

-  I18n.reload!
+  I18n.available_locales

 end
 end