diff options
| author | Tobias Kaminsky <tobias@kaminsky.me> | 2022-10-03 13:24:31 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-03 13:24:31 +0300 |
| commit | 664b54c999b5834de766c73140a30ed269d74316 (patch) | |
| tree | 54faf973e6fd4504ae3ac8a3cf3a0fd7d5f26709 | |
| parent | cac9e5d4e881c5d9d4ab57e1a93adfb397f4c214 (diff) | |
| parent | a54466be555cf328f103b41f6603056fa5d86244 (diff) | |
Merge pull request #422 from nextcloud/bugfix/noid/fix-android-translations
Bugfix/noid/fix android translations
| -rw-r--r-- | translations/Dockerfile-Plain | 9 | ||||
| -rwxr-xr-x | translations/handlePlainTranslations.sh | 21 |
2 files changed, 11 insertions, 19 deletions
diff --git a/translations/Dockerfile-Plain b/translations/Dockerfile-Plain index 7ff347b..fade0d7 100644 --- a/translations/Dockerfile-Plain +++ b/translations/Dockerfile-Plain @@ -2,4 +2,13 @@ FROM ghcr.io/nextcloud/continuous-integration-translations:latest MAINTAINER Morris Jobke <hey@morrisjobke.de> +# Install python +RUN apt-get update -q && \ + DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends \ + python3 \ + python3-pip \ + python3-setuptools \ + python3-wheel \ + && apt-get clean + ADD handlePlainTranslations.sh /handleTranslations.sh diff --git a/translations/handlePlainTranslations.sh b/translations/handlePlainTranslations.sh index d954b50..ebeae60 100755 --- a/translations/handlePlainTranslations.sh +++ b/translations/handlePlainTranslations.sh @@ -18,6 +18,7 @@ versions="master $(git branch -r | grep -E "origin\/stable\-[0-9\.]+$" | cut -f2 if [ -d src/main/res ]; then rm -rf src/main/res/values-*/strings.xml fi +# Android talk app if [ -d app/src/main/res ]; then rm -rf app/src/main/res/values-*/strings.xml fi @@ -26,10 +27,6 @@ fi if [ -d News-Android-App/src/main/res ]; then rm -rf News-Android-App/src/main/res/values-*/strings.xml fi -# Android talk app -if [ -d app/src/main/res ]; then - rm -rf app/src/main/res/values-*/strings.xml -fi # combine stable branches to keep freshly removed translations if [ $1 = "nextcloud" -a $2 = "android" ]; then @@ -129,24 +126,10 @@ do # pull translations tx pull -f -a --minimum-perc=50 - # for the default Android app rename the informal german to the formal version + # reset combined source file if [ -d src/main/res ]; then - rm -rf src/main/res/values-de - mv src/main/res/values-de-rDE src/main/res/values-de - - # reset combined source file git checkout -- src/main/res/values/strings.xml fi - # for the Android talk and files app rename the informal german to the formal version - if [ -d app/src/main/res ]; then - rm -rf app/src/main/res/values-de - mv app/src/main/res/values-de-rDE app/src/main/res/values-de - fi - # for the Android news app rename the informal german to the formal version - if [ -d News-Android-App/src/main/res ]; then - rm -rf News-Android-App/src/main/res/values-de - mv News-Android-App/src/main/res/values-de-rDE News-Android-App/src/main/res/values-de - fi if [ -e "scripts/metadata/generate_metadata.py" ]; then # copy transifex strings to fastlane |