From 48f3e57a449ea32ac543bed6b4c565fbd7d02325 Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Sun, 25 May 2025 14:25:07 -0500
Subject: [PATCH] Added a few translation helpers

---
 locale/en_AU.mo                 | Bin 2157 -> 0 bytes
 locale/en_AU.po                 |   7 +++++--
 project.godot                   |   2 +-
 scenes/Singletons/Quest.tscn    |   6 +++++-
 scenes/UI/QuestMenu.tscn        |   1 +
 scripts/Quest/Quest.gd          |   8 ++++++--
 scripts/Quest/QuestObjective.gd |   9 ++++++++-
 scripts/Singleton/Locale.gd     |   3 +++
 scripts/UI/QuestMenu.gd         |  15 ++++++---------
 9 files changed, 35 insertions(+), 16 deletions(-)
 delete mode 100644 locale/en_AU.mo

diff --git a/locale/en_AU.mo b/locale/en_AU.mo
deleted file mode 100644
index 92e73160cbff92f34e46721728177e3bf74a37d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2157
zcmaKsO>Z1E7{?8?6t=vSLP3HeJ%E5BWu|G#p(Kh#+H6V?RkzKyAXU-g-F<e~bjIG=
zo@`doFMxW48()H3?}!@`cMkaqg&RUb;&0C+`;rh#p5OSf{k++a_s*X9QJ}q!ejfcd
z^taK!dkP=4Kfy)tuZr(JEyQ~mZ-JkJBQWfJ3|;_#2j2kyuEuAcDfN8<E<ye!_%iqi
z`~dt34EuipUjzRD&w)=W`N<PPyo&L8Fz8*Z_*uoTtNC5<U(7!OgWm5?3b6qG4EDf1
z@I$cvtPr1rIrswj7_5W8f-ixmPYJONz6rhs?t+`(58xSa53GStz_9-x@I~;{b7frT
zz#xAg4Eiot^0kV$z|)XRFr+xFeI7l;9`x_GkQ1apz^#LZ5aQmDpO6!njt!|6ub_v#
z249eZ*n<7g&Y}mOVNwX*VeQjC`<C*Yr#(~X?vcXQFe|Lg=I8nf3XT-+Z-{!^@;-N4
zZp1J&G+ug>cG-2T8hT~4_`fw;=6vkrj1i-u>#*KZ?3K?dT~mUY{c!9^1(kf_%#>h8
z!SV6U%ubXY67Q?brP8gOb&+PW&6#*mu=A<Mr&a!%_BY(|IDpnvM2DA^krxV?X&3!c
zV_W)=j#**HnEOii=cR>r9oF-U<Hea<s&u$b#*XLY2a(Ll%?{g<u~~Oc9>Wt2YeIa<
zW;eOZ*5PQDX<d$Vt#LEC%{wYcl6C2MnQC81=aZ(D+GV&~HcE8AkbO>?Ec2=HGO=#0
z-KpK!yiuR%y_7E2t{Ls&e$pHdq0;lNzc|cr1}oGVNbA_I-f3<mS0?L%xgOi3t~;iS
z#4Xd6w(_+`ER<x!*xW6XF6+jvUS6T{clCm%cUI}rM=Q0jlIzH<EnRLH?kZ0or%UNl
zO>Bfpq;ErIJWTgT4+^Pqoa2WF6Suj;xB-)u6T#udYZNaVl@&;SAUzGFqc*dqSfb<&
z4cYd>y+SR~rYGfSByCO-?sQDvGu9*4h5cm&0ZF7tW!adza-52*q1b6F6gxFyu^%B~
zC)PB@i@SjR&dXuOWO|fK4L!;Y*hTvt3E!9s2c1g8g?LE`RvBln$;weGZidn?zt9^3
z#JCL5qF@X@G+>$e!L-hf(XPm$7g1a8<E&{%d6^-@setD}XNjP6I(NZkU3jaorf@Mg
zxXVs@g&=kq@2PBOJZ<ZE|7VglJwTe8gK^H$#D=n5t2GdeqkBpZ3r{j0)M_m4?Ryua
za680fhRBT{FvTef?}*rvsLy`TMP<U8$PL{J?}}Itj{{vT--U8;t$GitQS}bEYH2;x
ex)XO5k7)Ct@UNR-JQRFsvK&teJuZ(Ho%j!BO?s99

diff --git a/locale/en_AU.po b/locale/en_AU.po
index 3582474..f578fa0 100644
--- a/locale/en_AU.po
+++ b/locale/en_AU.po
@@ -64,8 +64,11 @@ msgstr[1] "Received {quantity} {item}."
 msgid "quest.test_quest.title"
 msgstr "Test Quest"
 
-msgid "quest.test_quest.objective_onion.title"
-msgstr "Savenge an Onion"
+msgid "quest.test_quest.onion.title"
+msgstr "Scavenge Onions"
+
+msgid "quest.test_quest.onion.description"
+msgstr "Find and collect {quantity} {item} and bring them back to {npc}."
 
 #
 # ITEMS
diff --git a/project.godot b/project.godot
index 928243a..0417f43 100644
--- a/project.godot
+++ b/project.godot
@@ -116,7 +116,7 @@ run={
 
 [internationalization]
 
-locale/translations=PackedStringArray("res://locale/en_AU.mo")
+locale/translations=PackedStringArray("res://locale/en_AU.po")
 locale/language_filter=["ja"]
 locale/country_filter=["JP"]
 
diff --git a/scenes/Singletons/Quest.tscn b/scenes/Singletons/Quest.tscn
index 3869432..a0b6347 100644
--- a/scenes/Singletons/Quest.tscn
+++ b/scenes/Singletons/Quest.tscn
@@ -17,5 +17,9 @@ metadata/_custom_type_script = "uid://dn0kxbe85n40f"
 
 [node name="Find Onion" type="Node" parent="Quests/Test Quest"]
 script = ExtResource("3_l8p7p")
-title = "quest.test_quest.objective_onion.title"
+title = "quest.test_quest.onion.title"
+description = "quest.test_quest.onion.description"
+objectiveType = null
+itemType = 2
+quantity = 2
 metadata/_custom_type_script = "uid://de1ao4huhy0hm"
diff --git a/scenes/UI/QuestMenu.tscn b/scenes/UI/QuestMenu.tscn
index 0f227d9..0e5a59d 100644
--- a/scenes/UI/QuestMenu.tscn
+++ b/scenes/UI/QuestMenu.tscn
@@ -81,3 +81,4 @@ layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 1
 text = "Quest Objective Information"
+autowrap_mode = 2
diff --git a/scripts/Quest/Quest.gd b/scripts/Quest/Quest.gd
index b068831..fc1f63d 100644
--- a/scripts/Quest/Quest.gd
+++ b/scripts/Quest/Quest.gd
@@ -1,6 +1,6 @@
 class_name Quest extends Node
 
-@export var title:String = ""
+@export_multiline var title:String = ""
 @export var questKey:QuestSystem.QuestKey = QuestSystem.QuestKey.TEST_QUEST
 
 var questStarted:bool = false
@@ -28,4 +28,8 @@ func isStarted() -> bool:
 	return questStarted
 
 func objectiveUpdated(objective:QuestObjective) -> void:
-	QUEST.questUpdated.emit(self)
\ No newline at end of file
+	QUEST.questUpdated.emit(self)
+
+func getLocaleData() -> Dictionary[String, String]:
+	var dict: Dictionary[String, String] = {}
+	return dict
diff --git a/scripts/Quest/QuestObjective.gd b/scripts/Quest/QuestObjective.gd
index bb6a50e..d708d07 100644
--- a/scripts/Quest/QuestObjective.gd
+++ b/scripts/Quest/QuestObjective.gd
@@ -4,7 +4,8 @@ enum Type {
 	Item,
 }
 
-@export var title:String = ""
+@export_multiline var title:String = ""
+@export_multiline var description:String = ""
 @export var objectiveType:Type = Type.Item
 
 @export var itemType:Item.Type = Item.Type.POTION
@@ -38,3 +39,9 @@ func _onPlayerInventoryUpdated() -> void:
 
 func isCompleted() -> bool:
 	return completed
+
+func getLocaleData() -> Dictionary[String, String]:
+	var dict:Dictionary[String, String] = {}
+	dict.item = ITEM.getItemName(itemType, quantity)
+	dict.quantity = LOCALE.formatInteger(quantity)
+	return dict
diff --git a/scripts/Singleton/Locale.gd b/scripts/Singleton/Locale.gd
index 5c6bda8..3629b57 100644
--- a/scripts/Singleton/Locale.gd
+++ b/scripts/Singleton/Locale.gd
@@ -104,3 +104,6 @@ func setLocale(language:Language, region:Region) -> void:
 	TranslationServer.set_locale(l)
 	localeChanged.emit(l)
 	print("Locale set to: " + l)
+
+func formatInteger(integer:int) -> String:
+	return TextServerManager.get_primary_interface().format_number(str(integer))
diff --git a/scripts/UI/QuestMenu.gd b/scripts/UI/QuestMenu.gd
index b5dfd0b..90de31c 100644
--- a/scripts/UI/QuestMenu.gd
+++ b/scripts/UI/QuestMenu.gd
@@ -61,8 +61,11 @@ func setQuestObjective(objective = null):
 	var quest = QUEST.quests[currentQuestKey];
 	var questObjective = quest.objectives[objective]
 	questObjectiveList.select(objective)
-	
-	questObjectiveInfo.text = questObjective.title + "\n"
+
+	# Setup Description
+	var data = quest.getLocaleData()
+	data.merge(questObjective.getLocaleData())
+	questObjectiveInfo.text = tr(questObjective.description).format(data)
 
 
 func open(questKey = null) -> void:
@@ -77,19 +80,13 @@ func close() -> void:
 func isOpen() -> bool:
 	return self.visible
 
-
 # Private methods
 func _updateQuestList():
 	questList.clear()
 	questList.deselect_all()
 	for questKey in QUEST.quests:
 		var q = QUEST.quests[questKey]
-		var n = q.title;
-		if q.isCompleted():
-			n += " (Complete)"
-		elif q.isStarted():
-			n += " (Started)"
-		questList.add_item(n)
+		questList.add_item(q.title)
 
 
 # Event handlers