X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/782ddc9c3e652439ba98ad9f0216146b432830fe..d5561dd27a3affe7f395febf4880110f66e2af74:/config/initializers/i18n.rb

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 82fd62df5..6601fb15a 100644
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,24 +1,9 @@
 module I18n
   module Backend
-    class Simple
-      module Implementation
-        protected
-        alias_method :old_init_translations, :init_translations
-      
-        def init_translations
-          old_init_translations
-
-          store_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
+    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
 
@@ -31,10 +16,31 @@ module I18n
       end
     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.send(:include, I18n::Backend::Pluralization)
-I18n::Backend::Simple.send(:include, I18n::Backend::PluralizationFallback)
-I18n.load_path << RAILS_ROOT + "/config/pluralizers.rb"
+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::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
+I18n.fallbacks.map("nb" => "no")
+I18n.fallbacks.map("no" => "nb")
+
+Rails.configuration.after_initialize do
+  I18n.reload!
+end