From e08e6eb797f63ae25c8f36b4e83af9be66f9bf08 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Fri, 24 Apr 2020 09:39:03 +0700
Subject: [PATCH] fix(android): Clarify label that shows "Get Started" on
 startup

PR #2751 cleaned up UI strings, changing the label from `Show "Get Started" on startup` to `Show this menu on startup`. This change was fine for "Get Started" menu, but the label is confusing when reused on the Keyman Settings menu.

This PR reverts the label (while formatting the string to include the localized string for "Get Started".
---
 .../main/java/com/tavultesoft/kmapro/GetStartedActivity.java   | 1 +
 .../java/com/tavultesoft/kmapro/KeymanSettingsFragment.java    | 3 ++-
 android/KMAPro/kMAPro/src/main/res/values/strings.xml          | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/GetStartedActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/GetStartedActivity.java
index 67047ea21e..bf09d44a46 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/GetStartedActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/GetStartedActivity.java
@@ -70,6 +70,7 @@ public class GetStartedActivity extends AppCompatActivity {
     });
 
     final TextView getStartedText = findViewById(R.id.getStartedText);
+    getStartedText.setText(String.format(getString(R.string.show_get_started), getString(R.string.get_started)));
     getStartedText.setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View v) {
diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsFragment.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsFragment.java
index 72ba1e7a50..1b3da0cd13 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsFragment.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsFragment.java
@@ -73,7 +73,8 @@ public class KeymanSettingsFragment extends PreferenceFragmentCompat {
 
     SwitchPreference getStartedPreference = new SwitchPreference(context);
     getStartedPreference.setKey(GetStartedActivity.showGetStartedKey);
-    getStartedPreference.setTitle(getString(R.string.show_get_started));
+    getStartedPreference.setTitle(String.format(getString(R.string.show_get_started), getString(R.string.get_started)));
+
     getStartedPreference.setDefaultValue(true);
 
     // Blocks the default checkmark interaction; we want to control the checkmark's state separately
diff --git a/android/KMAPro/kMAPro/src/main/res/values/strings.xml b/android/KMAPro/kMAPro/src/main/res/values/strings.xml
index e2623f6135..407ef61072 100644
--- a/android/KMAPro/kMAPro/src/main/res/values/strings.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values/strings.xml
@@ -36,7 +36,7 @@
   <string name="enable_system_keyboard">Enable Keyman as system-wide keyboard</string>
   <string name="set_keyman_as_default">Set Keyman as default keyboard</string>
   <string name="more_info" comment="Open the help page">More info</string>
-  <string name="show_get_started">Show this menu on startup</string>
+  <string name="show_get_started">Show \"%1$s\" on startup</string>
 
 
   <!-- Keyman Settings menu strings -->