twine 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 381bd0d84850220b7ef1f8071a7398eb6c61e1f7c5bc057e5d96cd259f0f4578
-  data.tar.gz: 04a94d58790f88c95cf3ae000986f7f0df62165e2749cdc22e409fef391e2760
+  metadata.gz: a0ddd09377d4bdc637c451ef936e94532bd6af7986cbe7ff490732ff0a42ff6d
+  data.tar.gz: 93dbc48a7c9b10681ddbc0fc996f02e15c8658144da6d1a285628543cec30a5d
 SHA512:
-  metadata.gz: f14b9de69dcd4a533fa5b769dc42a2601caec06d41e04470188fa3a59a3e418d53e2d2994bce2c119fec6fee8252a7d7e421b58cd90316e98a527422c6a19551
-  data.tar.gz: 60bc8c8c800d1f4b3e3b1664504052bf4dc561fe97f1e62b361943de6567e5a5d22902c98f485e03f1e651f76765a7951142c915576ee80dfc6ae933df12139c
+  metadata.gz: 5565a7205236780b07f99b1fc8e7d7e8a22b11ee67bf08137aed0660cf49e283bbdfc9d86e2073dc689b98a5167de9bd2f17c5cde266580455e04d66d92559ac
+  data.tar.gz: 47616ba00b6f17de2eda9aac730b4595e21a2e43395b1bc95a6eb5bd44d656d31c71f9fbab87d8ff7d393357602998769f511930dee1c23ca6372e956d425000

data/lib/twine/formatters/jquery.rb

@@ -20,6 +20,16 @@ module Twine
         return super
       end
 
+      def set_translation_for_key_recursive(key, lang, value)
+        if value.is_a?(Hash)
+          value.each do |key2, value2|
+            set_translation_for_key_recursive(key+"."+key2, lang, value2)
+          end
+        else
+          set_translation_for_key(key, lang, value)
+        end
+      end
+
       def read(io, lang)
         begin
           require "json"
@@ -29,7 +39,7 @@ module Twine
 
         json = JSON.load(io)
         json.each do |key, value|
-          set_translation_for_key(key, lang, value)
+          set_translation_for_key_recursive(key, lang, value)
         end
       end
 

data/lib/twine/version.rb

@@ -1,3 +1,3 @@
 module Twine
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

data/test/fixtures/formatter_jquery_nested.json

@@ -0,0 +1,11 @@
+{
+"key1":"value1-english",
+"key2":"value2-english",
+
+"key3":"value3-english",
+"key4":"value4-english",
+"key5":{
+	"key5a":"value5a-english",
+	"key5b":"value5b-english"
+	}
+}

data/test/test_formatters.rb

@@ -28,6 +28,14 @@ class FormatterTest < TwineTest
     end
   end
 
+  def assert_nested_translations_read_correctly
+    1.upto(4) do |i|
+      assert_equal "value#{i}-english", @empty_twine_file.definitions_by_key["key#{i}"].translations['en']
+    end
+    assert_equal "value5a-english", @empty_twine_file.definitions_by_key["key5.key5a"].translations['en']
+    assert_equal "value5b-english", @empty_twine_file.definitions_by_key["key5.key5b"].translations['en']
+  end
+
   def assert_file_contents_read_correctly
     assert_translations_read_correctly
 
@@ -442,6 +450,12 @@ class TestJQueryFormatter < FormatterTest
     assert_translations_read_correctly
   end
 
+  def test_read_format_nested
+    @formatter.read content_io('formatter_jquery_nested.json'), 'en'
+
+    assert_nested_translations_read_correctly
+  end
+
   def test_format_file
     formatter = Twine::Formatters::JQuery.new
     formatter.twine_file = @twine_file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twine
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Sebastian Celis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexml
@@ -154,6 +154,7 @@ files:
 - test/fixtures/formatter_gettext.po
 - test/fixtures/formatter_gettext_quotes.po
 - test/fixtures/formatter_jquery.json
+- test/fixtures/formatter_jquery_nested.json
 - test/fixtures/formatter_tizen.xml
 - test/fixtures/gettext_multiline.po
 - test/fixtures/twine_accent_values.txt
@@ -176,7 +177,7 @@ homepage: https://github.com/scelis/twine
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -191,21 +192,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Manage strings and their translations for your iOS, Android and other projects.
 test_files:
-- test/test_formatters.rb
-- test/test_output_processor.rb
-- test/test_consume_localization_file.rb
-- test/test_consume_localization_archive.rb
 - test/test_abstract_formatter.rb
 - test/test_cli.rb
-- test/test_twine_file.rb
-- test/test_generate_localization_file.rb
+- test/test_consume_localization_archive.rb
+- test/test_consume_localization_file.rb
+- test/test_formatters.rb
 - test/test_generate_all_localization_files.rb
 - test/test_generate_localization_archive.rb
-- test/test_twine_definition.rb
+- test/test_generate_localization_file.rb
+- test/test_output_processor.rb
 - test/test_placeholders.rb
+- test/test_twine_definition.rb
+- test/test_twine_file.rb
 - test/test_validate_twine_file.rb