rails_translation_manager 1.6.3 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b22e022079868b0d53fef06e6ff5b01dcaead0581e83717129bdcd7390b052c9
-  data.tar.gz: 88132ad55d9464db0d5ada804264839d7229f47d30e2960ced17a16e198be63d
+  metadata.gz: a4c06e241d0980a1a3a3aff952368374d48828fda9ce5f4c25dcdf0575dab782
+  data.tar.gz: d5b6c18c75cbab4af8049a4c4eef1271786726a03dbd10ed468f9fc7e8f9b93e
 SHA512:
-  metadata.gz: d3ee1b5e7edfbbb85e954d76670eb11fef58c78e364fff488802cf2adbcaec9be9712cf28751025cfb57dbd3f82f71d84cdd0a015080ecd2d4fdaec0226a6dc9
-  data.tar.gz: c3436392abd8892303c3708ffc9bd54e140f1bd7d461b62bca4a12a6722781341458ce7257f4457d234633dc785e3185da23eef57fefeff9d43c65334db2dd66
+  metadata.gz: 2ab48e5f2b9e794efc34a17f10be561c45427d63bf4ca2e65c39da6c5491a3692139b2db0fbcba9b9398873945c41e8b814b4001f275f433ee4c80c48f0b5d09
+  data.tar.gz: 2729a5b80c06c3065e339520be25d4afabc1a7ab37ac5e502ed1701d9b85d9ba13dfd3289b2c858b847e99e5e2f17890a6c80f69f29c9cdd1969069dea627c7f

data/.github/workflows/ci.yml

@@ -1,16 +1,25 @@
 on: [push, pull_request]
 
 jobs:
+  codeql-sast:
+    name: CodeQL SAST scan
+    uses: alphagov/govuk-infrastructure/.github/workflows/codeql-analysis.yml@main
+    permissions:
+      security-events: write
+
+  dependency-review:
+    name: Dependency Review scan
+    uses: alphagov/govuk-infrastructure/.github/workflows/dependency-review.yml@main
+  
   # This matrix job runs the test suite against multiple Ruby versions
   test_matrix:
     strategy:
       fail-fast: false
       matrix:
-        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [ 2.7, '3.0', 3.1 ]
+        ruby: [3.2, 3.3]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
@@ -31,6 +40,6 @@ jobs:
     if: ${{ github.ref == 'refs/heads/main' }}
     permissions:
       contents: write
-    uses: alphagov/govuk-infrastructure/.github/workflows/publish-rubygem.yaml@main
+    uses: alphagov/govuk-infrastructure/.github/workflows/publish-rubygem.yml@main
     secrets:
       GEM_HOST_API_KEY: ${{ secrets.ALPHAGOV_RUBYGEMS_API_KEY }}

data/.ruby-version

@@ -1 +1 @@
-2.7.6
+3.3.6

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.8.0
+
+* Drop support for Ruby 3.1, keep supporting Ruby 3.2, use Ruby 3.3 as default https://github.com/alphagov/rails_translation_manager/pull/78 
+
+# 1.7.0
+
+* Drop support for Ruby 3.0
+
 # 1.6.3
 
 * Use proc for single plural languages https://github.com/alphagov/rails_translation_manager/pull/62

data/README.md

@@ -63,4 +63,4 @@ Read [why we architected RTM in this way](https://docs.google.com/document/d/1ba
 
 ## Licence
 
-[MIT License](LICENSE.txt)
+[MIT License](LICENCE)

data/docs/adding-editing-plural-forms.md

@@ -1,25 +1,24 @@
 # Adding a language's plural form
 
-We maintain our own [plurals.rb](https://github.com/alphagov/rails_translation_manager/blob/master/config/locales/plurals.rb) configuration file. If adding a language to Rails Translation Manager, that doesn't exist in [rails-i18n](https://github.com/svenfuchs/rails-i18n), you may need to edit this file.
+We maintain our own [plurals.rb][1] configuration file. This is used for plural
+rules that don't exist in [rails-i18n][2].
 
-This config is needed to correctly distinguish the [plural rules](https://www.unicode.org/cldr/cldr-aux/charts/34/supplemental/language_plural_rules.html) for locales not included in `rails-i18n`, as it is needed for plural validation checks.
-
-Note that there is currently a [duplicate list in `govuk_app_config](https://github.com/alphagov/govuk_app_config/blob/main/lib/govuk_app_config/govuk_i18n.rb). The intention is for this to be removed and for the Rails Translation Manager version to be the sole version.
+If there is a missing plural rule (fails plural validator) then we can add the
+rule to our [plurals.rb][1] file. Plural rules for most languages can be found
+on the [unicode website][3] (cardinal type).
 
 ## Editing plural forms
 
 Keys with incorrect plural forms are more complex to adjust. If there are keys with additional unnecessary plural forms, they can be deleted:
 
 ```
-sed -i '' '/^ \+one:/d' config/locales/xx.yml
+sed -i '' '/^ *one:/d' config/locales/xx.yml
 ```
 
-This commonly occurs for e.g. Chinese and Vietnamese which are expected to have only an `:other` and not a `:one` form.
-
 Keys which need a plural form added can be automated with caution. If every key of a specific translation needs the new plural added, it can be done by adding a blank key before every `other:` key:
 
 ```
-perl -0777 -p -i -e 's/\n(\s+)other:/\n\1nmany:\n\1other:/g' config/locales/xx.yml
+perl -0777 -p -i -e 's/\n(\s+)other:/\n\1many:\n\1other:/g' config/locales/xx.yml
 ```
 
 Or if only a specific key needs the plural added:
@@ -28,4 +27,6 @@ Or if only a specific key needs the plural added:
 perl -0777 -p -i -e 's/(key_with_missing_plural:\n)(\s+)/\1\2zero:\n\2/g' config/locales/xx.yml
 ```
 
-This commonly occurs for Slavic languages and Arabic, for example, which have plural forms other than just `:one` and `:other`.
+[1]: https://github.com/alphagov/rails_translation_manager/blob/main/config/locales/plurals.rb
+[2]: https://github.com/svenfuchs/rails-i18n
+[3]: https://unicode-org.github.io/cldr-staging/charts/latest/supplemental/language_plural_rules.html

data/docs/rake-command-reference.md

@@ -42,11 +42,21 @@ rake translation:normalize
 
 Remove keys that are not used anywhere in your application:
 
+**Warning**:
+> Removing unused keys may remove keys that actually _are_ used by your
+  application. This happens when RTM fails to scan certain keys in the
+  codebase, e.g when the keys are referenced dynamically. You can make RTM
+  ignore these keys by creating a `/config/i18n-tasks.yml` file with an
+  `ignore_unused` key.
+
+  A safer way to remove known unused keys is to use the [Delete keys](https://github.com/glebm/i18n-tasks#delete-keys)
+  command.
+
 ```
 rake translation:remove_unused
 ```
 
-Sometimes RTM might remove keys that actually _are_ used by your application. This happens when the keys are referenced dynamically. You can make RTM ignore these keys by creating a `/config/i18n-tasks.yml` file with an `ignore_unused` key. For example:
+Example `ignore_unused` config:
 
 ```yaml
 ignore_unused:

data/lib/rails_translation_manager/importer.rb

@@ -73,7 +73,7 @@ class RailsTranslationManager::Importer
     group_csv_by_file(csv).each do |group|
       language_dir =  File.join(import_directory, locale)
 
-      Dir.mkdir(language_dir) unless Dir.exists?(language_dir)
+      Dir.mkdir(language_dir) unless Dir.exist?(language_dir)
 
       import_yml_path = File.join(import_directory, locale, "#{group[0]}.yml")
       import_csv(group[1], import_yml_path)

data/lib/rails_translation_manager/version.rb

@@ -1,3 +1,3 @@
 module RailsTranslationManager
-  VERSION = "1.6.3"
+  VERSION = "1.8.0"
 end

data/rails_translation_manager.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = ""
   spec.license       = "MIT"
 
+  spec.required_ruby_version = ">= 3.2"
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

data/test/rails_translation_manager/exporter_test.rb

@@ -95,7 +95,7 @@ module RailsTranslationManager
 
       data = read_csv_data(exported_file("fr.csv"))
       assert_equal ["French", nil], data["language_names.fr"]
-      assert_equal nil, data["language_names.es"], "language key for spanish should not be present"
+      assert_nil data["language_names.es"], "language key for spanish should not be present"
     end
 
     test 'should export correct pluralization forms for target' do

data/test/rails_translation_manager/yaml_writer_test.rb

@@ -35,7 +35,7 @@ module RailsTranslationManager
 
       DummyWriter.new.write_yaml(output_file, data)
 
-      assert_match /\n$/, File.readlines(output_file).last
+      assert_match (/\n$/), File.readlines(output_file).last
     end
 
     test 'strips whitespace from the end of lines for consistency with code editors' do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rails_translation_manager
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.8.0
 platform: ruby
 authors:
 - GOV.UK Dev
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-07 00:00:00.000000000 Z
+date: 2024-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -163,7 +162,7 @@ files:
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
-- LICENSE.txt
+- LICENCE
 - README.md
 - Rakefile
 - config/locales/plurals.rb
@@ -221,7 +220,6 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -229,15 +227,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Tasks to manage translation files
 test_files: