Merge pull request #3496 from woocommerce/fix/5.8-metadata

Fix 5.8 metadata

Author: jkmassel

fastlane/Deliverfile

@@ -9,21 +9,14 @@
 # The Bundle Identifier in App Store Connect
 app_identifier "com.automattic.woocommerce"
 
-
 # This folder has to include one folder for each language
 screenshots_path "./fastlane/promo_screenshots/"
 
 # Make sure to update these keys for a new version
 app_version "5.8"
 
-privacy_url({
-  'default' => 'https://automattic.com/privacy/',
-})
-
 team_id "299112"
 
-copyright('2021 WooCommerce')
-
 skip_binary_upload true
 overwrite_screenshots true
 phased_release true

fastlane/download_metadata.swift

@@ -68,7 +68,7 @@ func downloadTranslation(languageCode: String, folderName: String) {
 
         jsonDict.forEach({ (key: String, value: Any) in
 
-            guard let index = key.index(of: Character(UnicodeScalar(0004))) else {
+            guard let index = key.firstIndex(of: Character(UnicodeScalar(0004))) else {
             	return
             }
 
@@ -105,22 +105,20 @@ func downloadTranslation(languageCode: String, folderName: String) {
         let fileManager = FileManager.default
         try? fileManager.createDirectory(atPath: languageFolder, withIntermediateDirectories: true, attributes: nil)
 
-        /// This sort of hack-ey – we're not actually downloading anything here, but the idea is
-        /// to keep all of the metadata generation code in the same place. By keeping this in the
-        /// same file, it should be easier to find, and update if necessary.
-        let marketingURL = "https://woocommerce.com/mobile/"
 
         do {
+            let releaseNotesPath = "\(languageFolder)/release_notes.txt"
+
+            /// Remove existing release notes in case they weren't translated for this release (that way `deliver` will fall back to the `default` locale)
+            if FileManager.default.fileExists(atPath: releaseNotesPath) {
+                try FileManager.default.removeItem(at: URL(fileURLWithPath: releaseNotesPath))
+            }
+
             try subtitle?.write(toFile: "\(languageFolder)/subtitle.txt", atomically: true, encoding: .utf8)
-            try whatsNew?.write(toFile: "\(languageFolder)/release_notes.txt", atomically: true, encoding: .utf8)
+            try whatsNew?.write(toFile: releaseNotesPath, atomically: true, encoding: .utf8)
             try keywords?.write(toFile: "\(languageFolder)/keywords.txt", atomically: true, encoding: .utf8)
             try storeDescription?.write(toFile: "\(languageFolder)/description.txt", atomically: true, encoding: .utf8)
             try promoText?.write(toFile: "\(languageFolder)/promotional_text.txt", atomically: true, encoding: .utf8)
-
-            // Don't add the marketing URL unless there's other metadata that's been downloaded
-            if try fileManager.contentsOfDirectory(atPath: languageFolder).count > 0 {
-                try marketingURL.write(toFile: "\(languageFolder)/marketing_url.txt", atomically: true, encoding: .utf8)
-            }
         } catch {
             print("  Error writing: \(error)")
         }
@@ -130,16 +128,6 @@ func downloadTranslation(languageCode: String, folderName: String) {
     sema.wait()
 }
 
-func deleteExistingMetadata() {
-    let fileManager = FileManager.default
-	let url = URL(fileURLWithPath: baseFolder, isDirectory: true)
-	try? fileManager.removeItem(at: url)	
-	try? fileManager.createDirectory(at: url, withIntermediateDirectories: false)
-}
-
-
-deleteExistingMetadata()
-
 languages.forEach( { (key: String, value: String) in
     downloadTranslation(languageCode: value, folderName: key)
 })

fastlane/metadata/ar-SA/apple_tv_privacy_policy.txt

@@ -0,0 +1 @@
+

fastlane/metadata/ar-SA/marketing_url.txt

@@ -1 +1 @@
-https://woocommerce.com/mobile/
+https://woocommerce.com/mobile/

fastlane/metadata/ar-SA/name.txt

@@ -0,0 +1 @@
+WooCommerce

fastlane/metadata/ar-SA/privacy_url.txt

@@ -0,0 +1 @@
+https://automattic.com/privacy/

fastlane/metadata/ar-SA/support_url.txt

@@ -0,0 +1 @@
+https://docs.woocommerce.com

fastlane/metadata/copyright.txt

@@ -0,0 +1 @@
+2021 WooCommerce

fastlane/metadata/de-DE/apple_tv_privacy_policy.txt

@@ -0,0 +1 @@
+

fastlane/metadata/de-DE/marketing_url.txt

@@ -1 +1 @@
-https://woocommerce.com/mobile/
+https://woocommerce.com/mobile/