Merge branch 'master' into openstreetbugs

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

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 82fd62df5fdc38cab5e083d1d039e74db687d1c0..8aadeaacf8edcba856e819b196777b6bfa927522 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -18,6 +18,8 @@ module I18n
               store_translations(locale, :time => { :formats => { :friendly => friendly } })
             end
           end
               store_translations(locale, :time => { :formats => { :friendly => friendly } })
             end
           end

+
+          @skip_syntax_deprecation = true

         end
       end
     end
         end
       end
     end