From ba86d3e88fea06ce56782fb7b1801b1e29217e19 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Tue, 2 Mar 2021 16:27:34 +0800 Subject: [PATCH] localization --- app/src/main/java/com/geeksville/mesh/MainActivity.kt | 4 ++-- app/src/main/res/values/strings.xml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt index c3abeabe5..9171095d6 100644 --- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt +++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt @@ -622,7 +622,7 @@ class MainActivity : AppCompatActivity(), Logging, val builder = MaterialAlertDialogBuilder(this) .setTitle(titleText) .setMessage(messageText) - .setPositiveButton("Okay") { _, _ -> + .setPositiveButton(R.string.okay) { _, _ -> info("User acknowledged") } @@ -660,7 +660,7 @@ class MainActivity : AppCompatActivity(), Logging, val curVer = DeviceVersion(info.firmwareVersion ?: "0.0.0") val minVer = DeviceVersion("1.2.0") if(curVer < minVer) - showAlert(R.string.app_too_old, R.string.firmware_old) + showAlert(R.string.firmware_too_old, R.string.firmware_old) else { // If our app is too old/new, we probably don't understand the new radioconfig messages, so we don't read them until here diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6a45820ed..0f564d172 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -91,4 +91,5 @@ Advanced settings Firmware update required The radio firmware is too old to talk to this application, please go to the settings pane and choose "Update Firmware". For more information on this see our wiki. + Okay