localeapp 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 632b3673659bb3b1e1cebf5d869db6d95464806fc302c286390c242749d9373a
-  data.tar.gz: 41d594f0e6adbfc5cc24d38c5b322edc9d0edb81266c821605267f7baa5e210e
+SHA1:
+  metadata.gz: 1a7cd53343b6eb12ea585524362dc60be3c0d2a5
+  data.tar.gz: 04d96ff855e00b290e748324eff03a7a596bea8f
 SHA512:
-  metadata.gz: da419ba0f426a9c254f1df74e0dd33d6052cbe7764f212fe0888763ccd0419d4506db36ebe4697174253de63f22c4c3317f6f6ec9e925807fcd878bb8e445958
-  data.tar.gz: bc93854b79aa5660c54ea412c46bd5105da8046820242b294e0c3f80e018c409d0613329fb18b921cbb7639d7b90702f3808fd209e6100813b42ddc616bf7842
+  metadata.gz: c9624f8d6e81d35f9df063059aafaba5779cc607fd9fc45d1a785818b61159bf7776752ef8ee5b29da4d73a5d9748c8ad2bd091e5fe049469fe6c0c8cfaf6593
+  data.tar.gz: beb7c4864b7c32b52de9c57cf732adcff5375c5833f6988c34603d9ea367ee43d88990bc36021c25abfd0a09c2dbf6cc1c6cd329a8b68606df608cecc8de3322

data/.travis.yml

@@ -1,14 +1,15 @@
 sudo: required
 dist: trusty
 before_install:
-  - gem install bundler
+  - gem install bundler -v '< 2'
 rvm:
-  - 2.5.0
-  - 2.4.3
-  - 2.3.6
-  - 2.2.9
+  - 2.6.0
+  - 2.5.3
+  - 2.4.5
+  - 2.3.8
+  - 2.2.10
   - 2.1.10
-  - jruby-9.1.15.0
+  - jruby
 gemfile:
   - Gemfile
   - spec/gemfiles/i18n_0.7.gemfile

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # master
 
+# Version 3.1.1
+
+* Remove I18n Hash#deep_merge! usage
+* Support ruby 2.6
+
 # Version 3.1.0
 
 * add `localeapp cp`

data/README.md

@@ -178,6 +178,10 @@ You can contact us via the support link at the bottom of the page or emailing su
 
 See corresponding [contributing guidelines][3].
 
+## Known bugs
+
+We are aware about a compatibility issue with JRuby 9.1 and i18n 1.3. Our recommandation so far is to use i18n < 1.3 if you are using JRuby 9.1.
+
 ## License
 
 Copyright (c) 2014 [Locale][5] and other [contributors][6], released under the [MIT License][4].

data/lib/localeapp/updater.rb

@@ -11,7 +11,7 @@ module Localeapp
           translations = Localeapp.load_yaml_file(filename)
           if data['translations'] && data['translations'][short_code]
             new_data = { short_code => data['translations'][short_code] }
-            translations.deep_merge!(new_data)
+            translations = deep_merge translations, new_data
           end
         else
           translations = { short_code => data['translations'][short_code] }
@@ -42,6 +42,16 @@ module Localeapp
 
     private
 
+    def deep_merge(original, other)
+      original.merge other do |_, a, b|
+        if Hash === a && Hash === b
+          deep_merge a, b
+        else
+          b
+        end
+      end
+    end
+
     def generate_yaml(translations)
       YAML.dump(translations, :line_width => -1)[4..-1]
     end

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localeapp
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Christopher Dell
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -299,8 +299,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: localeapp
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Easy i18n translation management with localeapp.com
 test_files: []
+has_rdoc: