X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/50224b473bce736436d27c64bd46c1910e4d43ec..6b44a1976cf07ba50ba8aed8b34434e69a45e62d:/config/initializers/i18n.rb?ds=inline

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index aae87bef9..89ff677fb 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,38 +1,46 @@
 module I18n
   module Backend
-    module Base
-      protected
-      alias_method :old_init_translations, :init_translations
-      
-      def init_translations
-        old_init_translations
-
-        merge_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
-      end
-    end
-
     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
 
-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.send(:include, I18n::Backend::Fallbacks)
+I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
+I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
+
+I18n.fallbacks.map("no" => "nb")
+
+I18n.enforce_available_locales = false
+
+Rails.configuration.after_initialize do
+  I18n.available_locales
+end