From e0024b38ef5e5f378d1f395a71c27ebe8eac5a6b Mon Sep 17 00:00:00 2001 From: Nima <74507096+Nimausfi@users.noreply.github.com> Date: Sun, 6 Aug 2023 22:02:49 -0700 Subject: [PATCH] Implement automatic-per-app-languages #5649 Signed-off-by: Nima <74507096+Nimausfi@users.noreply.github.com> --- android/AndroidManifest.xml | 1 - android/build.gradle | 4 ++- android/gradle.properties | 2 -- android/res/resources.properties | 1 + android/res/xml/locales_config.xml | 49 ---------------------------- tools/unix/generate_localizations.sh | 30 ----------------- 6 files changed, 4 insertions(+), 83 deletions(-) create mode 100644 android/res/resources.properties delete mode 100644 android/res/xml/locales_config.xml diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index a9685110af..4701d4b26e 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -64,7 +64,6 @@ android:dataExtractionRules="@xml/backup_content_v31" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:localeConfig="@xml/locales_config" android:theme="@style/MwmTheme" android:supportsRtl="true" android:networkSecurityConfig="@xml/network_security_config" diff --git a/android/build.gradle b/android/build.gradle index 6cb3ae9771..d02dee8020 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -159,7 +159,6 @@ android { buildConfigField 'String', 'SUPPORT_MAIL', '"android@organicmaps.app"' // Should be customized in flavors. buildConfigField 'String', 'REVIEW_URL', '""' - resourceConfigurations += [project.ext.supportedLocalizations] multiDexEnabled true multiDexKeepFile file('multidex-config.txt') @@ -408,6 +407,9 @@ android { androidResources { ignoreAssetsPattern '!.svn:!.git:!.DS_Store:!*.scc:.*:_*:!CVS:!thumbs.db:!picasa.ini:!*~' noCompress 'txt', 'bin', 'html', 'png', 'json', 'mwm', 'ttf', 'sdf', 'ui', 'config', 'csv', 'spv', 'obj' + + // Turn automatic per-app language feature on + generateLocaleConfig true } compileOptions { diff --git a/android/gradle.properties b/android/gradle.properties index 36fd8e7034..146fe00796 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -11,5 +11,3 @@ android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false android.nonFinalResIds=false -# Autogenerated by tools/unix/generate_localizations.sh -supportedLocalizations=af,ar,be,bg,ca,cs,da,de,el,en,en_GB,es,es_MX,et,eu,fa,fi,fr,fr_CA,iw,hi,hu,in,it,ja,ko,lt,mr,nb,nl,pl,pt,pt_BR,ro,ru,sk,sv,sw,th,tr,uk,vi,zh,zh_HK,zh_MO,zh_TW diff --git a/android/res/resources.properties b/android/res/resources.properties new file mode 100644 index 0000000000..d5a3ddc92a --- /dev/null +++ b/android/res/resources.properties @@ -0,0 +1 @@ +unqualifiedResLocale=en-US \ No newline at end of file diff --git a/android/res/xml/locales_config.xml b/android/res/xml/locales_config.xml deleted file mode 100644 index 3e45b995bc..0000000000 --- a/android/res/xml/locales_config.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tools/unix/generate_localizations.sh b/tools/unix/generate_localizations.sh index 05494f0bcb..5841917a75 100755 --- a/tools/unix/generate_localizations.sh +++ b/tools/unix/generate_localizations.sh @@ -67,33 +67,3 @@ cat "$STRINGS_PATH"/{strings,types_strings}.txt> "$MERGED_FILE" "$TWINE" generate-all-localization-files --format jquery "$OMIM_PATH/data/strings/sound.txt" "$OMIM_PATH/data/sound-strings/" rm "$MERGED_FILE" - -# Generate list of languages and add list in gradle.properties to be used in build.gradle in resConfig -SUPPORTED_LOCALIZATIONS="supportedLocalizations="$(sed -nEe "s/ +([a-zA-Z]{2}(-[a-zA-Z]{2,})?) = .*$/\1/p" "data/strings/strings.txt" | sort -u | tr '\n' ',' | sed -e 's/-/_/g' -e 's/,$//') -# Chinese locales should correspond to Android codes. -SUPPORTED_LOCALIZATIONS=${SUPPORTED_LOCALIZATIONS/zh_Hans/zh} -SUPPORTED_LOCALIZATIONS=${SUPPORTED_LOCALIZATIONS/zh_Hant/zh_HK,zh_MO,zh_TW} -SUPPORTED_LOCALIZATIONS=${SUPPORTED_LOCALIZATIONS/he/iw} -SUPPORTED_LOCALIZATIONS=${SUPPORTED_LOCALIZATIONS/id/in} -GRADLE_PROPERTIES="$OMIM_PATH/android/gradle.properties" -if [ "$SUPPORTED_LOCALIZATIONS" != "$(grep supportedLocalizations "$GRADLE_PROPERTIES")" ]; then - sed -i .bak 's/supportedLocalizations.*/'"$SUPPORTED_LOCALIZATIONS"'/' "$GRADLE_PROPERTIES" - rm "$GRADLE_PROPERTIES.bak" -fi - -# Generate locales_config.xml to allow users change app's language on Android 13+ -LOCALES_CONFIG="$OMIM_PATH/android/res/xml/locales_config.xml" -SUPPORTED_LOCALIZATIONS=${SUPPORTED_LOCALIZATIONS/supportedLocalizations=/en,} -SUPPORTED_LOCALIZATIONS=${SUPPORTED_LOCALIZATIONS/,en,/,} -SUPPORTED_LOCALIZATIONS=${SUPPORTED_LOCALIZATIONS//_/-} -LOCALES_CONTENT=' -' -set +x -for lang in ${SUPPORTED_LOCALIZATIONS//,/ }; do - LOCALES_CONTENT="$LOCALES_CONTENT"$'\n'" " -done -LOCALES_CONTENT="$LOCALES_CONTENT"$'\n''' -if [ "$LOCALES_CONTENT" != "$(cat "$LOCALES_CONFIG")" ]; then - echo "$LOCALES_CONTENT" > "$LOCALES_CONFIG" - echo Updated "$LOCALES_CONFIG" file -fi -- 2.45.3