i18n 0.6.3 → 0.6.4

data/lib/i18n/backend/transliterator.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-require 'i18n/core_ext/string/encoding'
-
 module I18n
   module Backend
     module Transliterator
@@ -91,11 +89,9 @@ module I18n
 
         # Add transliteration rules to the approximations hash.
         def add(hash)
-          hash.keys.each do |key|
-            utf8_key = key.to_s.dup.force_encoding('UTF-8')
-            hash[utf8_key] = hash.delete(key).to_s
+          hash.each do |key, value|
+            approximations[key.to_s] = value.to_s
           end
-          approximations.merge! hash
         end
       end
     end

data/lib/i18n/tests/interpolation.rb

@@ -66,7 +66,7 @@ module I18n
         assert_equal 'こんにちは、ゆきひろさん!', interpolate(:default => 'こんにちは、%{name}さん!', :name => 'ゆきひろ')
       end
 
-      if Kernel.const_defined?(:Encoding)
+      if Object.const_defined?(:Encoding)
         test "interpolation: given a euc-jp translation and a utf-8 value it raises Encoding::CompatibilityError" do
           assert_raise(Encoding::CompatibilityError) do
             interpolate(:default => euc_jp('こんにちは、%{name}さん!'), :name => 'ゆきひろ')

data/lib/i18n/version.rb

@@ -1,3 +1,3 @@
 module I18n
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/test/backend/transliterator_test.rb

@@ -1,12 +1,11 @@
 # encoding: utf-8
 require 'test_helper'
-require 'i18n/core_ext/string/encoding'
 
 class I18nBackendTransliterator < Test::Unit::TestCase
   def setup
     I18n.backend = I18n::Backend::Simple.new
     @proc = lambda { |n| n.upcase }
-    @hash = { :"ü" => "ue", :"ö" => "oe" }
+    @hash = { "ü" => "ue", "ö" => "oe", "a" => "a" }
     @transliterator = I18n::Backend::Transliterator.get
   end
 

metadata

@@ -2,7 +2,7 @@
 name: i18n
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Sven Fuchs
@@ -109,7 +109,6 @@ files:
 - lib/i18n/config.rb
 - lib/i18n/core_ext/hash.rb
 - lib/i18n/core_ext/kernel/surpress_warnings.rb
-- lib/i18n/core_ext/string/encoding.rb
 - lib/i18n/core_ext/string/interpolate.rb
 - lib/i18n/exceptions.rb
 - lib/i18n/gettext/helpers.rb

data/lib/i18n/core_ext/string/encoding.rb

@@ -1,10 +0,0 @@
-# Makes String#force_encoding working with ruby 1.8.7
-unless defined?(Encoding)
-  require 'iconv'
-  
-  class String
-    def force_encoding(encoding)
-      ::Iconv.conv('UTF-8//IGNORE', encoding.upcase, self)
-    end
-  end
-end