translation 1.30 → 1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c549c4dffebafe002a5ee128ef1fdfd695f1d829db5f888878e002d50208d59b
-  data.tar.gz: c4f73bdff11f801c63fda611f00c9b1a1c122c323527e21f730bcd888dc8fe07
+  metadata.gz: 186fe35e21fca5df7945cce6f444396496bfafeafacad620c9f3ddfc4870f238
+  data.tar.gz: 63f7e4ffd3ff3634ca1601d5aafd9f9ca6e029b78a60ffcc4cc1ca164056661d
 SHA512:
-  metadata.gz: c2a10e981f76aaa817e1e88f7fa020f406cbd77e0bc79781d8b13d74310fe01e7eb5ac290b871d370729b228178e45f245a822194ed6007c2341ee99d90ec449
-  data.tar.gz: 2198c2eb0111f19194a9641564c037e172c895fc7c6877a05b0fc8b2514c43ee536732614fd2b98470565194f6854f913231833c74af33f866b414e5dc9f4639
+  metadata.gz: 95d72a1cf231462570c6e9fd8fa67055b6245b4b76f733b2398ebfc484c7885199c57651973a85af47c2d413eaae8eed43762ee0aed7b72d1909c0fe7268e0a2
+  data.tar.gz: 142b2e7206fff2e3eafc2d3581396aaa37ad6c6acf64869d99a2e83f7ac12a3286d048e1b26250de25a1f96f631c058398a66c1e0eb7d9c3db0fe2cbfe868333

data/README.md

@@ -52,6 +52,7 @@ Table of contents
    * [Paths where locales are stored (not recommended)](#paths-where-locales-are-stored-not-recommended)
    * [GetText Object Class Monkey-Patching](#gettext-object-class-monkey-patching)
  * [Pure Ruby (without Rails)](#pure-ruby-without-rails)
+ * [Limitations](#limitations)
  * [Testing](#testing)
  * [Contributing](#contributing)
  * [List of clients for Translation.io](#list-of-clients-for-translationio)
@@ -582,6 +583,33 @@ This gem was created specifically for Rails, but you can also use it in a pure R
 
 (Thanks [@kubaw](https://github.com/kubaw) for this snippet!)
 
+## Limitations
+
+If you localize `.erb` files with the [GetText syntax](#gettext), please avoid
+the use of `case` and `when` that are not correctly parsed by ERB.
+
+This syntax will break and your file will be ignored:
+
+```erb
+<% case @state %>
+<% when 'received' %>
+```
+
+Instead, use `if`/`elsif` or this `case` syntax:
+
+```erb
+<% 
+case @state
+when 'received'
+%>
+```
+
+These are the related discussions: [ruby/erb#4](https://github.com/ruby/erb/issues/4) and [translation/rails#44](https://github.com/translation/rails/issues/44).
+
+There is currently an open PR ([ruby-gettext/gettext#91](https://github.com/ruby-gettext/gettext/pull/91)), switching ERB for [Erubi](https://github.com/jeremyevans/erubi), 
+that is waiting to be merged into GetText, but it may have unknown undesirable  
+side effects.
+
 ## Testing
 
 To run the specs:

data/lib/translation.rb

@@ -93,6 +93,15 @@ module TranslationIO
       File.expand_path(relative_or_absolute_path).gsub("#{Dir.pwd}/", '')
     end
 
+    # Cf. https://github.com/translation/rails/issues/47
+    def yaml_load(source)
+      begin
+        YAML.load(source, :aliases => true) || {}
+      rescue ArgumentError
+        YAML.load(source) || {}
+      end
+    end
+
     def version
       Gem::Specification::find_by_name('translation').version.to_s
     end

data/lib/translation_io/client/base_operation/save_special_yaml_files_step.rb

@@ -43,7 +43,7 @@ module TranslationIO
 
             # To have a localization.xx.yml file during tests (without call to backend)
             if TranslationIO.config.test
-              if YAML::load(yaml_data).present?
+              if TranslationIO.yaml_load(yaml_data).present?
                 File.open(yaml_path, 'wb') do |file|
                   file.write(self.class.top_comment)
                   file.write(yaml_data)
@@ -64,7 +64,7 @@ module TranslationIO
                 yaml_path = File.join(@yaml_locales_path, "localization.#{target_locale}.yml")
                 yaml_data = parsed_response["yaml_data_#{target_locale}"]
 
-                if yaml_data.present? && YAML::load(yaml_data).present?
+                if yaml_data.present? && TranslationIO.yaml_load(yaml_data).present?
                   File.open(yaml_path, 'wb') do |file|
                     file.write(self.class.top_comment)
                     file.write(yaml_data)

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

@@ -13,7 +13,7 @@ module TranslationIO
           @yaml_file_paths.each do |locale_file_path|
             if locale_file_removable?(locale_file_path)
               if File.exist?(locale_file_path)
-                content_hash        = YAML::load(File.read(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 }
 
                 if source_content_hash.empty?

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

@@ -18,7 +18,7 @@ module TranslationIO
 
           @yaml_file_paths.each do |file_path|
             TranslationIO.info file_path, 2, 2
-            file_translations = YAML::load(File.read(file_path))
+            file_translations = TranslationIO.yaml_load(File.read(file_path))
 
             unless file_translations.blank?
               all_translations = all_translations.deep_merge(file_translations)

data/lib/translation_io/client/sync_operation/apply_yaml_source_edits_step.rb

@@ -46,7 +46,7 @@ module TranslationIO
           if yaml_sources_reload_needed?
             @yaml_sources = sort_by_project_locales_first(@yaml_file_paths).collect do |yaml_file_path|
               yaml_content   = File.read(yaml_file_path)
-              yaml_hash      = YAML::load(yaml_content)
+              yaml_hash      = TranslationIO.yaml_load(yaml_content)
               yaml_flat_hash = FlatHash.to_flat_hash(yaml_hash)
 
               {
@@ -138,7 +138,7 @@ module TranslationIO
               timestamps = metadata_content.scan(/timestamp: (\d*)/).flatten.uniq.collect(&:to_i)
               return timestamps.min || 0
             else
-              return YAML::load(metadata_content)['timestamp'] rescue 0
+              return YAML.load(metadata_content)['timestamp'] rescue 0
             end
           else
             return 0

data/lib/translation_io/client/sync_operation/create_yaml_pot_file_step.rb

@@ -14,7 +14,7 @@ module TranslationIO
 
           @yaml_file_paths.each do |file_path|
             TranslationIO.info file_path, 2, 2
-            file_translations = YAML::load(File.read(file_path))
+            file_translations = TranslationIO.yaml_load(File.read(file_path))
 
             unless file_translations.blank?
               all_translations = all_translations.deep_merge(file_translations)

data/lib/translation_io/yaml_conversion.rb

@@ -26,7 +26,7 @@ module TranslationIO
       end
 
       def get_flat_translations_for_yaml_data(yaml_data)
-        translations = YAML::load(yaml_data)
+        translations = TranslationIO.yaml_load(yaml_data)
 
         if translations
           return FlatHash.to_flat_hash(translations)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translation
 version: !ruby/object:Gem::Version
-  version: '1.30'
+  version: '1.31'
 platform: ruby
 authors:
 - Michael Hoste
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext