X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/acbc99ac16103e1be5c1ef1841794f259e3b6a03..52f0ba78ea149e7028e68ad793b05369fa61ff2e:/config/initializers/i18n.rb?ds=inline

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index b2af5004e..89ff677fb 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,30 +1,46 @@
-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
-      protected
-      alias_method :old_init_translations, :init_translations
-      
-      def init_translations
-        old_init_translations
-
-        merge_translations(:nb, translations[:no])
-        translations[:no] = translations[:nb]
+    module PluralizationFallback
+      def pluralize(locale, entry, count)
+        super
+      rescue InvalidPluralizationData => ex
+        raise ex unless ex.entry.key?(:other)
+        ex.entry[:other]
+      end
+    end
+  end
+end
 
-        friendly = translate('en', 'time.formats.friendly')
+module OpenStreetMap
+  module I18n
+    module NormaliseLocales
+      def store_translations(locale, data, options = {})
+        locale = ::I18n::Locale::Tag::Rfc4646.tag(locale).to_s
 
-        available_locales.each do |locale|
-          time_formats = I18n.t('time.formats', :locale => locale)
+        super(locale, data, options)
+      end
+    end
 
-          unless time_formats.has_key?(:friendly)
-            store_translations(locale, :time => { :formats => { :friendly => friendly } })
-          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.enforce_available_locales = false
+
+Rails.configuration.after_initialize do
+  I18n.available_locales
+end