twine 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f4d5f35555d309af477e468d170c086657eafb79659040f23d9a3803c0b59f2
-  data.tar.gz: 6d6858513e345694beb1c031b5a1753a45d31e1038023794a7315b7953df90bd
+  metadata.gz: a0ddd09377d4bdc637c451ef936e94532bd6af7986cbe7ff490732ff0a42ff6d
+  data.tar.gz: 93dbc48a7c9b10681ddbc0fc996f02e15c8658144da6d1a285628543cec30a5d
 SHA512:
-  metadata.gz: ae57c2695b90b0c641b10c54f851543870bf4d2025197c634a5ad7bb0405befa7c29b2b5dff0430e5d6015e8346c202e036298032fb4d2b65fd95d267a797e16
-  data.tar.gz: a71413208993949abca200308296790e8f3a163430b7aa1d8381f2961437e2049480086521835f2c8920b5eb95a03cfc1736063d81f1bd6df570da9472231679
+  metadata.gz: 5565a7205236780b07f99b1fc8e7d7e8a22b11ee67bf08137aed0660cf49e283bbdfc9d86e2073dc689b98a5167de9bd2f17c5cde266580455e04d66d92559ac
+  data.tar.gz: 47616ba00b6f17de2eda9aac730b4595e21a2e43395b1bc95a6eb5bd44d656d31c71f9fbab87d8ff7d393357602998769f511930dee1c23ca6372e956d425000

data/README.md

@@ -1,7 +1,5 @@
 # Twine
 
-[![Continuous Integration by CircleCI](https://circleci.com/gh/scelis/twine.svg?style=shield)](https://circleci.com/gh/scelis/twine)
-
 Twine is a command line tool for managing your strings and their translations. These are all stored in a single text file and then Twine uses this file to import and export localization files in a variety of types, including iOS and Mac OS X `.strings` files, Android `.xml` files, gettext `.po` files, and [jquery-localize][jquerylocalize] `.json` files. This allows individuals and companies to easily share translations across multiple projects, as well as export localization files in any format the user wants.
 
 ## Install
@@ -24,7 +22,7 @@ Twine supports [`printf` style placeholders][printf] with one peculiarity: `@` i
 
 Tags are used by Twine as a way to only work with a subset of your definitions at any given point in time. Each definition can be assigned zero or more tags which are separated by commas. Tags are optional, though highly recommended. You can get a list of all definitions currently missing tags by executing the [`validate-twine-file`](#validate-twine-file) command with the `--pedantic` option.
 
-When generating a localization file, you can specify which definitions should be included using the `--tags` option. Provide a comma separated list of tags to match all definitions that contain any of the tags (`--tags tag1,tag2` matches all definitions tagged with `tag1` _or_ `tag2`). Provide multiple `--tags` options to match defintions containing all specified tags (`--tags tag1 --tags tag2` matches all definitions tagged with `tag1` _and_ `tag2`). You can match definitions _not_ containing a tag by prefixing the tag with a tilde (`--tags ~tag1` matches all definitions _not_ tagged with `tag1`). All three options are combinable.
+When generating a localization file, you can specify which definitions should be included using the `--tags` option. Provide a comma separated list of tags to match all definitions that contain any of the tags (`--tags tag1,tag2` matches all definitions tagged with `tag1` _or_ `tag2`). Provide multiple `--tags` options to match definitions containing all specified tags (`--tags tag1 --tags tag2` matches all definitions tagged with `tag1` _and_ `tag2`). You can match definitions _not_ containing a tag by prefixing the tag with a tilde (`--tags ~tag1` matches all definitions _not_ tagged with `tag1`). All three options are combinable.
 
 ### Whitespace
 
@@ -81,7 +79,7 @@ Twine currently supports the following output formats:
     * HTML tags will be escaped by replacing `<` with `&lt`
     * Tags inside `<![CDATA[` won't be escaped.
     * Supports [basic styling][androidstyling] according to [Android documentation](https://developer.android.com/guide/topics/resources/string-resource.html#StylingWithHTML).  All of the documented tags are supported, in addition to `<a>` links.
-	    * These tags will *not* be escaped if the string doesn't contain placeholders. You can reference them directly in your layouts or by using [`getText()`](https://developer.android.com/reference/android/content/res/Resources.html#getText(int)) to read them programatically.
+	    * These tags will *not* be escaped if the string doesn't contain placeholders. You can reference them directly in your layouts or by using [`getText()`](https://developer.android.com/reference/android/content/res/Resources.html#getText(int)) to read them programmatically.
 	    * These tags *will* be escaped if the string contains placeholders. You can use [`getString()`](https://developer.android.com/reference/android/content/res/Resources.html#getString(int,%20java.lang.Object...)) combined with [`fromHtml`](https://developer.android.com/reference/android/text/Html.html#fromHtml(java.lang.String)) as shown in the [documentation][androidstyling] to display them.
 	* See [\#212](https://github.com/scelis/twine/issues/212) for details.
 * [Gettext PO Files][gettextpo] (format: gettext)
@@ -203,7 +201,7 @@ buildscript {
 	repositories { jcenter() }
 
 	dependencies {
-		/* NOTE: Set your prefered version of jruby here. */
+		/* NOTE: Set your preferred version of jruby here. */
 		classpath "com.github.jruby-gradle:jruby-gradle-plugin:1.5.0"
 	}
 }
@@ -211,7 +209,7 @@ buildscript {
 apply plugin: 'com.github.jruby-gradle.base'
 
 dependencies {
-	/* NOTE: Set your prefered version of twine here. */
+	/* NOTE: Set your preferred version of twine here. */
 	jrubyExec 'rubygems:twine:1.1'
 }
 

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/output_processor.rb

@@ -13,6 +13,7 @@ module Twine
 
       def fallback_languages(language)
         fallback_mapping = {
+          'zh-CN' => 'zh-Hans', # if we don't have a zh-CN translation, try zh-Hans before en
           'zh-TW' => 'zh-Hant' # if we don't have a zh-TW translation, try zh-Hant before en
         }
 

data/lib/twine/twine_file.rb

@@ -44,7 +44,7 @@ module Twine
     end
 
     def translation_for_lang(lang)
-      translation = [lang].flatten.map { |l| @translations[l] }.first
+      translation = [lang].flatten.map { |l| @translations[l] }.compact.first
 
       translation = reference.translation_for_lang(lang) if translation.nil? && reference
 

data/lib/twine/version.rb

@@ -1,3 +1,3 @@
 module Twine
-  VERSION = '1.1.1'
+  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,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: twine
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Sebastian Celis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -140,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
@@ -162,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
@@ -170,28 +185,28 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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