From a2920d4035b08e4af251b95766c35c1acce878e1 Mon Sep 17 00:00:00 2001
From: Thilo Molitor <thilo@monal-im.org>
Date: Thu, 1 Aug 2024 23:41:41 +0200
Subject: [PATCH 1/2] Fix romanian language code

See these links:
https://github.com/fastlane/fastlane/issues/16625#issuecomment-658181756
https://github.com/fastlane/fastlane/issues/16625#issue-640591002
---
 appstore_metadata/{ro-RO => ro}/description.txt   | 0
 appstore_metadata/{ro-RO => ro}/keywords.txt      | 0
 appstore_metadata/{ro-RO => ro}/marketing_url.txt | 0
 appstore_metadata/{ro-RO => ro}/privacy_url.txt   | 0
 appstore_metadata/{ro-RO => ro}/support_url.txt   | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename appstore_metadata/{ro-RO => ro}/description.txt (100%)
 rename appstore_metadata/{ro-RO => ro}/keywords.txt (100%)
 rename appstore_metadata/{ro-RO => ro}/marketing_url.txt (100%)
 rename appstore_metadata/{ro-RO => ro}/privacy_url.txt (100%)
 rename appstore_metadata/{ro-RO => ro}/support_url.txt (100%)

diff --git a/appstore_metadata/ro-RO/description.txt b/appstore_metadata/ro/description.txt
similarity index 100%
rename from appstore_metadata/ro-RO/description.txt
rename to appstore_metadata/ro/description.txt
diff --git a/appstore_metadata/ro-RO/keywords.txt b/appstore_metadata/ro/keywords.txt
similarity index 100%
rename from appstore_metadata/ro-RO/keywords.txt
rename to appstore_metadata/ro/keywords.txt
diff --git a/appstore_metadata/ro-RO/marketing_url.txt b/appstore_metadata/ro/marketing_url.txt
similarity index 100%
rename from appstore_metadata/ro-RO/marketing_url.txt
rename to appstore_metadata/ro/marketing_url.txt
diff --git a/appstore_metadata/ro-RO/privacy_url.txt b/appstore_metadata/ro/privacy_url.txt
similarity index 100%
rename from appstore_metadata/ro-RO/privacy_url.txt
rename to appstore_metadata/ro/privacy_url.txt
diff --git a/appstore_metadata/ro-RO/support_url.txt b/appstore_metadata/ro/support_url.txt
similarity index 100%
rename from appstore_metadata/ro-RO/support_url.txt
rename to appstore_metadata/ro/support_url.txt

From d5d2bc82c47f175d0061491414d031b41e80500d Mon Sep 17 00:00:00 2001
From: Thilo Molitor <thilo@monal-im.org>
Date: Thu, 1 Aug 2024 23:53:04 +0200
Subject: [PATCH 2/2] Use localized appstore description as beta decription,
 too

---
 .github/workflows/beta.build-push.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/beta.build-push.yml b/.github/workflows/beta.build-push.yml
index 2f059537c..30132cbc2 100644
--- a/.github/workflows/beta.build-push.yml
+++ b/.github/workflows/beta.build-push.yml
@@ -155,9 +155,10 @@ jobs:
         id: appinfo
         run: |
           build_appinfo_entry() {
-            local escaped_marketing_url=$(cat ./appstore_metadata/en-US/marketing_url.txt | jq -sRr @json)
-            local escaped_privacy_policy_url=$(cat ./appstore_metadata/en-US/privacy_url.txt | jq -sRr @json)
-            local json="{\"feedback_email\": \"info@monal-im.org\", \"marketing_url\": $escaped_marketing_url, \"privacy_policy_url\": $escaped_privacy_policy_url, \"description\": \"\"}"
+            local escaped_marketing_url=$(cat ./appstore_metadata/$1/marketing_url.txt | jq -sRr @json)
+            local escaped_privacy_policy_url=$(cat ./appstore_metadata/$1/privacy_url.txt | jq -sRr @json)
+            local escaped_description=$(cat ./appstore_metadata/$1/description.txt | jq -sRr @json)
+            local json="{\"feedback_email\": \"info@monal-im.org\", \"marketing_url\": $escaped_marketing_url, \"privacy_policy_url\": $escaped_privacy_policy_url, \"description\": $escaped_description}"
             echo "$json"
           }
           
@@ -166,7 +167,7 @@ jobs:
           for dir in ./appstore_metadata/*/; do
             dir="$(basename "$dir")"
             if [[ -d "./appstore_metadata/$dir" && "$dir" == *-* ]]; then
-              json="$json\"${dir%/}\": $(build_appinfo_entry),"
+              json="$json\"${dir%/}\": $(build_appinfo_entry "${dir%/}"),"
             fi
           done
           json="${json%,}}"