fastlane-plugin-translate_gpt 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e90607f83a3e801607d88f8dd41a7473dd5d1079c93e0e7cb02b784690e25ea
-  data.tar.gz: 5bfcd52847bb949ca1b6d54754b32445fed9c8b4bb7c00fc6bc1022f467b0d8d
+  metadata.gz: 5e16882ee4e890369a5c14b579f362303a3196e4238d4d3b3f685a9e6b4fb21a
+  data.tar.gz: 59719d66698e72c02ae4c625a68a9b5fe8d7dfc34023a5c329d0625bed27b2e9
 SHA512:
-  metadata.gz: 2e3db9949838d419d8debc85b602888cfd23b8f5f079d0ef521f1ac2fe7c542867d707664bf99202ec32c500bed32fa49a5cfb0bc7f77edf053b591048377bd9
-  data.tar.gz: 5d6add66793788842c1ff153a2556adf7d3de8cf8f97cb5c066a3aeb174dda55ad405f3fd71c3c041ebacf4a7df99185c3dc3e41dcfe2c6c9fd34e3ce27d5c8f
+  metadata.gz: 23f15a4ca667b24e958ca6775cd6894dc43b85ecf3e705f4270526af2428a1e7a947824b0bbf74132dbc0fa55059edd9020f1dad10946f5e345ae2d69d7997ac
+  data.tar.gz: d94703743059519b4e3c17ea988a7591c8f67b981d3d38a075ed8fc801ce952509c146e3fb3f92207102680b490cefbc103f325da85c0f7c7e1c2e0281255e0b

data/lib/fastlane/plugin/translate_gpt/helper/translate_gpt_helper.rb

@@ -1,6 +1,7 @@
 require 'fastlane_core/ui/ui'
-require 'loco_strings'
+require 'loco_strings/parsers/xcstrings_file'
 require 'json'
+# rubocop:disable all
 
 module Fastlane
   UI = FastlaneCore::UI unless Fastlane.const_defined?("UI")
@@ -17,14 +18,34 @@ module Fastlane
       end
 
       def prepare_xcstrings() 
-        @xcfile = LocoStrings.load(@params[:source_file])
+        @xcfile = LocoStrings::XCStringsFile.new @params[:source_file]
         @output_hash = {}
         @to_translate = @xcfile.read
+        
         if @params[:skip_translated] == true
-          @to_translate = @to_translate.reject { |k, v| @xcfile.value(v.key, @params[:target_language]) }
+          @to_translate = @to_translate.reject { |k, original| 
+            !check_value_for_translate(
+              @xcfile.unit(k, @params[:target_language]),
+              original
+            )
+          }
         end 
       end
 
+      def check_value_for_translate(string, orignal_string)
+        return true unless string 
+        if string.is_a? LocoStrings::LocoString
+          return false if orignal_string.value.nil? || orignal_string.value.empty?
+          return string.value.empty?
+        elsif string.is_a? LocoStrings::LocoVariantions
+          orignal_string.strings.each do |key, _|
+            return true unless string.strings.has_key?(key)
+            return true if string.strings[key].value.empty?
+          end
+        end
+        return false
+      end
+
       def prepare_strings() 
         @input_hash = get_strings(@params[:source_file])
         @output_hash = get_strings(@params[:target_file])
@@ -86,6 +107,10 @@ module Fastlane
         @keys_associations = {}
         @to_translate.each_slice(bunch_size) do |bunch|
           prompt = prepare_bunch_prompt bunch
+          if prompt.empty?
+            UI.important "Empty prompt, skipping bunch"
+            next
+          end
           max_retries = 10
           times_retried = 0
 
@@ -135,20 +160,37 @@ module Fastlane
 
         json_hash = []
         strings.each do |key, string|
+          UI.message "Translating #{key} - #{string}"
+          next if string.nil?
+
           string_hash = {}
           context = string.comment
-          if context && !context.empty?
-            string_hash["context"] = context
-          end
+          string_hash["context"] = context if context && !context.empty?
+
           key = transform_string(string.key)
           @keys_associations[key] = string.key
           string_hash["key"] = key
-          string_hash["string_to_translate"] = string.value
+
+          if string.is_a? LocoStrings::LocoString
+            next if string.value.nil? || string.value.empty?
+            string_hash["string_to_translate"] = string.value
+          elsif string.is_a? LocoStrings::LocoVariantions
+            variants = {}
+            string.strings.each do |key, variant|
+              next if variant.nil? || variant.value.nil? || variant.value.empty?
+              variants[key] = variant.value
+            end
+            string_hash["strings_to_translate"] = variants
+          else 
+            UI.warning "Unknown type of string: #{string.key}"
+          end
           json_hash << string_hash
         end
+        return '' if json_hash.empty?
         prompt += "'''\n"
         prompt += json_hash.to_json
         prompt += "\n'''"
+        UI.message "Prompt: #{prompt}"
         return prompt
       end
 
@@ -221,13 +263,21 @@ module Fastlane
             string_hash.delete("key")
             string_hash.delete("context")
             translated_string = string_hash.values.first
-            if key && !key.empty? && translated_string && !translated_string.empty?
-              real_key = @keys_associations[key]
+            return unless key && !key.empty? 
+            real_key = @keys_associations[key]
+            if translated_string.is_a? Hash
+              strings = {}
+              translated_string.each do |pl_key, value|
+                UI.message "#{index_log} Translating #{real_key} > #{pl_key} - #{value}"
+                strings[pl_key] = LocoStrings::LocoString.new(pl_key, value, context)
+              end
+              string = LocoStrings::LocoVariantions.new(real_key, strings, context)
+            elsif translated_string && !translated_string.empty?
               UI.message "#{index_log} Translating #{real_key} - #{translated_string}"
               string = LocoStrings::LocoString.new(real_key, translated_string, context)
-              @output_hash[real_key] = string
-              keys_to_translate.delete(key)
             end
+            @output_hash[real_key] = string
+            keys_to_translate.delete(key)
           end
 
           if keys_to_translate.length > 0
@@ -252,7 +302,13 @@ module Fastlane
         else
           @xcfile.update_file_path(@params[:target_file])
           @output_hash.each do |key, value|
-            @xcfile.update(key, value.value, value.comment, @params[:target_language])
+            if value.is_a? LocoStrings::LocoString
+              @xcfile.update(key, value.value, value.comment, "translated", @params[:target_language])
+            elsif value.is_a? LocoStrings::LocoVariantions
+              value.strings.each do |pl_key, variant|
+                @xcfile.update_variation(key, pl_key, variant.value, variant.comment, "translated", @params[:target_language])
+              end
+            end
           end
           @xcfile.write
         end
@@ -333,3 +389,5 @@ module Fastlane
     end
   end
 end
+
+# rubocop:enable all

data/lib/fastlane/plugin/translate_gpt/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module TranslateGpt
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-translate_gpt
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Aleksei Cherepanov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-16 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-openai
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement