@@ -10,7 +10,7 @@ module I18n protected def interpolate_with_deprecated_syntax(locale, string, values = {}) - return string unless string.is_a?(String) + return string unless string.is_a?(String) && !values.empty? string = string.gsub(/%d|%s/) do |s| instead = DEPRECATED_INTERPOLATORS[s] activerecord/lib/active_record/i18n_interpolation_deprecation.rb @@ -53,7 +53,7 @@ class ActiveRecordValidationsI18nTests < ActiveSupport::TestCase def test_percent_s_interpolation_syntax_in_error_messages_is_deprecated assert_deprecated('using %s in messages') do - I18n.t :does_not_exist, :default => "%s interpolation syntax is deprected", :value => 'this' + I18n.t :does_not_exist, :default => "%s interpolation syntax is deprecated", :value => 'this' end end @@ -70,6 +70,12 @@ class ActiveRecordValidationsI18nTests < ActiveSupport::TestCase end end + def test_percent_s_interpolation_syntax_not_changed_when_no_values_were_passed + assert_not_deprecated do + I18n.t :does_not_exist, :default => "%d interpolation syntaxes are deprected" + end + end + # ActiveRecord::Errors def test_errors_generate_message_translates_custom_model_attribute_key activerecord/test/cases/validations_i18n_test.rb 6cbcfffeb118ecbb7c1930c74de7b8b6a49dfacd Sven Fuchs svenfuchs@artweb-design.de http://github.com/findsyou/rails/commit/bf00de03dee5fba0b53f0fc1bb19464422550aa9 bf00de03dee5fba0b53f0fc1bb19464422550aa9 2009-08-01T20:51:15-07:00 2009-07-08T09:49:40-07:00 Stop messing with supposedly-deprecated interpolation placeholders when no interpolation values have been passed. [#2885 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> 4fc793f2be15a1118712eed17ed21be7d1f273c0 Jeremy Kemper jeremy@bitsweat.net