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..37d3cdebfe48f7333aaea389fb68cc46c4633fb9 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -1,4 +1,9 @@
 module I18n
+  original_verbosity = $VERBOSE
+  $VERBOSE = nil
+  INTERPOLATION_PATTERN = /\{\{(\w+)\}\}/
+  $VERBOSE = original_verbosity
+
   module Backend
     class Simple
       module Implementation
@@ -18,6 +23,8 @@ module I18n
               store_translations(locale, :time => { :formats => { :friendly => friendly } })
             end
           end
+
+          @skip_syntax_deprecation = true
         end
       end
     end