From e67a2d56cfe8f19eaeae488fd827fa0ae8b29b1a Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Thu, 18 Dec 2025 16:39:49 +0100 Subject: [PATCH] Android: add notes for multiple stable versions Signed-off-by: tobiasKaminsky --- translations/handlePlainTranslations.sh | 49 ++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/translations/handlePlainTranslations.sh b/translations/handlePlainTranslations.sh index b886eda..14fbca3 100755 --- a/translations/handlePlainTranslations.sh +++ b/translations/handlePlainTranslations.sh @@ -19,11 +19,45 @@ default_branch=$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remote versions="$default_branch $(git branch -r | grep -E "origin\/stable\-[0-9\.]+$" | cut -f2 -d"/" | sort -r | head -n1)" # combine stable branches to keep freshly removed translations -if [ $1 = "nextcloud" -a $2 = "android" ] || - [ $1 = "nextcloud" -a $2 = "android-library" ] || - [ $1 = "nextcloud" -a $2 = "notes-android" ] || - [ $1 = "nextcloud" -a $2 = "talk-android" ] || - ; then +if [ $1 = "nextcloud" -a $2 = "android" ]; then + mkdir stable-values + for version in $versions + do + git checkout $version + + cp app/src/main/res/values/strings.xml stable-values/$version.xml + done + + cd stable-values + echo ' + ' >> combined.xml + + grep -h "> combined.xml + + # plurals are hard to compare, so we take only master/main ones + awk '//' "$default_branch.xml" >> combined.xml + + echo "" >> combined.xml + + cat combined.xml + + duplicated_translations=$(cat combined.xml | grep 'name="([^"]*)"' -E -o | sort | uniq -c | grep -v '1 name' | wc -l) + if [ $duplicated_translations != "0" ]; then + echo "" + echo "" + echo "💥 Some translation strings have a different English source text between branches:" + cat combined.xml | grep 'name="([^"]*)"' -E -o | sort | uniq -c | grep -v '1 name' | grep 'name="([^"]*)"' -E -o + exit 1 + fi + + mv combined.xml ../app/src/main/res/values/strings.xml + + cd .. + + rm -rf stable-values +fi + +if [ $1 = "nextcloud" -a $2 = "notes-android" ]; then mkdir stable-values for version in $versions do @@ -146,6 +180,11 @@ if [ $1 = "nextcloud" -a $2 = "android" ]; then git checkout $default_branch fi +if [ $1 = "nextcloud" -a $2 = "notes-android" ]; then + git checkout -- app/src/main/res/values/strings.xml + git checkout $default_branch +fi + if [ $1 = "nextcloud" -a $2 = "android-common" ]; then git checkout -- core/src/main/res/values/strings.xml git checkout $default_branch