[DRE-commits] [SCM] ruby-i18n.git branch, master, updated. debian/0.6.0-3-17-gdb5f289

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit db5f289c29e9aa382aab238d198b3432e375dd8b
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Jun 4 01:07:39 2013 +0530

    fix conflicting file
    
    - not sure how we missed this file

diff --git a/lib/i18n/backend/key_value.rb b/lib/i18n/backend/key_value.rb
index c34b797..df80718 100644
--- a/lib/i18n/backend/key_value.rb
+++ b/lib/i18n/backend/key_value.rb
@@ -73,7 +73,7 @@ module I18n
               raise "Key-value stores cannot handle procs"
             end
 
-            @store[key] = ActiveSupport::JSON.encode([value]) unless value.is_a?(Symbol)
+            @store[key] = ActiveSupport::JSON.encode(value) unless value.is_a?(Symbol)
           end
         end
 
@@ -90,7 +90,7 @@ module I18n
         def lookup(locale, key, scope = [], options = {})
           key   = normalize_flat_keys(locale, key, scope, options[:separator])
           value = @store["#{locale}.#{key}"]
-          value = ActiveSupport::JSON.decode(value)[0] if value
+          value = ActiveSupport::JSON.decode(value) if value
           value.is_a?(Hash) ? value.deep_symbolize_keys : value
         end
       end

-- 
ruby-i18n.git