From 837ff1f8fc6a01f8491163a9d4927b90b58d6d6a Mon Sep 17 00:00:00 2001 From: Eric House Date: Fri, 18 Jan 2019 16:45:27 -0800 Subject: [PATCH] Give each variant a name, and include in About alert. I modified existing translated strings, adding the new clause. Not doing that would cause the existing strings to be stripped because they'd no longer have the matching set of format specifiers. --- xwords4/android/app/build.gradle | 3 +++ .../app/src/main/java/org/eehouse/android/xw4/AboutAlert.java | 4 +++- xwords4/android/app/src/main/res/values/strings.xml | 4 ++-- xwords4/android/res_src/values-ca/strings.xml | 2 +- xwords4/android/res_src/values-cs/strings.xml | 2 -- xwords4/android/res_src/values-de/strings.xml | 2 +- xwords4/android/res_src/values-fr/strings.xml | 4 ++-- xwords4/android/res_src/values-ja/strings.xml | 2 +- xwords4/android/res_src/values-nb-rNO/strings.xml | 2 +- xwords4/android/res_src/values-nl/strings.xml | 2 +- xwords4/android/res_src/values-pt/strings.xml | 4 ++-- xwords4/android/res_src/values-sk/strings.xml | 3 --- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle index 7e0be47a0..8b4f48134 100644 --- a/xwords4/android/app/build.gradle +++ b/xwords4/android/app/build.gradle @@ -79,6 +79,7 @@ android { resValue "string", "nbs_port", "3344" buildConfigField "boolean", "WIDIR_ENABLED", "false" buildConfigField "boolean", "RELAYINVITE_SUPPORTED", "false" + buildConfigField "String", "VARIANT_NAME", "\"Google Play Store\"" } xw4fdroid { @@ -89,6 +90,7 @@ android { resValue "string", "nbs_port", "3344" buildConfigField "boolean", "WIDIR_ENABLED", "false" buildConfigField "boolean", "RELAYINVITE_SUPPORTED", "false" + buildConfigField "String", "VARIANT_NAME", "\"F-Droid\"" } xw4d { dimension "variant" @@ -98,6 +100,7 @@ android { resValue "string", "nbs_port", "3345" buildConfigField "boolean", "WIDIR_ENABLED", "true" buildConfigField "boolean", "RELAYINVITE_SUPPORTED", "true" + buildConfigField "String", "VARIANT_NAME", "\"Dev/Debug\"" } // WARNING: "all" breaks things. Seems to be a keyword. Need diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java index da8820309..01745a356 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java @@ -56,8 +56,10 @@ public class AboutAlert extends XWDialogFragment { String dateString = df.format( new Date( BuildConfig.BUILD_STAMP * 1000 ) ); vers.setText( getString( R.string.about_vers_fmt, + BuildConfig.VARIANT_NAME, BuildConfig.VERSION_NAME, - BuildConfig.GIT_REV, dateString ) ); + BuildConfig.GIT_REV, + dateString ) ); TextView xlator = (TextView)view.findViewById( R.id.about_xlator ); String str = getString( R.string.xlator ); diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml index e8dc5c0c4..d4d614e42 100644 --- a/xwords4/android/app/src/main/res/values/strings.xml +++ b/xwords4/android/app/src/main/res/values/strings.xml @@ -1702,8 +1702,8 @@ ########################################################### --> - CrossWords for Android, Version %1$s, - rev %2$s, built on %3$s. + CrossWords for Android, %1$s variant, Version %2$s, + rev %3$s, built on %4$s. Copyright (C) 1998-2018 by Eric House. This free/open source software is released under the GNU Public diff --git a/xwords4/android/res_src/values-ca/strings.xml b/xwords4/android/res_src/values-ca/strings.xml index 35d8ab86f..e234d34d7 100644 --- a/xwords4/android/res_src/values-ca/strings.xml +++ b/xwords4/android/res_src/values-ca/strings.xml @@ -497,7 +497,7 @@ que connecti via el repetidor. Introduïu el vostre nom aquí. S\'usarà en crear partides noves. (Podreu canviar-lo després a la secció «Partida nova predeterminada» de la configuració.) - CrossWords per a l\'Android, versió %1$s, rev %2$s, construït en %3$s. + CrossWords per a l\'Android, %1$s variant, versió %2$s, rev %3$s, construït en %4$s. Icones de la barra d\'eines per Sarah Chu. Icones Navbar del Noun Project: «archive» per Trendy; «rematch» per Becris i «swap» per iconomania. Canvis recents diff --git a/xwords4/android/res_src/values-cs/strings.xml b/xwords4/android/res_src/values-cs/strings.xml index fbb25cdc4..34ac04c02 100644 --- a/xwords4/android/res_src/values-cs/strings.xml +++ b/xwords4/android/res_src/values-cs/strings.xml @@ -145,8 +145,6 @@ Hra skončena - CrossWords pro Android, Verze %1$s, - revize %2$s. Copyright (C) 1998-2012 Eric House. Tento software je vydán pod licencí GNU Public License. Manuál a zdrojové kódy najdete na: diff --git a/xwords4/android/res_src/values-de/strings.xml b/xwords4/android/res_src/values-de/strings.xml index b8ba96dd2..51dfbddb1 100644 --- a/xwords4/android/res_src/values-de/strings.xml +++ b/xwords4/android/res_src/values-de/strings.xml @@ -1177,7 +1177,7 @@ Eine neue Partie erzeugen, die bereit zum Spielen ist, mit allen Einstellungen aus dieser Partie. Das heißt, diese Partie als Vorlage verwenden. - CrossWords für Android, Version %1$s, Rev. %2$s, Build-Datum %3$s. + CrossWords für Android, %1$s Variant, Version %2$s, Rev. %3$s, Build-Datum %4$s. Alle gepaarten hinzufügen Weitere paaren diff --git a/xwords4/android/res_src/values-fr/strings.xml b/xwords4/android/res_src/values-fr/strings.xml index e2f98a593..49edaa1b7 100644 --- a/xwords4/android/res_src/values-fr/strings.xml +++ b/xwords4/android/res_src/values-fr/strings.xml @@ -2075,8 +2075,8 @@ modèle. - CrossWords pour Android, version %1$s, -rév. %2$s, compilé le %3$s. + CrossWords pour Android, %1$s variant, version %2$s, +rév. %3$s, compilé le %4$s. - CrossWords para Android, Versão %1$s, - rev %2$s, built on %3$s. + CrossWords para Android, %1$s Variant, Versão %2$s, + rev %3$s, built on %4$s. Copyright (C) 1998-2013 por Eric House. Esse software livre/aberto é liberado sob a Licença diff --git a/xwords4/android/res_src/values-sk/strings.xml b/xwords4/android/res_src/values-sk/strings.xml index 73f1cee06..fbb0d6d85 100644 --- a/xwords4/android/res_src/values-sk/strings.xml +++ b/xwords4/android/res_src/values-sk/strings.xml @@ -107,9 +107,6 @@ # Dialog giving copyright and other basic info about # the app ########################################################### --> - - XLATE ME: CrossWords for Android, Version %1$s, - rev %2$s, built on %3$s. XLATE ME: Thanks for installing CrossWords!\n\nFeel free to enter your name here. It will be used