translation 1.35 → 1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25024c8116a0d36bc5821cde349f43434bbe1e56b2e1d60ba022262c4a8d9b7f
-  data.tar.gz: c75ed4fe9ece108a76871d47fb606a0ab0551f53001b009ab0ae0069b0ec03dd
+  metadata.gz: 1aa63e584ea2e2064a46f87fdba20f387135bb3379c7ab85eaf6383a312cca59
+  data.tar.gz: d77f0d69b67ab0e112a7f27da673199fe091df0230643893356b38a67653145b
 SHA512:
-  metadata.gz: 7377de5d6b6133dca3cdb1ba8fbcd96e4d17c9c294ecff05c1233bc4f1936221b32f293c606298e24ca9b9408c9c4be2151e2c7114e26413bbf7996556b78adf
-  data.tar.gz: 84b2bda89cebcc32b655dd46210a8c4196e79a7e15588cb5c72956a9fe167d6cd9143d7d26e43064de790ad6671bf29030060fe8079127655123ae7516682dbe
+  metadata.gz: 483b2b4f922ed667b465d2a6ac551f0df46188c52859c2dc93951c2ea7f595af79055161e09ca88260bf23849514e0282257a02834455d768e264dcd6b39a5a3
+  data.tar.gz: 9b0fe16f145640b20add0c2476e01f335be0692c31b53041b4768c366c45ec80dd0be7fa13354895335afc5073ec95a457b193f86827a45f792ccbcb55395df6

data/README.md

@@ -1,4 +1,4 @@
-# [Translation.io](https://translation.io) client for Ruby on Rails
+# [Translation.io](https://translation.io/rails) client for Ruby on Rails
 
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
 [![Build Status](https://github.com/translation/rails/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/translation/rails/actions/workflows/test.yml)
@@ -10,7 +10,7 @@ Add this gem to localize your **Ruby on Rails** application.
 
 Use the official Rails syntax (with [YAML](#i18n-yaml) files) or use the [GetText](#gettext) syntax.
 
-Write only the source text, and keep it synchronized with your translators on [Translation.io](https://translation.io).
+Write only the source text, and keep it synchronized with your translators on [Translation.io](https://translation.io/rails).
 
 <a href="https://translation.io/rails">
   <img width="720px" alt="Translation.io interface" src="https://translation.io/gifs/translation.gif">
@@ -65,7 +65,7 @@ Need help? [contact@translation.io](mailto:contact@translation.io)
 
 ### I18n (YAML)
 
-The default [Rails Internationalization API](http://guides.rubyonrails.org/i18n.html).
+The default [Rails Internationalization API](https://guides.rubyonrails.org/i18n.html).
 
 ~~~ruby
 # Regular
@@ -128,7 +128,7 @@ More information about GetText syntax [here](https://github.com/ruby-gettext/get
 gem 'translation'
 ~~~
 
- 2. Create a new translation project [from the UI](https://translation.io).
+ 2. Create a new translation project [from the UI](https://translation.io/rails).
  3. Copy the initializer into your Rails app (`config/initializers/translation.rb`)
 
 The initializer looks like this:
@@ -144,7 +144,7 @@ end
  4. Initialize your project and push existing translations to Translation.io with:
 
 ~~~bash
-$ bundle exec rake translation:init
+bundle exec rake translation:init
 ~~~
 
 If you need to add or remove languages in the future, please read our
@@ -157,7 +157,7 @@ If you need to add or remove languages in the future, please read our
 To send new translatable keys/strings and get new translations from Translation.io, simply run:
 
 ~~~bash
-$ bundle exec rake translation:sync
+bundle exec rake translation:sync
 ~~~
 
 ### Sync and Show Purgeable
@@ -165,7 +165,7 @@ $ bundle exec rake translation:sync
 If you need to find out what are the unused keys/strings from Translation.io, using the current branch as reference:
 
 ~~~bash
-$ bundle exec rake translation:sync_and_show_purgeable
+bundle exec rake translation:sync_and_show_purgeable
 ~~~
 
 As the name says, this operation will also perform a sync at the same time.
@@ -175,7 +175,7 @@ As the name says, this operation will also perform a sync at the same time.
 If you need to remove unused keys/strings from Translation.io, using the current branch as reference:
 
 ~~~bash
-$ bundle exec rake translation:sync_and_purge
+bundle exec rake translation:sync_and_purge
 ~~~
 
 As the name says, this operation will also perform a sync at the same time.
@@ -274,7 +274,7 @@ The `set_locale` code is [here](https://github.com/translation/rails/blob/master
 feel free to override it with your own locale management.
 
 Don't forget to define your available locales with
-[I18n.available_locales](http://guides.rubyonrails.org/i18n.html#setup-the-rails-application-for-internationalization).
+[I18n.available_locales](https://guides.rubyonrails.org/i18n.html#setup-the-rails-application-for-internationalization).
 
 More examples here: https://translation.io/blog/set-current-locale-in-your-rails-app
 
@@ -348,7 +348,7 @@ In both case, in your React component, you can simply call
 ### Using our official React & JavaScript package
 
 As Translation.io is directly integrated in the great
-[Lingui](https://lingui.js.org/) internationalization framework,
+[Lingui](https://lingui.dev/) internationalization framework,
 you can also consider frontend localization as a completely different
 localization project.
 
@@ -368,7 +368,7 @@ a queue but it returns an error under heavy load), we implemented this
 threadsafe readonly task:
 
 ~~~bash
-$ bundle exec rake translation:sync_readonly
+bundle exec rake translation:sync_readonly
 ~~~
 
 This task will prevent your CI from failing and still provide new translations. But
@@ -442,7 +442,7 @@ with percent signs or spaces) that he might break.
 We think localization is part of the configuration of the app and it should not reach the translator UI at all.
 That's why these localization keys are detected and separated on a dedicated YAML file with Translation.io.
 
-We automatically treat [known localization keys](lib/translation_io/yaml_entry.rb), but if you would like
+We automatically treat [known localization keys](https://github.com/translation/rails/blob/master/lib/translation_io/yaml_entry.rb), but if you would like
 to add some more, use the `localization_key_prefixes` option.
 
 For example:
@@ -461,8 +461,8 @@ If you are using GetText and you want to manage other file formats than:
 
  * `rb`, `ruby` and `rabl` for Ruby.
  * `erb` and `inky` for Ruby templating.
- * `haml` and `mjmlhaml` for [HAML](http://haml.info/).
- * `slim` and `mjmlslim` for [SLIM](http://slim-lang.com/).
+ * `haml` and `mjmlhaml` for [HAML](https://haml.info/).
+ * `slim` and `mjmlslim` for [SLIM](https://github.com/slim-template/slim).
 
 Just add them in your configuration file like this:
 
@@ -587,7 +587,7 @@ This gem was created specifically for Rails, but you can also use it in a pure R
 To run the specs:
 
 ~~~bash
-$ bundle exec rspec
+bundle exec rspec
 ~~~
 
 ## Contributing
@@ -626,7 +626,7 @@ Credits: [@armandsar](https://github.com/armandsar), [@michaelhoste](https://git
 Officially supported on [https://translation.io/lingui](https://translation.io/lingui)
 
 Translation.io is directly integrated in the great
-[Lingui](https://lingui.js.org/) internationalization project.
+[Lingui](https://lingui.dev/) internationalization project.
 
  * GitHub: https://github.com/translation/lingui
  * NPM: https://www.npmjs.com/package/@translation/lingui
@@ -656,6 +656,6 @@ if you need some help or if you want to share your library.
 ## License
 
 The [translation gem](https://rubygems.org/gems/translation) in released under MIT license by
-[Aurélien Malisart](http://aurelien.malisart.be) and [Michaël Hoste](https://80limit.com) (see [LICENSE](LICENSE) file).
+[Aurélien Malisart](https://aurelien.malisart.be) and [Michaël Hoste](https://80limit.com) (see [LICENSE](LICENSE) file).
 
 (c) [https://translation.io](https://translation.io) / [contact@translation.io](mailto:contact@translation.io)

data/lib/translation_io/client/init_operation/cleanup_yaml_files_step.rb

@@ -12,30 +12,28 @@ module TranslationIO
         def run
           @yaml_file_paths.each do |locale_file_path|
             if locale_file_removable?(locale_file_path)
-              if File.exist?(locale_file_path)
-                content_hash        = TranslationIO.yaml_load(File.read(locale_file_path)) || {}
-                source_content_hash = content_hash.select { |k| k.to_s == @source_locale.to_s }
+              content_hash        = TranslationIO.yaml_load(File.read(locale_file_path)) || {}
+              source_content_hash = content_hash.reject { |k| k.to_s.in?(@target_locales.collect(&:to_s)) }
 
-                if source_content_hash.empty?
-                  TranslationIO.info "Removing #{locale_file_path}", 2, 2
-                  FileUtils.rm(locale_file_path)
-                elsif content_hash != source_content_hash # in case of mixed languages in source YAML file
-                  TranslationIO.info "Rewriting #{locale_file_path}", 2, 2
+              if source_content_hash.empty?
+                TranslationIO.info "Removing #{locale_file_path}", 2, 2
+                FileUtils.rm(locale_file_path)
+              elsif content_hash != source_content_hash # in case of mixed languages in source YAML file
+                TranslationIO.info "Rewriting #{locale_file_path}", 2, 2
 
-                  if TranslationIO.config.yaml_line_width
-                    file_content = source_content_hash.to_yaml(:line_width => TranslationIO.config.yaml_line_width)
-                  else
-                    file_content = source_content_hash.to_yaml
-                  end
+                if TranslationIO.config.yaml_line_width
+                  file_content = source_content_hash.to_yaml(:line_width => TranslationIO.config.yaml_line_width)
+                else
+                  file_content = source_content_hash.to_yaml
+                end
 
-                  file_content = file_content.gsub(/ $/, '') # remove trailing spaces
+                file_content = file_content.gsub(/ $/, '') # remove trailing spaces
 
-                  File.open(locale_file_path, 'wb') do |file|
-                    file.write(file_content)
-                  end
-                else
-                  # don't touch source
+                File.open(locale_file_path, 'wb') do |file|
+                  file.write(file_content)
                 end
+              else
+                # don't touch source
               end
             end
           end
@@ -44,6 +42,7 @@ module TranslationIO
         private
 
         def locale_file_removable?(locale_file_path)
+          exists     = File.exist?(locale_file_path)
           in_project = locale_file_path_in_project?(locale_file_path)
 
           protected_file = @target_locales.any? do |target_locale|
@@ -55,7 +54,7 @@ module TranslationIO
             paths.include?(TranslationIO.normalize_path(locale_file_path))
           end
 
-          in_project && !protected_file
+          exists && in_project && !protected_file
         end
 
         def locale_file_path_in_project?(locale_file_path)

data/lib/translation_io/extractor.rb

@@ -1,7 +1,7 @@
 module TranslationIO
   module Extractor
     # visual:                          https://www.debuggex.com/r/fYSQ-jwQfTjhhE6T
-    # .*? is non-greedy (lazy) match : http://stackoverflow.com/a/1919995/1243212
+    # .*? is non-greedy (lazy) match : https://stackoverflow.com/a/1919995/1243212
     REGEXP_INSIDE_1  = '\s*(?:\[?(?:(?:(?:".*?")|(?:\'.*?\'))\s*?,?\s*?){1}\]?)\s*?'
     REGEXP_INSIDE_2  = '\s*(?:\[?(?:(?:(?:".*?")|(?:\'.*?\'))\s*?,?\s*?){2}\]?),?\s*?.*?\s*'
     REGEXP_INSIDE_2B = '\s*(?:\[?(?:(?:(?:".*?")|(?:\'.*?\'))\s*?,?\s*?){2}\]?)\s*?'

data/lib/translation_io/tasks.rb

@@ -50,7 +50,7 @@ namespace :translation do
       true
     else
       TranslationIO.info("[Error] Can't configure client. Did you set up the initializer?\n"\
-                         "Read usage instructions here : http://translation.io/usage")
+                         "Read usage instructions here : https://translation.io/rails/usage")
       false
     end
   end

data/lib/translation_io/yaml_entry.rb

@@ -39,9 +39,7 @@ module TranslationIO
       end
 
       def localization_prefix?(key)
-        localization_key_prefixes.any? do |prefix|
-          key_without_locale(key).match(/^#{Regexp.escape(prefix)}\b/) != nil
-        end
+        localization_key_prefixes.any? { |prefix| key_without_locale(key).match(/^#{Regexp.escape(prefix)}\b/) != nil }
       end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translation
 version: !ruby/object:Gem::Version
-  version: '1.35'
+  version: '1.37'
 platform: ruby
 authors:
 - Michael Hoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2023-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext
@@ -23,7 +23,7 @@ dependencies:
         version: 3.2.5
     - - "<="
       - !ruby/object:Gem::Version
-        version: 3.4.3
+        version: 3.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -36,7 +36,7 @@ dependencies:
         version: 3.2.5
     - - "<="
       - !ruby/object:Gem::Version
-        version: 3.4.3
+        version: 3.4.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/translation/rails/issues
   changelog_uri: https://github.com/translation/rails/blob/master/CHANGELOG.md
-  documentation_uri: https://translation.io/usage
+  documentation_uri: https://translation.io/rails/usage
   homepage_uri: https://translation.io
   source_code_uri: https://github.com/translation/rails
 post_install_message: