X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/03f733c4f4091dc53e391aa74a020681af98a4ff..50f9fa6113c75dee6cddd7178daba9d17841b5c8:/config/initializers/i18n.rb?ds=sidebyside

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index ac4ad81d6..f2504bd87 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,27 +1,44 @@
-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
-
-        friendly = translate('en', 'time.formats.friendly')
-
-        available_locales.each do |locale|
-          time_formats = I18n.t('time.formats', :locale => locale)
-
-          unless time_formats.has_key?(:friendly)
-            store_translations(locale, :time => { :formats => { :friendly => friendly } })
-          end
-        end
+    module PluralizationFallback
+      def pluralize(locale, entry, count)
+        super
+      rescue InvalidPluralizationData => e
+        raise e unless e.entry.key?(:other)
+
+        e.entry[:other]
+      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
+
+        super
       end
     end
   end
 end
+
+I18n::Backend::Simple.prepend(OpenStreetMap::I18n::NormaliseLocales)
+
+I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback)
+I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
+
+I18n.fallbacks.map("no" => "nb")
+
+I18n.enforce_available_locales = false
+
+if Rails.env.test?
+  I18n.exception_handler = proc do |exception|
+    raise exception.to_exception
+  end
+end
+
+Rails.configuration.after_initialize do
+  I18n.available_locales
+end