Merge branch 'r3.9'

This commit is contained in:
Victor Shcherb 2021-02-09 17:11:55 +01:00
commit 275ea6ed28
2 changed files with 5 additions and 5 deletions

View file

@ -4,7 +4,7 @@
<application
android:icon="@mipmap/icon_free"
android:label="@string/app_name_free"
android:label="OsmAnd — Offline Maps &amp; GPS Navigation"
tools:replace="android:icon, android:label">
<meta-data

View file

@ -154,11 +154,11 @@ android {
}
def replaceNoTranslate(line) {
if (line.contains("\"app_name\"") && System.getenv("TARGET_APP_NAME")) {
return line.replaceAll(">[^<]*<", ">" + System.getenv("TARGET_APP_NAME") + "<")
if (line.contains("\"app_name\"") && System.getenv("TARGET_APP_PLUS_NAME")) {
return line.replaceAll(">[^<]*<", ">" + System.getenv("TARGET_APP_PLUS_NAME") + "<")
}
if (line.contains("\"app_name_free\"") && System.getenv("TARGET_APP_NAME")) {
return line.replaceAll(">[^<]*<", ">" + System.getenv("TARGET_APP_NAME") + "<")
if (line.contains("\"app_name_free\"") && System.getenv("TARGET_APP_FREE_NAME")) {
return line.replaceAll(">[^<]*<", ">" + System.getenv("TARGET_APP_FREE_NAME") + "<")
}
if (line.contains("\"app_edition\"") && System.getenv("APP_EDITION")) {
return line.replaceAll(">[^<]*<", ">" + System.getenv("APP_EDITION") + "<")