Show translation progress in language setting dropdown; Make TranslationManager a static class

5 files changed, 26 insertions, 15 deletions

diff --git a/client/global.gd b/client/global.gd
index 6adda3d0..4fe3d52e 100644
--- a/client/global.gd
+++ b/client/global.gd
@@ -37,6 +37,7 @@ var focused_node: Control
 var focused_menu: Menu # only use this as a last resort, currently exists to open setup menu from settings
 
 func _ready():
+	TranslationManager.load_locales()
 	GLTFDocument.register_gltf_document_extension(GLTFApplyNodeVisibility.new())
 	Profile.load(OS.get_data_dir().path_join("hurrycurry").path_join("profile"))
 	Settings.load(OS.get_config_dir().path_join("hurrycurry").path_join("settings.json"))
@@ -125,6 +126,13 @@ func language_list():
 	a.insert(0, "system")
 	return a
 
+func language_tooltip_list():
+	var out = []
+	for l in language_list():
+		var percentage = "%.0d" % (TranslationManager.LOCALE_STATS.get(l, 0.) * 100.)
+		out.append(tr("c.settings.ui.language.tooltip").format([percentage]))
+	return out
+
 static func unordered_array_eq(a: Array, b: Array) -> bool:
 	return unordered_array_subset(a, b) and unordered_array_subset(b, a)
 
diff --git a/client/gui/menus/settings/dropdown_setting.gd b/client/gui/menus/settings/dropdown_setting.gd
index 0d6f5ddc..6693f6a9 100644
--- a/client/gui/menus/settings/dropdown_setting.gd
+++ b/client/gui/menus/settings/dropdown_setting.gd
@@ -17,16 +17,19 @@ class_name DropdownSetting
 extends GameSetting
 
 var options: Array
+var tooltips: Array
 
-func _init(new_id: String, new_default, new_options: Array):
+func _init(new_id: String, new_default, new_options: Array, new_tooltips = null):
 	super(new_id, new_default)
 	options = new_options
+	tooltips = new_tooltips if new_tooltips else []
 
 func create_row():
 	var row = super()
 	row.value_node = OptionButton.new()
 	row.value_node.clip_text = true
-	for i in options: row.value_node.add_item(tr(nskey + "." + i))
+	for k in options: row.value_node.add_item(tr(nskey + "." + k))
+	for i in range(tooltips.size()): row.value_node.set_item_tooltip(i, tooltips[i])
 	Settings.hook_changed_init(key, row.value_node,
 		func(value):
 			if is_instance_valid(row):
diff --git a/client/project.godot b/client/project.godot
index c0d10492..89f25188 100644
--- a/client/project.godot
+++ b/client/project.godot
@@ -19,7 +19,6 @@ config/icon="res://icons/main.png"
 
 [autoload]
 
-TranslationManager="*res://system/translation_manager.gd"
 Global="*res://global.gd"
 Sound="*res://audio/sound.tscn"
 DisableWrongJoypads="*res://system/disable_wrong_joypads.gd"
diff --git a/client/system/settings.gd b/client/system/settings.gd
index 317da9d0..2e4c09b9 100644
--- a/client/system/settings.gd
+++ b/client/system/settings.gd
@@ -56,7 +56,7 @@ static func get_root():
 		]),
 		SettingsCategory.new("ui", [
 			DropdownSetting.new("touch_controls", "automatic", ["automatic", "enabled", "disabled"]),
-			DropdownSetting.new("language", "system", Global.language_list()),
+			DropdownSetting.new("language", "system", Global.language_list(), Global.language_tooltip_list()),
 			ToggleSetting.new("hide_overlays", false),
 			DropdownSetting.new("scale_mode", "resize", ["resize", "disabled"]),
 			RangeSetting.new("scale_factor", 1. if not Global.on_mobile() else 1.5, 0.5, 1.5, 3),
diff --git a/client/system/translation_manager.gd b/client/system/translation_manager.gd
index 9aa374b2..c2e5421a 100644
--- a/client/system/translation_manager.gd
+++ b/client/system/translation_manager.gd
@@ -14,16 +14,17 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 extends Node
+class_name TranslationManager
 
 const LOCALE_PATH := "res://locale/"
-const LOCALE_BOOK_PATH := "res://locale_book/"
 const NATIVE_LANGUAGE_NAMES_FILE_NAME := "native_language_names.ini1"
 
-func _init() -> void:
+static var LOCALE_STATS = {}
+
+static func load_locales() -> void:
 	 # Use english as fallback
 	var native_language_names := get_ini_dict(NATIVE_LANGUAGE_NAMES_FILE_NAME, LOCALE_PATH)
 	var fallback_strings := get_ini_dict("en.ini", LOCALE_PATH)
-	var fallback_strings_book := get_ini_dict("en.ini", LOCALE_BOOK_PATH)
 
 	for file_name in DirAccess.get_files_at(LOCALE_PATH):
 		if !file_name.ends_with(".ini"):
@@ -31,20 +32,20 @@ func _init() -> void:
 
 		var translation := Translation.new()
 		translation.locale = file_name.trim_suffix(".ini")
-		var trans_strings := get_ini_dict(file_name, LOCALE_PATH)
-		var trans_book_strings := get_ini_dict(file_name, LOCALE_BOOK_PATH)
+		var strings := get_ini_dict(file_name, LOCALE_PATH)
 		
+		var strings_total = fallback_strings.size()
+		var strings_found = 0
 		for k in fallback_strings.keys():
-			translation.add_message(k, trans_strings[k] if trans_strings.has(k) else fallback_strings[k])
-		for k in fallback_strings_book.keys():
-			translation.add_message(k, trans_book_strings[k] if trans_book_strings.has(k) else fallback_strings_book[k])
+			translation.add_message(k, strings[k] if strings.has(k) else fallback_strings[k])
+			if strings.has(k): strings_found += 1
 		for k in native_language_names.keys():
 			translation.add_message("c.settings.ui.language.%s" % k, native_language_names[k])
-		
-		TranslationServer.add_translation(translation)
 
+		LOCALE_STATS[translation.locale] = float(strings_found) / float(strings_total)
+		TranslationServer.add_translation(translation)
 
-func get_ini_dict(file_name: String, locale_path: String) -> Dictionary: # Dictionary[String, String]
+static func get_ini_dict(file_name: String, locale_path: String) -> Dictionary: # Dictionary[String, String]
 	var dict := {}
 	var lines := FileAccess.get_file_as_string(locale_path + file_name).split("\n", false)
 	if lines.size() > 0: