Better bugfix for empty YAML files (only the language prefix)

translation · Feb 9, 2024 · 832762e · 832762e
1 parent 5b33dcd
commit 832762e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/lib/translation_io/client/init_operation/create_yaml_po_files_step.rb b/lib/translation_io/client/init_operation/create_yaml_po_files_step.rb
@@ -20,7 +20,7 @@ def run(params)
             TranslationIO.info file_path, 2, 2
             file_translations = TranslationIO.yaml_load(File.read(file_path))
 
-            unless file_translations.blank?
+            if file_translations.present? && file_translations.values.all? { |value| value.present? }
               all_translations = all_translations.deep_merge(file_translations)
             end
           end

diff --git a/lib/translation_io/client/sync_operation/create_yaml_pot_file_step.rb b/lib/translation_io/client/sync_operation/create_yaml_pot_file_step.rb
@@ -16,7 +16,7 @@ def run(params)
             TranslationIO.info file_path, 2, 2
             file_translations = TranslationIO.yaml_load(File.read(file_path))
 
-            unless file_translations.blank?
+            if file_translations.present? && file_translations.values.all? { |value| value.present? }
               all_translations = all_translations.deep_merge(file_translations)
             end
           end

diff --git a/lib/translation_io/yaml_conversion.rb b/lib/translation_io/yaml_conversion.rb
@@ -28,7 +28,7 @@ def get_flat_translations_for_yaml_file(file_path)
       def get_flat_translations_for_yaml_data(yaml_data)
         translations = TranslationIO.yaml_load(yaml_data)
 
-        if translations && translations.values.all? { |value| value.present? }
+        if translations.present? && translations.values.all? { |value| value.present? }
           return FlatHash.to_flat_hash(translations)
         else # loading an empty file, or file with only the language, returns false
           return {}

diff --git a/spec/translation/client/init_operation/create_yaml_po_files_step_spec.rb b/spec/translation/client/init_operation/create_yaml_po_files_step_spec.rb
@@ -29,7 +29,14 @@
 EOS
     end
 
-        File.open('tmp/config/locales/fr.yml', 'wb') do |file|
+    File.open("tmp/config/locales/empty.en.yml", 'wb') do |file|
+      file.write <<-EOS
+---
+en:
+EOS
+    end
+
+    File.open('tmp/config/locales/fr.yml', 'wb') do |file|
       file.write <<-EOS
 ---
 fr:

diff --git a/spec/translation/client/sync_operation/create_yaml_pot_file_step_spec.rb b/spec/translation/client/sync_operation/create_yaml_pot_file_step_spec.rb
@@ -24,6 +24,13 @@
 EOS
     end
 
+    File.open("#{yaml_locales_path}/empty.en.yml", 'wb') do |file|
+      file.write <<-EOS
+---
+en:
+EOS
+    end
+
     source_locale   = 'en'
     yaml_file_paths = Dir["#{yaml_locales_path}/*.yml"]