activerecord/lib/active_record/i18n_interpolation_deprecation.rb @@ -77,5 +77,5 @@ require 'active_record/connection_adapters/abstract_adapter' require 'active_record/schema_dumper' +require 'active_record/i18n_interpolation_deprecation' I18n.load_translations File.dirname(__FILE__) + '/active_record/locale/en-US.yml' - activerecord/lib/active_record.rb @@ -4,7 +4,6 @@ module I18n module Backend class Simple INTERPOLATION_RESERVED_KEYS = %w(scope default) - DEPRECATED_INTERPOLATORS = { '%d' => '{{count}}', '%s' => '{{value}}' } MATCH = /(\\\\)?\{\{([^\}]+)\}\}/ # Accepts a list of paths to translation files. Loads translations from @@ -120,12 +119,6 @@ module I18n def interpolate(locale, string, values = {}) return string unless string.is_a?(String) - string = string.gsub(/%d|%s/) do |s| - instead = DEPRECATED_INTERPOLATORS[s] - ActiveSupport::Deprecation.warn "using #{s} in messages is deprecated; use #{instead} instead." - instead - end - if string.respond_to?(:force_encoding) original_encoding = string.encoding string.force_encoding(Encoding::BINARY) activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb 9d7f186f746f38367851355fcd301ac24d6f6a51 Sven Fuchs svenfuchs@artweb-design.de http://github.com/rails/rails/commit/8cb7d460439a9b20a80a77b6370c1107233d1cbd 8cb7d460439a9b20a80a77b6370c1107233d1cbd 2008-09-20T11:13:50-07:00 2008-09-14T04:36:06-07:00 I18n: move old-style interpolation syntax deprecation to Active Record. [#1044 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> ddd5d29a0ab3f39e685ed35dc681a58114acf309 Pratik Naik pratiknaik@gmail.com