Skip to content

Commit 4a562ca

Browse files
tmolitor-stud-tutmolitor-stud-tu
authored
6.4.15-b1 (#1504)
- Add Telugo translations - Add Czech appstore translation - Make Appstore metadata translatable via Weblate - Make Appstore changelog entries translatable via Weblate - Improve MAM error messages - Show additional confirmation dialog before sharing location in a chat
2 parents 720a3af + 838ff00 commit 4a562ca

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+387
-255
lines changed

‎.github/workflows/beta.build-push.yml‎

Lines changed: 59 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,39 @@ jobs:
106106
echo "__EOF__" | tee /dev/stderr >> "$OUTPUT_FILE"
107107
108108
cat "$OUTPUT_FILE" >> "$GITHUB_OUTPUT"
109+
- name: Update changelog translation repo
110+
env:
111+
buildVersion: ${{ steps.releasenotes.outputs.buildVersion }}
112+
changelog: ${{ steps.releasenotes.outputs.notes }}
113+
run: |
114+
echo ""
115+
echo "**********************************************************"
116+
echo "* Cloning and resetting changelog translation repository *"
117+
echo "**********************************************************"
118+
if [[ -e "Monal-localization-changelog" ]]; then
119+
rm -rf Monal-localization-changelog
120+
fi
121+
git clone git@changelog.translation.repo:monal-im/Monal-localization-changelog.git
122+
123+
echo ""
124+
echo "******************************"
125+
echo "* Updating changelog strings *"
126+
echo "******************************"
127+
echo -n "$changelog" | scripts/update_changelog_repo.py --base-json "./Monal-localization-changelog/translations/changelog/en-US.json" --version "$buildVersion"
128+
cd Monal-localization-changelog
129+
git diff
130+
git add -u
131+
git commit -m "Updated en-US changelog while building beta release" || true
132+
git log -n 2
133+
git remote --verbose
134+
git push
135+
cd ..
136+
137+
echo ""
138+
echo "***************"
139+
echo "* Cleaning up *"
140+
echo "***************"
141+
rm -rf Monal-localization-changelog
109142
- name: Insert buildNumber and version into plists
110143
env:
111144
buildNumber: ${{ steps.releasenotes.outputs.buildNumber }}
@@ -170,31 +203,39 @@ jobs:
170203
id: appinfo
171204
run: |
172205
build_appinfo_entry() {
173-
local escaped_marketing_url=$(cat ./appstore_metadata/$1/marketing_url.txt | jq -sRr @json)
174-
local escaped_privacy_policy_url=$(cat ./appstore_metadata/$1/privacy_url.txt | jq -sRr @json)
175-
local escaped_description=$(cat ./appstore_metadata/$1/description.txt | jq -sRr @json)
176-
local json="{\"feedback_email\": \"info@monal-im.org\", \"marketing_url\": $escaped_marketing_url, \"privacy_policy_url\": $escaped_privacy_policy_url, \"description\": $escaped_description}"
206+
local escaped_name=$(cat ./appstore_metadata/$2/$1/name.txt | jq -sRr @json)
207+
local escaped_subtitle=$(cat ./appstore_metadata/$2/$1/subtitle.txt | jq -sRr @json)
208+
local escaped_marketing_url=$(cat ./appstore_metadata/$2/$1/marketing_url.txt | jq -sRr @json)
209+
local escaped_privacy_policy_url=$(cat ./appstore_metadata/$2/$1/privacy_url.txt | jq -sRr @json)
210+
local escaped_description=$(cat ./appstore_metadata/$2/$1/description.txt | jq -sRr @json)
211+
local json="{\"name\": $escaped_name, \"subtitle\": $escaped_subtitle, \"feedback_email\": \"info@monal-im.org\", \"marketing_url\": $escaped_marketing_url, \"privacy_policy_url\": $escaped_privacy_policy_url, \"description\": $escaped_description}"
177212
echo "$json"
178213
}
179214
180-
json="{"
181-
json="$json\"default\": $(build_appinfo_entry "en-US"),"
182-
for dir in ./appstore_metadata/*/; do
183-
dir="$(basename "$dir")"
184-
if [[ -d "./appstore_metadata/$dir" ]]; then
185-
json="$json\"${dir%/}\": $(build_appinfo_entry "${dir%/}"),"
186-
fi
187-
done
188-
json="${json%,}}"
215+
build_json() {
216+
local json="{"
217+
json="$json\"default\": $(build_appinfo_entry "en-US" "$1"),"
218+
for dir in ./appstore_metadata/$1/*/; do
219+
dir="$(basename "$dir")"
220+
if [[ -d "./appstore_metadata/$1/$dir" ]]; then
221+
json="$json\"${dir%/}\": $(build_appinfo_entry "${dir%/}" $1),"
222+
fi
223+
done
224+
json="${json%,}}"
225+
echo "$json"
226+
}
189227
190-
echo "appinfo<<__EOF__" | tee /dev/stderr >> "$GITHUB_OUTPUT"
191-
echo "$json" | tee /dev/stderr >> "$GITHUB_OUTPUT"
192-
echo "__EOF__" | tee /dev/stderr >> "$GITHUB_OUTPUT"
228+
for flavour in ios macos
229+
do
230+
echo "appinfo_$flavour<<__EOF__" | tee /dev/stderr >> "$GITHUB_OUTPUT"
231+
build_json $flavour | tee /dev/stderr >> "$GITHUB_OUTPUT"
232+
echo "__EOF__" | tee /dev/stderr >> "$GITHUB_OUTPUT"
233+
done
193234
- name: Publish ios to appstore connect
194235
#run: xcrun altool --upload-app -f ./Monal/build/ipa/Monal.ipa --type ios --asc-provider S8D843U34Y --team-id S8D843U34Y -u "$(cat /Users/ci/apple_connect_upload_mail.txt)" -p "$(cat /Users/ci/apple_connect_upload_secret.txt)"
195236
env:
196237
#PILOT_LOCALIZED_BUILD_INFO: ${{ steps.buildinfo.outputs.buildinfo_ios }}
197-
PILOT_LOCALIZED_APP_INFO: ${{ steps.appinfo.outputs.appinfo }}
238+
PILOT_LOCALIZED_APP_INFO: ${{ steps.appinfo.outputs.appinfo_ios }}
198239
PILOT_CHANGELOG: ${{ steps.releasenotes.outputs.notes_ios }}
199240
run: |
200241
fastlane run upload_to_testflight api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" ipa:"./Monal/build/ipa/Monal.ipa" distribute_external:true notify_external_testers:true groups:"Internal Pre-Beta Testers","Public Beta" reject_build_waiting_for_review:true submit_beta_review:true
@@ -226,7 +267,7 @@ jobs:
226267
#run: xcrun altool --upload-app --file ./Monal/build/app/Monal.pkg --type macos --asc-provider S8D843U34Y -u "$(cat /Users/ci/apple_connect_upload_mail.txt)" -p "$(cat /Users/ci/apple_connect_upload_secret.txt)" --primary-bundle-id org.monal-im.prod.catalyst.monal
227268
env:
228269
#PILOT_LOCALIZED_BUILD_INFO: ${{ steps.buildinfo.outputs.buildinfo_macos }}
229-
PILOT_LOCALIZED_APP_INFO: ${{ steps.appinfo.outputs.appinfo }}
270+
PILOT_LOCALIZED_APP_INFO: ${{ steps.appinfo.outputs.appinfo_macos }}
230271
PILOT_CHANGELOG: ${{ steps.releasenotes.outputs.notes_macos }}
231272
run: |
232273
fastlane run upload_to_testflight api_key_path:"/Users/ci/appstoreconnect/key.json" team_id:"S8D843U34Y" pkg:"./Monal/build/app/Monal.pkg" distribute_external:true notify_external_testers:true groups:"Internal Pre-Beta Testers","Public Beta" reject_build_waiting_for_review:true submit_beta_review:true

‎.github/workflows/quicksy.build-push.yml‎

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -142,16 +142,43 @@ jobs:
142142
env:
143143
CHANGELOG: ${{ steps.releasenotes.outputs.notes_ios }}
144144
run: |
145-
path_ios="$(mktemp -d)"
146-
cp -av ./appstore_quicksy_metadata/* "$path_ios"
147-
echo -n "$(date +%Y) Thilo Molitor" > "$path_ios/copyright.txt"
148-
for dir in ./appstore_quicksy_metadata/*/; do
149-
dir="$(basename "$dir")"
150-
if [[ -d "./appstore_quicksy_metadata/$dir" ]]; then
151-
echo -n "$CHANGELOG_IOS" > "$path_ios/${dir%/}/release_notes.txt"
152-
fi
153-
done
154-
echo "path_ios=$path_ios" | tee /dev/stderr >> "$GITHUB_OUTPUT"
145+
prepare_metadata() {
146+
local path="$(mktemp -d)"
147+
cp -a ./appstore_metadata/$1/* "$path"
148+
echo -n "$(date +%Y) Thilo Molitor" > "$path/copyright.txt"
149+
for dir in ./appstore_metadata/$1/*/; do
150+
dir="$(basename "$dir")"
151+
if [[ -d "./appstore_metadata/$1/$dir" ]]; then
152+
case $1 in
153+
quicksy_ios)
154+
echo -n "$CHANGELOG_IOS" | scripts/translate_changelog.py --json-file "Monal-localization-changelog/translations/changelog/${dir%/}.json" > "$path/${dir%/}/release_notes.txt"
155+
;;
156+
esac
157+
fi
158+
done
159+
echo "$path"
160+
}
161+
162+
echo ""
163+
echo "**********************************************************"
164+
echo "* Cloning and resetting changelog translation repository *"
165+
echo "**********************************************************"
166+
if [[ -e "Monal-localization-changelog" ]]; then
167+
rm -rf Monal-localization-changelog
168+
fi
169+
git clone git@changelog.translation.repo:monal-im/Monal-localization-changelog.git
170+
171+
echo ""
172+
echo "**************************"
173+
echo "* Translating changelogs *"
174+
echo "**************************"
175+
echo "path_ios=$(prepare_metadata quicksy_ios)" | tee /dev/stderr >> "$GITHUB_OUTPUT"
176+
177+
echo ""
178+
echo "***************"
179+
echo "* Cleaning up *"
180+
echo "***************"
181+
rm -rf Monal-localization-changelog
155182
- name: Publish ios to appstore connect
156183
#run: xcrun altool --upload-app --file ./Monal/build/ipa/Quicksy.ipa --type ios --asc-provider S8D843U34Y --team-id S8D843U34Y -u $(cat /Users/ci/apple_connect_upload_mail.txt) -p "$(cat /Users/ci/apple_connect_upload_secret.txt)"
157184
env:

‎.github/workflows/stable.build-push.yml‎

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -143,27 +143,47 @@ jobs:
143143
CHANGELOG_IOS: ${{ steps.releasenotes.outputs.notes_ios }}
144144
CHANGELOG_MACOS: ${{ steps.releasenotes.outputs.notes_macos }}
145145
run: |
146-
path_ios="$(mktemp -d)"
147-
cp -av ./appstore_metadata/* "$path_ios"
148-
echo -n "$(date +%Y) Thilo Molitor" > "$path_ios/copyright.txt"
149-
for dir in ./appstore_metadata/*/; do
150-
dir="$(basename "$dir")"
151-
if [[ -d "./appstore_metadata/$dir" ]]; then
152-
echo -n "$CHANGELOG_IOS" > "$path_ios/${dir%/}/release_notes.txt"
153-
fi
154-
done
155-
echo "path_ios=$path_ios" | tee /dev/stderr >> "$GITHUB_OUTPUT"
146+
prepare_metadata() {
147+
local path="$(mktemp -d)"
148+
cp -a ./appstore_metadata/$1/* "$path"
149+
echo -n "$(date +%Y) Thilo Molitor" > "$path/copyright.txt"
150+
for dir in ./appstore_metadata/$1/*/; do
151+
dir="$(basename "$dir")"
152+
if [[ -d "./appstore_metadata/$1/$dir" ]]; then
153+
case $1 in
154+
ios)
155+
echo -n "$CHANGELOG_IOS" | scripts/translate_changelog.py --json-file "Monal-localization-changelog/translations/changelog/${dir%/}.json" > "$path/${dir%/}/release_notes.txt"
156+
;;
157+
macos)
158+
echo -n "$CHANGELOG_MACOS" | scripts/translate_changelog.py --json-file "Monal-localization-changelog/translations/changelog/${dir%/}.json" > "$path/${dir%/}/release_notes.txt"
159+
;;
160+
esac
161+
fi
162+
done
163+
echo "$path"
164+
}
165+
166+
echo ""
167+
echo "**********************************************************"
168+
echo "* Cloning and resetting changelog translation repository *"
169+
echo "**********************************************************"
170+
if [[ -e "Monal-localization-changelog" ]]; then
171+
rm -rf Monal-localization-changelog
172+
fi
173+
git clone git@changelog.translation.repo:monal-im/Monal-localization-changelog.git
156174
157-
path_macos="$(mktemp -d)"
158-
cp -av ./appstore_metadata/* "$path_macos"
159-
echo -n "$(date +%Y) Thilo Molitor" > "$path_macos/copyright.txt"
160-
for dir in ./appstore_metadata/*/; do
161-
dir="$(basename "$dir")"
162-
if [[ -d "./appstore_metadata/$dir" ]]; then
163-
echo -n "$CHANGELOG_MACOS" > "$path_macos/${dir%/}/release_notes.txt"
164-
fi
165-
done
166-
echo "path_macos=$path_macos" | tee /dev/stderr >> "$GITHUB_OUTPUT"
175+
echo ""
176+
echo "**************************"
177+
echo "* Translating changelogs *"
178+
echo "**************************"
179+
echo "path_ios=$(prepare_metadata ios)" | tee /dev/stderr >> "$GITHUB_OUTPUT"
180+
echo "path_macos=$(prepare_metadata macos)" | tee /dev/stderr >> "$GITHUB_OUTPUT"
181+
182+
echo ""
183+
echo "***************"
184+
echo "* Cleaning up *"
185+
echo "***************"
186+
rm -rf Monal-localization-changelog
167187
- name: Publish ios to appstore connect
168188
#run: xcrun altool --upload-app --file ./Monal/build/ipa/Monal.ipa --type ios --asc-provider S8D843U34Y --team-id S8D843U34Y -u $(cat /Users/ci/apple_connect_upload_mail.txt) -p "$(cat /Users/ci/apple_connect_upload_secret.txt)"
169189
env:

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@
66
path = Monal/shareSheet-iOS/localization/external
77
url = https://github.com/monal-im/Monal-localization-shareSheet.git
88
branch = main
9+
[submodule "appstore_metadata"]
10+
path = appstore_metadata
11+
url = git@github.com:monal-im/Monal-localization-appstore.git

0 commit comments

Comments
 (0)
⚡