X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d36fab2913d10bef4eae2cee7c34875f20311af9..c18253114988f1f001e4eacba0ddde9b17d78ab7:/config/initializers/i18n.rb

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index b2af5004e..6601fb15a 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]
-
-        friendly = translate('en', 'time.formats.friendly')
+    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
 
-        available_locales.each do |locale|
-          time_formats = I18n.t('time.formats', :locale => locale)
+    module PluralizationFallback
+      def pluralize(locale, entry, count)
+        super
+      rescue InvalidPluralizationData => ex
+        raise ex unless ex.entry.has_key?(:other)
+        ex.entry[:other]
+      end
+    end
+  end
 
-          unless time_formats.has_key?(:friendly)
-            store_translations(locale, :time => { :formats => { :friendly => friendly } })
-          end
-        end
+  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
       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.include(I18n::Backend::Fallbacks)
+
+I18n.fallbacks.map("nb" => "no")
+I18n.fallbacks.map("no" => "nb")
+
+Rails.configuration.after_initialize do
+  I18n.reload!
+end