From d2ec00d57bcf9821dfa3d9d32d49b0986f2ca673 Mon Sep 17 00:00:00 2001 From: Sebastian Celis Date: Thu, 25 Aug 2022 15:29:18 -0500 Subject: [PATCH 01/11] Update formatters.md Add sample plugins section. --- documentation/formatters.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/documentation/formatters.md b/documentation/formatters.md index 7a23132..5c8aa16 100644 --- a/documentation/formatters.md +++ b/documentation/formatters.md @@ -88,3 +88,8 @@ Multiple gems can also be specified in the yaml file. ``` gems: [wicked_twine, some_other_plugin] ``` + +## Sample Plugins + +* [appium-twine](https://github.com/appium/appium_twine) +* [twine-flutter](https://github.com/tiknil/twine-flutter) -- 2.45.3 From f331423475174ce4c680bf40a6bd50ae7e590e64 Mon Sep 17 00:00:00 2001 From: Sebastian Celis Date: Thu, 25 Aug 2022 16:16:16 -0500 Subject: [PATCH 02/11] Add Test workflow for GitHub Actions --- .github/workflows/test.yml | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..07f4ad6 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,40 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. +# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake +# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby + +name: Test + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +permissions: + contents: read + +jobs: + test: + + runs-on: ubuntu-latest + strategy: + matrix: + ruby-version: ['2.4', '2.5', '2.6', '2.7'] + + steps: + - uses: actions/checkout@v3 + - name: Set up Ruby + # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby, + # change this to (see https://github.com/ruby/setup-ruby#versioning): + # uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@2b019609e2b0f1ea1a2bc8ca11cb82ab46ada124 + with: + ruby-version: ${{ matrix.ruby-version }} + bundler-cache: true # runs 'bundle install' and caches installed gems automatically + - name: Install dependencies + run: bundle install + - name: Run tests + run: bundle exec rake test -- 2.45.3 From 6bf9a2dddebba1f54b422618a798ca40a73821c8 Mon Sep 17 00:00:00 2001 From: Sebastian Celis Date: Thu, 25 Aug 2022 16:18:44 -0500 Subject: [PATCH 03/11] Remove CircleCI badge --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 7b86507..f834336 100644 --- a/README.md +++ b/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 -- 2.45.3 From 2a872b8b71afbeda36d230892a6c469be4000603 Mon Sep 17 00:00:00 2001 From: Sebastian Celis Date: Thu, 25 Aug 2022 16:21:03 -0500 Subject: [PATCH 04/11] Drop support for Ruby 2.4 and 2.5 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 07f4ad6..0b2f028 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby-version: ['2.4', '2.5', '2.6', '2.7'] + ruby-version: ['2.6', '2.7'] steps: - uses: actions/checkout@v3 -- 2.45.3 From b10fe933f589bdabf7001efb58cb059b6d0894bb Mon Sep 17 00:00:00 2001 From: Sebastian Celis Date: Tue, 15 Nov 2022 07:50:54 -0600 Subject: [PATCH 05/11] Add ruby 3.0 and 3.1 to the test matrix --- .github/workflows/test.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0b2f028..13c044c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,15 +22,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby-version: ['2.6', '2.7'] + ruby-version: ['2.6', '2.7', '3.0', '3.1'] steps: - uses: actions/checkout@v3 - name: Set up Ruby - # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby, - # change this to (see https://github.com/ruby/setup-ruby#versioning): - # uses: ruby/setup-ruby@v1 - uses: ruby/setup-ruby@2b019609e2b0f1ea1a2bc8ca11cb82ab46ada124 + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} bundler-cache: true # runs 'bundle install' and caches installed gems automatically -- 2.45.3 From ca95b9ed02fb09ebc727a0ca08756b8aadc8fe85 Mon Sep 17 00:00:00 2001 From: Sebastian Celis Date: Tue, 15 Nov 2022 07:55:19 -0600 Subject: [PATCH 06/11] Add rexml as a runtime dependency --- twine.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/twine.gemspec b/twine.gemspec index b32ca05..4db4988 100644 --- a/twine.gemspec +++ b/twine.gemspec @@ -19,6 +19,7 @@ Gem::Specification.new do |s| s.test_files = Dir.glob("test/test_*") s.required_ruby_version = ">= 2.4" + s.add_runtime_dependency('rexml', "~> 3.2") s.add_runtime_dependency('rubyzip', "~> 2.0") s.add_runtime_dependency('safe_yaml', "~> 1.0") s.add_development_dependency('rake', "~> 13.0") -- 2.45.3 From 7a6d18559b4d8ef2f11ea60c056289b948c671c0 Mon Sep 17 00:00:00 2001 From: Sebastian Celis Date: Tue, 15 Nov 2022 08:05:41 -0600 Subject: [PATCH 07/11] Remove old Circle CI configuration. --- .circleci/config.yml | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 76b29b8..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,38 +0,0 @@ -version: 2.0 -jobs: - "ruby-2.4": - docker: - - image: circleci/ruby:2.4 - steps: - - checkout - - run: bundle install - - run: bundle exec rake test TESTOPTS="--ci-dir=$CIRCLE_TEST_REPORTS/reports" - "ruby-2.5": - docker: - - image: circleci/ruby:2.5 - steps: - - checkout - - run: bundle install - - run: bundle exec rake test TESTOPTS="--ci-dir=$CIRCLE_TEST_REPORTS/reports" - "ruby-2.6": - docker: - - image: circleci/ruby:2.6 - steps: - - checkout - - run: bundle install - - run: bundle exec rake test TESTOPTS="--ci-dir=$CIRCLE_TEST_REPORTS/reports" - "ruby-2.7": - docker: - - image: circleci/ruby:2.7 - steps: - - checkout - - run: bundle install - - run: bundle exec rake test TESTOPTS="--ci-dir=$CIRCLE_TEST_REPORTS/reports" -workflows: - version: 2 - build: - jobs: - - "ruby-2.4" - - "ruby-2.5" - - "ruby-2.6" - - "ruby-2.7" -- 2.45.3 From a3418dea9c5b3379998632ea917b64cc9d20d2d8 Mon Sep 17 00:00:00 2001 From: Sebastian Celis Date: Tue, 15 Nov 2022 08:11:36 -0600 Subject: [PATCH 08/11] Update required Ruby version to 2.6 --- twine.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/twine.gemspec b/twine.gemspec index 4db4988..61d536e 100644 --- a/twine.gemspec +++ b/twine.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| s.files += Dir.glob("test/**/*") s.test_files = Dir.glob("test/test_*") - s.required_ruby_version = ">= 2.4" + s.required_ruby_version = ">= 2.6" s.add_runtime_dependency('rexml', "~> 3.2") s.add_runtime_dependency('rubyzip', "~> 2.0") s.add_runtime_dependency('safe_yaml', "~> 1.0") -- 2.45.3 From 55a140a44c5abdf7083c2b9f96a712595e2442cf Mon Sep 17 00:00:00 2001 From: Sebastian Celis Date: Tue, 15 Nov 2022 08:14:09 -0600 Subject: [PATCH 09/11] Prepare 1.1.2 for release --- CHANGELOG.md | 4 ++++ lib/twine/version.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b7a5d5..b58f2d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 1.1.2 (2022-11-15) + +- Bugfix: Fixed a runtime error caused by a missing rexml dependency in Ruby 3 (#312) + # 1.1.1 (2021-01-28) - Bugfix: Properly parse multiline comments in Android XML files (#300) diff --git a/lib/twine/version.rb b/lib/twine/version.rb index 5485200..669bf16 100644 --- a/lib/twine/version.rb +++ b/lib/twine/version.rb @@ -1,3 +1,3 @@ module Twine - VERSION = '1.1.1' + VERSION = '1.1.2' end -- 2.45.3 From 50e7eb95cc8bbd1a964c58d8bead42f3d700eacb Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Wed, 31 Aug 2022 23:26:36 +0300 Subject: [PATCH 10/11] Fixed generic language fallback Signed-off-by: Alexander Borsuk --- lib/twine/output_processor.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/twine/output_processor.rb b/lib/twine/output_processor.rb index 6606db0..4e9edf9 100644 --- a/lib/twine/output_processor.rb +++ b/lib/twine/output_processor.rb @@ -18,7 +18,7 @@ module Twine } # Regional dialect fallbacks to generic language (for example: 'es-MX' to 'es' instead of default 'en'). - if language.match(/([a-zA-Z])-[a-zA-Z]+/) + if language.match(/([a-zA-Z]{2})-[a-zA-Z]+/) generic_language = language.gsub(/([a-zA-Z])-[a-zA-Z]+/, '\1') end -- 2.45.3 From 1a140cbdf84fdfd4d6fbac3c92b8d1281d8ff727 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Thu, 22 Dec 2022 12:14:46 +0100 Subject: [PATCH 11/11] Properly extract language from json files Signed-off-by: Alexander Borsuk --- lib/twine/formatters/jquery.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/twine/formatters/jquery.rb b/lib/twine/formatters/jquery.rb index 2712782..cfbce5b 100644 --- a/lib/twine/formatters/jquery.rb +++ b/lib/twine/formatters/jquery.rb @@ -14,7 +14,7 @@ module Twine end def determine_language_given_path(path) - match = /^.+-([^-]{2})\.json$/.match File.basename(path) + match = /^.+([a-z]{2}-[A-Z]{2})\.json$/.match File.basename(path) return match[1] if match return super -- 2.45.3