Merge pull request #10 from scribd/mwayne/skip-lang-detection

Mwayne/skip lang detection

Author: m-wayne

deliver/lib/deliver/options.rb

@@ -460,6 +460,12 @@ def self.available_options
                                      type: Boolean,
                                      optional: true,
                                      default_value: true),
+        FastlaneCore::ConfigItem.new(key: :skip_language_detection,
+                                     env_name: "SKIP_LANGUAGE_DETECTION",
+                                     description: "Skip language detection in App Store Connect and use the languages specified in the languages param",
+                                     type: Boolean,
+                                     optional: true,
+                                     default_value: false),
 
         # internal
         FastlaneCore::ConfigItem.new(key: :app,

deliver/lib/deliver/upload_metadata.rb

@@ -94,9 +94,9 @@ def upload
 
       enabled_languages = detect_languages
 
-      app_store_version_localizations = verify_available_version_languages!(app, enabled_languages) unless options[:edit_live]
       app_info = fetch_edit_app_info(app)
-      app_info_localizations = verify_available_info_languages!(app, app_info, enabled_languages) unless options[:edit_live] || !updating_localized_app_info?(app, app_info)
+      app_store_version_localizations = nil
+      app_info_localizations = nil
 
       if options[:edit_live]
         # not all values are editable when using live_version
@@ -120,6 +120,23 @@ def upload
         non_localised_options = NON_LOCALISED_VERSION_VALUES.keys
       end
 
+      unless options[:edit_live]
+        if options[:skip_language_detection]
+          # Do not create/enable additional locales; use what already exists on ASC
+          app_store_version_localizations = version.get_app_store_version_localizations
+        else
+          app_store_version_localizations = verify_available_version_languages!(app, enabled_languages)
+        end
+
+        if updating_localized_app_info?(app, app_info)
+          if options[:skip_language_detection]
+            app_info_localizations = app_info&.get_app_info_localizations
+          else
+            app_info_localizations = verify_available_info_languages!(app, app_info, enabled_languages)
+          end
+        end
+      end
+
       # Needed for to filter out release notes from being sent up
       number_of_versions = Spaceship::ConnectAPI.get_app_store_versions(
         app_id: app.id,

pilot/lib/pilot/build_manager.rb

@@ -528,6 +528,9 @@ def update_localized_app_review(build, info_by_lang, default_info: nil)
         default_info = info_by_lang.delete(:default)
       end
 
+      allowed = allowed_locales
+      info_by_lang.select! { |locale, _| allowed.include?(locale.to_s) } if allowed
+
       # Initialize hash of lang codes with info_by_lang keys
       localizations_by_lang = {}
       info_by_lang.each_key do |key|
@@ -542,6 +545,7 @@ def update_localized_app_review(build, info_by_lang, default_info: nil)
 
       # Create or update localized app review info
       localizations_by_lang.each do |lang_code, localization|
+        next if allowed && !allowed.include?(lang_code.to_s)
         info = info_by_lang[lang_code]
 
         info = default_info unless info
@@ -574,6 +578,9 @@ def update_localized_build_review(build, info_by_lang, default_info: nil)
         default_info = info_by_lang.delete(:default)
       end
 
+      allowed = allowed_locales
+      info_by_lang.select! { |locale, _| allowed.include?(locale.to_s) } if allowed
+
       # Initialize hash of lang codes with info_by_lang keys
       localizations_by_lang = {}
       info_by_lang.each_key do |key|
@@ -588,13 +595,23 @@ def update_localized_build_review(build, info_by_lang, default_info: nil)
 
       # Create or update localized app review info
       localizations_by_lang.each do |lang_code, localization|
+        next if allowed && !allowed.include?(lang_code.to_s)
         info = info_by_lang[lang_code]
 
         info = default_info unless info
         update_localized_build_review_for_lang(build, localization, lang_code, info) if info
       end
     end
 
+    def allowed_locales
+      langs = config[:languages]
+      langs ||= ENV["LANGUAGES"]
+      return nil unless langs
+
+      langs = langs.split(",") unless langs.kind_of?(Array)
+      langs.map { |l| l.to_s.strip }.reject(&:empty?)
+    end
+
     def update_localized_build_review_for_lang(build, localization, locale, info)
       attributes = {}
       attributes[:whatsNew] = self.class.sanitize_changelog(info[:whats_new]) if info.key?(:whats_new)

pilot/lib/pilot/options.rb

@@ -154,6 +154,11 @@ def self.available_options
                                          values.keys.each { |value| UI.user_error!("Invalid key '#{value}'") unless valid_keys.include?(value.to_s) }
                                        end
                                      end),
+        FastlaneCore::ConfigItem.new(key: :languages,
+                                     type: Array,
+                                     env_name: "LANGUAGES",
+                                     description: "List of locales permitted for localized build/app info (e.g. en-US,de-DE). If set, Pilot will ignore other locales when updating localized beta metadata",
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :changelog,
                                      short_option: "-w",
                                      optional: true,