Merge branch 'master' into openstreetbugs

[rails.git] / config / initializers / i18n.rb

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index aae87bef9be18f8539a3946743d5babc2d72bb87..8aadeaacf8edcba856e819b196777b6bfa927522 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,21 +1,25 @@
 module I18n
   module Backend
-    module Base
-      protected
-      alias_method :old_init_translations, :init_translations
+    class Simple
+      module Implementation
+        protected
+        alias_method :old_init_translations, :init_translations
       
-      def init_translations
-        old_init_translations
+        def init_translations
+          old_init_translations
 
-        merge_translations(:nb, translations[:no])
-        translations[:no] = translations[:nb]
+          store_translations(:nb, translations[:no])
+          translations[:no] = translations[:nb]
 
-        friendly = translate('en', 'time.formats.friendly')
+          friendly = translate('en', 'time.formats.friendly')
 
-        available_locales.each do |locale|
-          unless lookup(locale, 'time.formats.friendly')
-            store_translations(locale, :time => { :formats => { :friendly => friendly } })
+          available_locales.each do |locale|
+            unless lookup(locale, 'time.formats.friendly')
+              store_translations(locale, :time => { :formats => { :friendly => friendly } })
+            end
           end
+
+          @skip_syntax_deprecation = true
         end
       end
     end