r18n-core 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae56d575f84ac7a894d396ecc237bfb4143c37be
-  data.tar.gz: 0eda9e98a00b40c74b147fcf5a33e3731b99a96e
+  metadata.gz: 82de4fba19ac7e49e6fb02e5571a09b83b29cf83
+  data.tar.gz: 79d4bf3644c58ce43cfb86bbc4bc6710d4e4b9cf
 SHA512:
-  metadata.gz: c37b640bf3239a6a84e85d2a1eec63a15be7044e760c2efbc9ae6bf9748144c1c45db5881662d25eaa70e0699e44f7199fb0ece8ef98d8aee73f73aed721c70d
-  data.tar.gz: 6cf7f356193a677314128f7dd66c200768406ffd25a1441ba5dc6a32277060848ceaf7d5a35fad7702b7cde7a63eec67e9ac0197da252417d67c0e5b25a3d637
+  metadata.gz: 619447ede85423cdea346b4fa35d8097a808346ac3825e4352de633abcd627d1ae9918b776e973ea350cad1ec60a07effad402d7d0db7117ea9449b75f0f822f
+  data.tar.gz: cee37ba1f7ae0f6c0d937c211856e96b54192e410e64976b27f0da738f32de269732e5170cfa55eb80ffe65fe5d4f90eb5fcfce15754a1b015e38fbc871728f7

data/ChangeLog.md

@@ -1,3 +1,7 @@
+## 2.0.2 (Budapest)
+* Fix array support in translations.
+* Fix Rails support for dialect locales.
+
 ## 2.0.1 (Amsterdam)
 * Fix Dutch locale.
 

data/lib/r18n-core/translation.rb

@@ -102,7 +102,7 @@ module R18n
             end
           end
           @data[name] = value
-        elsif @data[name].is_a? Translation
+        elsif @data[name].is_a? Translation and value.is_a? Hash
           @data[name].merge! value, locale
         end
       end

data/lib/r18n-core/version.rb

@@ -1,3 +1,3 @@
 module R18n
-  VERSION = '2.0.1'.freeze unless defined? R18n::VERSION
+  VERSION = '2.0.2'.freeze unless defined? R18n::VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r18n-core
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Andrey Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies: []
 description: |2
       R18n is a i18n tool to translate your Ruby application.