fastlane-plugin-ovo_poeditor 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 051422ad4d30b1f8154f475883f0665e01e1db9a9f6fed969c003023e38b9e24
-  data.tar.gz: c9798a6ee87e8fa1b43a033ae28e600b9c486afd8c2d7acaf3353db909c0b206
+  metadata.gz: 4a6b97335c1077586b4617d579b464f8bc8134dd21d81eae54e9c3e8561513c6
+  data.tar.gz: ac35af035115242393ae1bd18e1ed7e1d5e92621470736a880b28dee4a96ae33
 SHA512:
-  metadata.gz: b2b34ca78e6c43ffc5e3d0e078d7c76165fb6611a9f347c2730f07fbbf322a514e49ed7c0f6221276664ad511a2898e1f56b5c1d4cb462085b0edf8b2e960b15
-  data.tar.gz: 0ec29fa34adfc6158442837519c01f0c5e715499d081a7b65b508fbeaa575ee2ac53d324ef26a02a02cc5cc02a2bd056a60855d10d3a9685ed97b6ce7635e408
+  metadata.gz: 94bf45f0d99fdd8e8656da176fe21d60738ea575347cbd5fdd2f8377b11e38b10bef638b8b80ee391532453134d786f0970e773ba9bd573971cb0106d668624a
+  data.tar.gz: 12f2c5c367e245ae76cb1d74a133523c395823ea3a822eea90fbaffe7e5ed0ede3529e61995a581e1869bd7f7f7da1848dcb8b9fa263c71c6479fb2e11461a8f

data/lib/fastlane/plugin/ovo_poeditor/actions/ovo_poeditor_strings_action.rb

@@ -14,6 +14,7 @@ module Fastlane
         default_language = params[:default_language]
         language_map = params[:language_map]
         unquoted_strings = params[:unquoted_strings]
+        bypass_default_language = params[:bypass_default_language]
 
         Helper::OvoPoeditorHelper.sync_strings(
           api_token: api_token,
@@ -24,7 +25,8 @@ module Fastlane
           file_name: file_name,
           default_language: default_language,
           language_map: language_map,
-          unquoted_strings: unquoted_strings
+          unquoted_strings: unquoted_strings,
+          bypass_default_language: bypass_default_language
         )
       end
 
@@ -33,16 +35,14 @@ module Fastlane
       end
 
       def self.authors
-        ['Alessio Arsuffi']
+        ['Alessio Arsuffi', 'Christian Borsato']
       end
 
       def self.return_value
-        # If your method provides a return value, you can describe here what it does
         'Return a file with all POEditor terms'
       end
 
       def self.details
-        # Optional:
         'Fetch latest POEditor terms and download them as .strings/.xml/.xcstrings file'
       end
 
@@ -93,26 +93,34 @@ module Fastlane
           FastlaneCore::ConfigItem.new(
             key: :default_language,
             env_name: 'POEDITOR_DEFAULT_LANGUAGE',
-            description: 'Default/fallback language code for the project',
+            description: 'Optional. Default/fallback language code for the project',
             optional: true,
             type: String
           ),
           FastlaneCore::ConfigItem.new(
             key: :language_map,
-            description: 'Map POEditor language codes to platform-specific folder names',
+            description: 'Optional. Map POEditor language codes to platform-specific folder names',
             optional: true,
             type: Hash
           ),
           FastlaneCore::ConfigItem.new(
             key: :unquoted_strings,
             env_name: 'POEDITOR_UNQUOTED_STRINGS',
-            description: 'Set to 1 to export Android strings without quotes (unquoted). Allowed values: 0 or 1',
+            description: 'Optional. Set to 1 to export Android strings without quotes (unquoted). Allowed values: 0 or 1',
             optional: true,
             type: Integer,
             default_value: 0,
             verify_block: proc do |value|
               UI.user_error!("unquoted_strings (POEDITOR_UNQUOTED_STRINGS) must be 0 or 1. Received: #{value}.") unless [0, 1].include?(value)
             end
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :bypass_default_language,
+            env_name: 'POEDITOR_BYPASS_DEFAULT_LANGUAGE',
+            description: 'Optional. Skip the default language check when the output path is built',
+            optional: true,
+            type: Boolean,
+            default_value: false
           )
         ]
       end

data/lib/fastlane/plugin/ovo_poeditor/helper/ovo_poeditor_helper.rb

@@ -21,7 +21,8 @@ module Fastlane
         file_name:,
         default_language:,
         language_map:,
-        unquoted_strings:
+        unquoted_strings:,
+        bypass_default_language:
       )
         unless @supported_export_types.include?(file_format)
           UI.error("Invalid export type '#{file_format}'. Allowed values: #{@supported_export_types.join(', ')}")
@@ -46,7 +47,7 @@ module Fastlane
           strings_data = download_file(export_url, language)
           next unless strings_data
 
-          output_path = build_output_path(output_dir, language, file_name, file_format, default_language, language_map)
+          output_path = build_output_path(output_dir, language, file_name, file_format, default_language, language_map, bypass_default_language)
 
           begin
             FileUtils.mkdir_p(File.dirname(output_path))
@@ -96,22 +97,24 @@ module Fastlane
         nil
       end
 
-      def self.build_output_path(base_dir, language, file_name, format, default_language, language_map)
+      def self.build_output_path(base_dir, language, file_name, format, default_language, language_map, bypass_default_language)
         if format == 'xcstrings'
           "#{base_dir}/#{file_name}"
         elsif format == 'apple_strings'
           "#{base_dir}/#{language}.lproj/#{file_name}"
-        elsif language == default_language
-          "#{base_dir}/values/#{file_name}"
-        else
-          mapped_language = language_map&.[](language.to_s)
-          values_folder = if mapped_language.nil? || mapped_language.empty?
-                            "values-#{language}"
-                          else
-                            "values-#{mapped_language}"
-                          end
-
-          "#{base_dir}/#{values_folder}/#{file_name}"
+        elsif format == 'android_strings'
+          if language == default_language && !bypass_default_language
+            "#{base_dir}/values/#{file_name}"
+          else
+            mapped_language = language_map&.[](language.to_s)
+            values_folder = if mapped_language.nil? || mapped_language.empty?
+                              "values-#{language}"
+                            else
+                              "values-#{mapped_language}"
+                            end
+
+            "#{base_dir}/#{values_folder}/#{file_name}"
+          end
         end
       end
     end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module OvoPoeditor
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-ovo_poeditor
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Alessio Arsuffi