lib/i18n/string.rb @@ -7,6 +7,7 @@ # License:: MIT require 'i18n/backend/simple' require 'i18n/exceptions' +require 'i18n/string' module I18n @@backend = nil lib/i18n.rb @@ -33,7 +33,7 @@ module I18n raise(I18n::MissingTranslationData.new(locale, key, options)) if entry.nil? entry = pluralize(locale, entry, count) - entry = interpolate(locale, entry, values) + entry = interpolate(locale, entry, values) if values.size > 0 entry end @@ -170,11 +170,11 @@ module I18n elsif RESERVED_KEYS.include?(key) raise ReservedInterpolationKey.new(key, string) elsif !values.include?(key) - raise MissingInterpolationArgument.new(key, string) + "{{#{key}}}" else values[key].to_s end - end + end % values end # Loads a single translations file by delegating to #load_rb or lib/i18n/backend/simple.rb @@ -8,6 +8,10 @@ class I18nSimpleBackendInterpolateTest < Test::Unit::TestCase assert_equal 'Hi David!', @backend.send(:interpolate, nil, 'Hi {{name}}!', :name => 'David') end + def test_interpolate_with_ruby_1_9_syntax + assert_equal 'Hi David!', @backend.send(:interpolate, nil, 'Hi %{name}!', :name => 'David') + end + def test_interpolate_given_a_value_hash_interpolates_into_unicode_string assert_equal 'Häi David!', @backend.send(:interpolate, nil, 'Häi {{name}}!', :name => 'David') end @@ -50,8 +54,8 @@ class I18nSimpleBackendInterpolateTest < Test::Unit::TestCase assert_equal 'Hi !', @backend.send(:interpolate, nil, 'Hi {{name}}!', {:name => nil}) end - def test_interpolate_given_an_empty_values_hash_raises_missing_interpolation_argument - assert_raises(I18n::MissingInterpolationArgument) { @backend.send(:interpolate, nil, 'Hi {{name}}!', {}) } + def test_interpolate_given_an_empty_values_hash + assert_equal 'Hi {{name}}!', @backend.send(:interpolate, nil, 'Hi {{name}}!', {}) end def test_interpolate_given_a_string_containing_a_reserved_key_raises_reserved_interpolation_key test/backend/simple/interpolate_test.rb 01b640efc3adf168ef651b98dba39345d5a06743 Lawrence Pit lawrence.pit@gmail.com http://github.com/svenfuchs/i18n/commit/c6e0b06d512f2af57199a843a1d8a40241b32861 c6e0b06d512f2af57199a843a1d8a40241b32861 2009-06-30T15:07:52-07:00 2009-06-21T00:27:29-07:00 Using ruby 1.9 syntax for string interpolation. 88a6fba5673c21ce92bad7b31a258d13c7d519cf Sven Fuchs svenfuchs@artweb-design.de