X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/11cc7ebaa76c0bcdc0164526430888a50ca04550..945ff7911ca51dc250ffaba71f62821b5c0c0a95:/config/initializers/i18n.rb

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 87bfe611f..a94618c7e 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,46 +1,45 @@
 module I18n
   module Backend
-    class Simple
-      module Implementation
-        protected
-        alias_method :old_init_translations, :init_translations
-      
-        def init_translations
-          old_init_translations
+    module PluralizationFallback
+      def pluralize(locale, entry, count)
+        super
+      rescue InvalidPluralizationData => ex
+        raise ex unless ex.entry.key?(:other)
+        ex.entry[:other]
+      end
+    end
 
-          store_translations(:nb, translations[:no])
-          translations[:no] = translations[:nb]
+    class Simple
+      def store_translations_with_normalisation(locale, data, options = {})
+        locale = I18n::Locale::Tag::Rfc4646.tag(locale).to_s
 
-          friendly = translate('en', 'time.formats.friendly')
+        store_translations_without_normalisation(locale, data, options)
+      end
 
-          available_locales.each do |locale|
-            unless lookup(locale, 'time.formats.friendly')
-              store_translations(locale, :time => { :formats => { :friendly => friendly } })
-            end
-          end
+      alias_method_chain :store_translations, :normalisation
+    end
+  end
 
-          @skip_syntax_deprecation = true
+  module JS
+    class FallbackLocales
+      def default_fallbacks_with_validation
+        default_fallbacks_without_validation.select do |locale|
+          ::I18n.available_locales.include?(locale)
         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
+      alias_method_chain :default_fallbacks, :validation
     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.include(I18n::Backend::Fallbacks)
 
+I18n.fallbacks.map("no" => "nb")
+
+I18n.enforce_available_locales = false
+
 Rails.configuration.after_initialize do
-  I18n.reload!
+  I18n.available_locales
 end