From b78093041d877ef30c2d17878cc03fd30c4b229c Mon Sep 17 00:00:00 2001 From: hop311 Date: Wed, 18 Sep 2024 23:12:41 +0100 Subject: Add RuleSet and ModifierValue tooltip making functions --- extension/src/openvic-extension/classes/GUILabel.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'extension/src/openvic-extension/classes') diff --git a/extension/src/openvic-extension/classes/GUILabel.cpp b/extension/src/openvic-extension/classes/GUILabel.cpp index 7e93f01..3c7cfed 100644 --- a/extension/src/openvic-extension/classes/GUILabel.cpp +++ b/extension/src/openvic-extension/classes/GUILabel.cpp @@ -523,7 +523,16 @@ String GUILabel::generate_substituted_text(String const& base_text) const { String value = substitution_dict.get(key, String {}); // Use the un-substituted key if no value is found or the value is empty - result += value.is_empty() ? key : is_auto_translating() ? tr(value) : value; + if (value.is_empty()) { + value = key; + } + + // Translate the value if auto-translating (even if it's the key after a failed substitution) + if (is_auto_translating()) { + value = tr(value); + } + + result += value; start_pos = marker_end_pos + get_substitution_marker().length(); } -- cgit v1.2.3-56-ga3b1