From 3a8c8661f7e06f6440d06f3fadec82addb889c13 Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Tue, 19 Jan 2021 01:04:24 -0500
Subject: [PATCH] Address hard-coded Options prompt strings, per #1570

---
 .../quests/convo/quests/options/OptionsPrompt.java | 14 +++++---------
 main/src/main/resources/strings.yml                |  2 ++
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/main/src/main/java/me/blackvein/quests/convo/quests/options/OptionsPrompt.java b/main/src/main/java/me/blackvein/quests/convo/quests/options/OptionsPrompt.java
index 720b6c9ef..10b901009 100644
--- a/main/src/main/java/me/blackvein/quests/convo/quests/options/OptionsPrompt.java
+++ b/main/src/main/java/me/blackvein/quests/convo/quests/options/OptionsPrompt.java
@@ -128,10 +128,8 @@ public class OptionsPrompt extends QuestsEditorNumericPrompt {
         
         @Override
         public String getQueryText(final ConversationContext context) {
-            String text = "Select '<true>' or '<false>'";
-            text = text.replace("<true>", Lang.get("true"));
-            text = text.replace("<false>", Lang.get("false"));
-            return text;
+            return Lang.get("optBooleanQuery").replace("<true>", Lang.get("true"))
+                    .replace("<false>", Lang.get("false"));
         }
         
         public String getSelectionText(final ConversationContext context, final int number) {
@@ -154,10 +152,8 @@ public class OptionsPrompt extends QuestsEditorNumericPrompt {
             final QuestsEditorPostOpenStringPromptEvent event = new QuestsEditorPostOpenStringPromptEvent(context, this);
             context.getPlugin().getServer().getPluginManager().callEvent(event);
             
-            String text = Lang.get("optBooleanPrompt");
-            text = text.replace("<true>", Lang.get("true"));
-            text = text.replace("<false>", Lang.get("false"));
-            return ChatColor.YELLOW + text;
+            return ChatColor.YELLOW + Lang.get("optBooleanPrompt").replace("<true>", Lang.get("true"))
+                    .replace("<false>", Lang.get("false"));
         }
         
         @Override
@@ -200,7 +196,7 @@ public class OptionsPrompt extends QuestsEditorNumericPrompt {
         
         @Override
         public String getQueryText(final ConversationContext context) {
-            return "Pick level of progress sharing";
+            return Lang.get("optNumberQuery");
         }
         
         public String getSelectionText(final ConversationContext context, final int number) {
diff --git a/main/src/main/resources/strings.yml b/main/src/main/resources/strings.yml
index 2d6a997ee..e4299ef89 100644
--- a/main/src/main/resources/strings.yml
+++ b/main/src/main/resources/strings.yml
@@ -484,7 +484,9 @@ plnTooEarly: "<quest> will be active in <time>."
 plnTooLate: "<quest> was last active <time> ago."
 optGeneral: "General"
 optMultiplayer: "Multiplayer"
+optBooleanQuery: "Select '<true>' or '<false>'"
 optBooleanPrompt: "Enter '<true>' or '<false>', <clear>, <cancel>"
+optNumberQuery: "Pick level of progress sharing"
 optNumberPrompt: "Enter a level (number) for tracking progress, <clear>, <cancel>"
 optAllowCommands: "Allow commands during quest"
 optAllowQuitting: "Allow quitting during quest"