From 3a1844d5b59d07d2a5eb28ab96a40e4c41418f9f Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Tue, 20 Jul 2021 12:50:39 +0200 Subject: [PATCH] Transifex: use "tx pull" instead of scripts/fetch-translations.sh from now on --- .tx/config | 29 ++++++++++++ app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-eu/strings.xml | 2 +- app/src/main/res/values-fa/strings.xml | 2 +- app/src/main/res/values-gl/strings.xml | 1 + .../{values-tr-rTR => values-tr}/strings.xml | 0 .../{values-zh-rCN => values-zh}/strings.xml | 0 build.gradle | 2 +- cert4android | 2 +- .../{sl-rSI => sl-SI}/full_description.txt | 0 .../{sl-rSI => sl-SI}/short_description.txt | 0 .../{zh-rTW => zh-TW}/full_description.txt | 0 .../{zh-rTW => zh-TW}/short_description.txt | 0 .../{zh-rCN => zh}/full_description.txt | 0 .../{zh-rCN => zh}/short_description.txt | 0 scripts/fetch-translations.sh | 44 ------------------- 18 files changed, 37 insertions(+), 50 deletions(-) create mode 100644 .tx/config rename app/src/main/res/{values-tr-rTR => values-tr}/strings.xml (100%) rename app/src/main/res/{values-zh-rCN => values-zh}/strings.xml (100%) rename fastlane/metadata/android/{sl-rSI => sl-SI}/full_description.txt (100%) rename fastlane/metadata/android/{sl-rSI => sl-SI}/short_description.txt (100%) rename fastlane/metadata/android/{zh-rTW => zh-TW}/full_description.txt (100%) rename fastlane/metadata/android/{zh-rTW => zh-TW}/short_description.txt (100%) rename fastlane/metadata/android/{zh-rCN => zh}/full_description.txt (100%) rename fastlane/metadata/android/{zh-rCN => zh}/short_description.txt (100%) delete mode 100755 scripts/fetch-translations.sh diff --git a/.tx/config b/.tx/config new file mode 100644 index 000000000..f12653739 --- /dev/null +++ b/.tx/config @@ -0,0 +1,29 @@ +[main] +host = https://www.transifex.com + +[davx5.app] +file_filter = app/src/main/res/values-/strings.xml +minimum_perc = 0 +source_file = app/src/main/res/values/strings.xml +source_lang = en +trans.tr_TR = app/src/main/res/values-tr/strings.xml +trans.zh_CN = app/src/main/res/values-zh/strings.xml +type = ANDROID + +[davx5.metadata-short-description] +file_filter = fastlane/metadata/android//short_description.txt +minimum_perc = 100 +source_file = fastlane/metadata/android/en-US/short_description.txt +source_lang = en +trans.sl_SI = fastlane/metadata/android/sl-SI/short_description.txt +trans.zh_CN = fastlane/metadata/android/zh/short_description.txt +type = TXT + +[davx5.metadata-full-description] +file_filter = fastlane/metadata/android//full_description.txt +minimum_perc = 100 +source_file = fastlane/metadata/android/en-US/full_description.txt +source_lang = en +trans.sl_SI = fastlane/metadata/android/sl-SI/full_description.txt +trans.zh_CN = fastlane/metadata/android/zh/full_description.txt +type = TXT diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 6d6eb649f..d9aea61c1 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -187,7 +187,7 @@ No s\'ha pogut crear el compte Utilitza nom d\'usuari/contrasenya Detecció de configuració - Espereu, consultant el servidor … + Espereu, consultant el servidor ... No s\'ha pogut trobar el servei CalDAV o CardDAV. Mostra els detalls diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 62ad3ea48..52397dd32 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -311,6 +311,7 @@ Beskrivelse Valgfri Lager placering + Lagerplads er påkrævet Opret Slet sæt Er du sikker? diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 763facc01..3e46d0012 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -128,7 +128,7 @@ Το όνομα λογαριασμού έχει ήδη ληφθεί Αδυναμία δημιουργίας λογαριασμού Ανίχνευση ρυθμίσεων - Περιμένετε, γίνεται ερώτημα στο διακομιστή… + Περιμένετε, γίνεται ερώτημα στο διακομιστή... Αδυναμία εύρεσης υπηρεσίας CalDAV ή CardDAV. Εμφάνιση λεπτομερειών diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 6de5bc0e3..88dd7fd45 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -226,7 +226,7 @@ Ez da ziurtagiririk aurkitu Instalatu ziurtagiria Konfigurazio detekzioa - Mesedez itxaron, zerbitzaria kontsultatzen… + Mesedez itxaron, zerbitzaria kontsultatzen... Ezin izan da CalDAV edo CardDAV zerbitzua aurkitu. Erabiltzaile-izena (eposta) / pasahitza txarto dago? Erakutsi xehetasunak diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 3bfebaf3a..46c25b333 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -214,7 +214,7 @@ گواهی یافت نشد نصب گواهی تشخیص پیکربندی - لطفا صبر کنید، پرس و جو سرور … + لطفا صبر کنید، پرس و جو سرور ... سرویس CalDAV یا CardDAV پیدا نشد. نام کاربری (آدرس ایمیل) / رمز عبور اشتباه است؟ نمایش جزئیات diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 96b3fd4b5..525e4912d 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -311,6 +311,7 @@ Descrición optativo Localización do almacenamento + Requírese a localización da almacenaxe Crear Eliminar colección Quere eliminar? diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr/strings.xml similarity index 100% rename from app/src/main/res/values-tr-rTR/strings.xml rename to app/src/main/res/values-tr/strings.xml diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh/strings.xml similarity index 100% rename from app/src/main/res/values-zh-rCN/strings.xml rename to app/src/main/res/values-zh/strings.xml diff --git a/build.gradle b/build.gradle index 121377ed6..8c257fc30 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { appIntro: '6.1.0', dav4jvm: '7dda4ab5', dokka: '0.10.1', - kotlin: '1.5.10', + kotlin: '1.5.20', okhttp: '4.9.1', // latest Apache Commons versions that don't require Java 8 (Android 7) commonsCollections: '4.2', diff --git a/cert4android b/cert4android index 87b76b388..66f9bc1c5 160000 --- a/cert4android +++ b/cert4android @@ -1 +1 @@ -Subproject commit 87b76b388849e854c8412bed3eeb260f9b1c92e6 +Subproject commit 66f9bc1c51f813a229372d8b05760d42ebaddab1 diff --git a/fastlane/metadata/android/sl-rSI/full_description.txt b/fastlane/metadata/android/sl-SI/full_description.txt similarity index 100% rename from fastlane/metadata/android/sl-rSI/full_description.txt rename to fastlane/metadata/android/sl-SI/full_description.txt diff --git a/fastlane/metadata/android/sl-rSI/short_description.txt b/fastlane/metadata/android/sl-SI/short_description.txt similarity index 100% rename from fastlane/metadata/android/sl-rSI/short_description.txt rename to fastlane/metadata/android/sl-SI/short_description.txt diff --git a/fastlane/metadata/android/zh-rTW/full_description.txt b/fastlane/metadata/android/zh-TW/full_description.txt similarity index 100% rename from fastlane/metadata/android/zh-rTW/full_description.txt rename to fastlane/metadata/android/zh-TW/full_description.txt diff --git a/fastlane/metadata/android/zh-rTW/short_description.txt b/fastlane/metadata/android/zh-TW/short_description.txt similarity index 100% rename from fastlane/metadata/android/zh-rTW/short_description.txt rename to fastlane/metadata/android/zh-TW/short_description.txt diff --git a/fastlane/metadata/android/zh-rCN/full_description.txt b/fastlane/metadata/android/zh/full_description.txt similarity index 100% rename from fastlane/metadata/android/zh-rCN/full_description.txt rename to fastlane/metadata/android/zh/full_description.txt diff --git a/fastlane/metadata/android/zh-rCN/short_description.txt b/fastlane/metadata/android/zh/short_description.txt similarity index 100% rename from fastlane/metadata/android/zh-rCN/short_description.txt rename to fastlane/metadata/android/zh/short_description.txt diff --git a/scripts/fetch-translations.sh b/scripts/fetch-translations.sh deleted file mode 100755 index 227c37ba2..000000000 --- a/scripts/fetch-translations.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -# DAVx5-ose translations - -declare -A android -android=([ar_SA]=ar [bg]=bg [ca]=ca [cs]=cs [da]=da [de]=de [el]=el [es]=es [eu]=eu [fa]=fa [fi_FI]=fi [fr]=fr [gl]=gl [hu]=hu [it]=it [ja]=ja [nl]=nl [nb_NO]=nb-rNO [pl]=pl [pt]=pt [ru]=ru [sk_SK]=sk [sl_SI]=sl-rSI [sr]=sr [szl]=szl [tr_TR]=tr-rTR [uk]=uk [vi]=vi [zh_CN]=zh-rCN [zh_TW]=zh-rTW) - -BASE_DIR=`realpath -L $0 | xargs dirname`/.. - - -function fetch_txt { - URL=$1 - LANG=$2 - FILE=$3 - - TRANSLATIONS=`mktemp` - curl --compressed -n $1 >$TRANSLATIONS - diff --ignore-trailing-space -aq $TRANSLATIONS $BASE_DIR/fastlane/metadata/android/en-US/$FILE - if [[ $? -ne 0 ]]; then - # translations are not the same as en-us - mkdir -p $BASE_DIR/fastlane/metadata/android/$LANG - mv $TRANSLATIONS $BASE_DIR/fastlane/metadata/android/$LANG/$FILE - fi - rm -f $TRANSLATIONS -} - - -for lang in ${!android[@]} -do - echo Fetching translations for $lang - target_app=$BASE_DIR/app/src/main/res/values-${android[$lang]} - target_cert4android=$BASE_DIR/cert4android/src/main/res/values-${android[$lang]} - - echo -e '\tapp strings' - mkdir -p $target_app - curl --compressed -n "https://www.transifex.com/api/2/project/davx5/resource/app/translation/$lang?file" |sed 's/\.\.\./…/g' >$target_app/strings.xml - - echo -e '\tmetadata' - fetch_txt "https://www.transifex.com/api/2/project/davx5/resource/metadata-full-description/translation/$lang?file" ${android[$lang]} full_description.txt - fetch_txt "https://www.transifex.com/api/2/project/davx5/resource/metadata-short-description/translation/$lang?file" ${android[$lang]} short_description.txt -done - -curl -n https://www.transifex.com/api/2/project/davx5/languages/ | ./rewrite-translators.rb >../app/src/main/assets/translators.json -