fastlane-plugin-translate_gpt 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c370098458b2bc0d453de5101fa0a1f3273947cd41bc953bb94cf74f5ad58d6f
-  data.tar.gz: 96cccf7814b8796119d08340cca72089dea6c48a177df111b52bb2b1196ee756
+  metadata.gz: 7e90607f83a3e801607d88f8dd41a7473dd5d1079c93e0e7cb02b784690e25ea
+  data.tar.gz: 5bfcd52847bb949ca1b6d54754b32445fed9c8b4bb7c00fc6bc1022f467b0d8d
 SHA512:
-  metadata.gz: 5d07f6a7c6a9351b633781d53ddd40e1a432a62bd270d9df8223d40d33b8ae5034123b430db52498a97c462baf5841f7d828df582a9e3cfd4767d83e064ef7ff
-  data.tar.gz: e5e90093831fa83665f98b302ca433f5e04e5765f74c6a0a0fd5972fcad3dbaf690657e0136acf7ab0f49f253117a5b4deb6ab23b5e209507871b1376d59de2f
+  metadata.gz: 2e3db9949838d419d8debc85b602888cfd23b8f5f079d0ef521f1ac2fe7c542867d707664bf99202ec32c500bed32fa49a5cfb0bc7f77edf053b591048377bd9
+  data.tar.gz: 5d6add66793788842c1ff153a2556adf7d3de8cf8f97cb5c066a3aeb174dda55ad405f3fd71c3c041ebacf4a7df99185c3dc3e41dcfe2c6c9fd34e3ce27d5c8f

data/lib/fastlane/plugin/translate_gpt/actions/translate_gpt_action.rb

@@ -84,7 +84,9 @@ module Fastlane
             description: "The path to the Localizable.strings file to be translated",
             verify_block: proc do |value|
               UI.user_error!("Invalid file path: #{value}") unless File.exist?(value)
-              UI.user_error!("Translation file must have .strings extension") unless File.extname(value) == ".strings"
+              extension = File.extname(value)
+              available_extensions = [".strings", ".xcstrings"]
+              UI.user_error!("Translation file must have any of these extensions: #{available_extensions}") unless available_extensions.include? extension
             end
           ),
           FastlaneCore::ConfigItem.new(
@@ -93,7 +95,9 @@ module Fastlane
             description: "Path to the translation file to update",
             verify_block: proc do |value|
               UI.user_error!("Invalid file path: #{value}") unless File.exist?(value)
-              UI.user_error!("Translation file must have .strings extension") unless File.extname(value) == ".strings"
+              extension = File.extname(value)
+              available_extensions = [".strings", ".xcstrings"]
+              UI.user_error!("Translation file must have any of these extensions: #{available_extensions}") unless available_extensions.include? extension
             end
           ),    
           FastlaneCore::ConfigItem.new(

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

@@ -16,13 +16,30 @@ module Fastlane
         @timeout = params[:request_timeout]
       end
 
-      # Get the strings from a file
-      def prepare_hashes() 
+      def prepare_xcstrings() 
+        @xcfile = LocoStrings.load(@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]) }
+        end 
+      end
+
+      def prepare_strings() 
         @input_hash = get_strings(@params[:source_file])
         @output_hash = get_strings(@params[:target_file])
         @to_translate = filter_translated(@params[:skip_translated], @input_hash, @output_hash)
       end
 
+      # Get the strings from a file
+      def prepare_hashes() 
+        if File.extname(@params[:source_file]) == ".xcstrings"
+          prepare_xcstrings() 
+        else
+          prepare_strings() 
+        end
+      end
+
       # Log information about the input strings
       def log_input(bunch_size) 
         @translation_count = @to_translate.size
@@ -66,6 +83,7 @@ module Fastlane
       def translate_bunch_of_strings(bunch_size)
         bunch_index = 0
         number_of_bunches = (@translation_count / bunch_size.to_f).ceil
+        @keys_associations = {}
         @to_translate.each_slice(bunch_size) do |bunch|
           prompt = prepare_bunch_prompt bunch
           max_retries = 10
@@ -109,7 +127,7 @@ module Fastlane
       def prepare_bunch_prompt(strings)
         prompt = "I want you to act as a translator for a mobile application strings. " + \
             "Try to keep length of the translated text. " + \
-            "You need to answer only with the translation and nothing else until I say to stop it."
+            "You need to response with a JSON only with the translation and nothing else until I say to stop it. "
         if @params[:context] && !@params[:context].empty?
           prompt += "This app is #{@params[:context]}. "
         end
@@ -122,7 +140,9 @@ module Fastlane
           if context && !context.empty?
             string_hash["context"] = context
           end
-          string_hash["key"] = string.key
+          key = transform_string(string.key)
+          @keys_associations[key] = string.key
+          string_hash["key"] = key
           string_hash["string_to_translate"] = string.value
           json_hash << string_hash
         end
@@ -132,6 +152,12 @@ module Fastlane
         return prompt
       end
 
+      def transform_string(input_string)
+        uppercased_string = input_string.upcase
+        escaped_string = uppercased_string.gsub(/[^0-9a-zA-Z]+/, '_')
+        return escaped_string
+      end
+
       # Request a translation from the GPT API
       def request_translate(key, string, prompt, index)
         response = @client.chat(
@@ -181,7 +207,13 @@ module Fastlane
         else
           target_string = response.dig("choices", 0, "message", "content")
           json_string = target_string[/\[[^\[\]]*\]/m]
-          json_hash = JSON.parse(json_string)
+          begin
+            json_hash = JSON.parse(json_string)
+          rescue => error
+            UI.error "#{index_log} Error parsing JSON: #{error}"
+            UI.error "#{index_log} JSON: \"#{json_string}\""
+            return
+          end
           keys_to_translate = json_hash.map { |string_hash| string_hash["key"] }
           json_hash.each do |string_hash|
             key = string_hash["key"]
@@ -190,9 +222,10 @@ module Fastlane
             string_hash.delete("context")
             translated_string = string_hash.values.first
             if key && !key.empty? && translated_string && !translated_string.empty?
-              UI.message "#{index_log} Translating #{key} - #{translated_string}"
-              string = LocoStrings::LocoString.new(key, translated_string, context)
-              @output_hash[key] = string
+              real_key = @keys_associations[key]
+              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
           end
@@ -209,12 +242,20 @@ module Fastlane
         target_string = Colorizer::colorize(@params[:target_file], :white)
         UI.message "Writing #{number_of_strings} strings to #{target_string}..."
 
-        file = LocoStrings.load(@params[:target_file])
-        file.read
-        @output_hash.each do |key, value|
-          file.update(key, value.value, value.comment)
+        if @xcfile.nil?
+          file = LocoStrings.load(@params[:target_file])
+          file.read
+          @output_hash.each do |key, value|
+            file.update(key, value.value, value.comment)
+          end
+          file.write
+        else
+          @xcfile.update_file_path(@params[:target_file])
+          @output_hash.each do |key, value|
+            @xcfile.update(key, value.value, value.comment, @params[:target_language])
+          end
+          @xcfile.write
         end
-        file.write
       end
 
       # Read the strings file into a hash

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-translate_gpt
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Aleksei Cherepanov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-02 00:00:00.000000000 Z
+date: 2023-11-16 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.1
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: This fastlane plugin provides an easy way to use the OpenAI GPT language