Merge pull request godotengine#106249 from KoBeWi/translation_settings

Improve auto-translation of settings dialogs

Author: Repiteo

editor/action_map_editor.cpp

@@ -85,7 +85,7 @@ String ActionMapEditor::_check_new_action_name(const String &p_name) {
 }
 
 void ActionMapEditor::_add_edit_text_changed(const String &p_name) {
-	String error = _check_new_action_name(p_name);
+	const String error = _check_new_action_name(p_name);
 	add_button->set_tooltip_text(error);
 	add_button->set_disabled(!error.is_empty());
 }
@@ -361,6 +361,15 @@ void ActionMapEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data,
 
 void ActionMapEditor::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_TRANSLATION_CHANGED: {
+			if (!actions_cache.is_empty()) {
+				update_action_list();
+			}
+			if (!add_button->get_tooltip_text().is_empty()) {
+				_add_edit_text_changed(add_edit->get_text());
+			}
+		} break;
+
 		case NOTIFICATION_THEME_CHANGED: {
 			action_list_search->set_right_icon(get_editor_theme_icon(SNAME("Search")));
 			add_button->set_button_icon(get_editor_theme_icon(SNAME("Add")));
@@ -455,10 +464,10 @@ void ActionMapEditor::update_action_list(const Vector<ActionInfo> &p_action_info
 			bool events_eq = Shortcut::is_event_array_equal(action_info.action_initial["events"], action_info.action["events"]);
 			bool action_eq = deadzone_eq && events_eq;
 			action_item->set_meta("__action_initial", action_info.action_initial);
-			action_item->add_button(2, action_tree->get_editor_theme_icon(SNAME("ReloadSmall")), BUTTON_REVERT_ACTION, action_eq, action_eq ? TTR("Cannot Revert - Action is same as initial") : TTR("Revert Action"));
+			action_item->add_button(2, action_tree->get_editor_theme_icon(SNAME("ReloadSmall")), BUTTON_REVERT_ACTION, action_eq, action_eq ? TTRC("Cannot Revert - Action is same as initial") : TTRC("Revert Action"));
 		}
-		action_item->add_button(2, action_tree->get_editor_theme_icon(SNAME("Add")), BUTTON_ADD_EVENT, false, TTR("Add Event"));
-		action_item->add_button(2, action_tree->get_editor_theme_icon(SNAME("Remove")), BUTTON_REMOVE_ACTION, !action_info.editable, action_info.editable ? TTR("Remove Action") : TTR("Cannot Remove Action"));
+		action_item->add_button(2, action_tree->get_editor_theme_icon(SNAME("Add")), BUTTON_ADD_EVENT, false, TTRC("Add Event"));
+		action_item->add_button(2, action_tree->get_editor_theme_icon(SNAME("Remove")), BUTTON_REMOVE_ACTION, !action_info.editable, action_info.editable ? TTRC("Remove Action") : TTRC("Cannot Remove Action"));
 
 		action_item->set_custom_bg_color(0, action_tree->get_theme_color(SNAME("prop_subsection"), EditorStringName(Editor)));
 		action_item->set_custom_bg_color(1, action_tree->get_theme_color(SNAME("prop_subsection"), EditorStringName(Editor)));
@@ -506,8 +515,8 @@ void ActionMapEditor::update_action_list(const Vector<ActionInfo> &p_action_info
 			}
 
 			// Third Column - Buttons
-			event_item->add_button(2, action_tree->get_editor_theme_icon(SNAME("Edit")), BUTTON_EDIT_EVENT, false, TTR("Edit Event"), TTR("Edit Event"));
-			event_item->add_button(2, action_tree->get_editor_theme_icon(SNAME("Remove")), BUTTON_REMOVE_EVENT, false, TTR("Remove Event"), TTR("Remove Event"));
+			event_item->add_button(2, action_tree->get_editor_theme_icon(SNAME("Edit")), BUTTON_EDIT_EVENT, false, TTRC("Edit Event"), TTRC("Edit Event"));
+			event_item->add_button(2, action_tree->get_editor_theme_icon(SNAME("Remove")), BUTTON_REMOVE_EVENT, false, TTRC("Remove Event"), TTRC("Remove Event"));
 			event_item->set_button_color(2, 0, Color(1, 1, 1, 0.75));
 			event_item->set_button_color(2, 1, Color(1, 1, 1, 0.75));
 		}
@@ -547,7 +556,7 @@ ActionMapEditor::ActionMapEditor() {
 
 	action_list_search = memnew(LineEdit);
 	action_list_search->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	action_list_search->set_placeholder(TTR("Filter by Name"));
+	action_list_search->set_placeholder(TTRC("Filter by Name"));
 	action_list_search->set_accessibility_name(TTRC("Filter by Name"));
 	action_list_search->set_clear_button_enabled(true);
 	action_list_search->connect(SceneStringName(text_changed), callable_mp(this, &ActionMapEditor::_search_term_updated));
@@ -563,8 +572,8 @@ ActionMapEditor::ActionMapEditor() {
 	top_hbox->add_child(action_list_search_by_event);
 
 	clear_all_search = memnew(Button);
-	clear_all_search->set_text(TTR("Clear All"));
-	clear_all_search->set_tooltip_text(TTR("Clear all search filters."));
+	clear_all_search->set_text(TTRC("Clear All"));
+	clear_all_search->set_tooltip_text(TTRC("Clear all search filters."));
 	clear_all_search->connect(SceneStringName(pressed), callable_mp(action_list_search_by_event, &EventListenerLineEdit::clear_event));
 	clear_all_search->connect(SceneStringName(pressed), callable_mp(action_list_search, &LineEdit::clear));
 	top_hbox->add_child(clear_all_search);
@@ -575,7 +584,7 @@ ActionMapEditor::ActionMapEditor() {
 
 	add_edit = memnew(LineEdit);
 	add_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	add_edit->set_placeholder(TTR("Add New Action"));
+	add_edit->set_placeholder(TTRC("Add New Action"));
 	add_edit->set_accessibility_name(TTRC("Add New Action"));
 	add_edit->set_clear_button_enabled(true);
 	add_edit->set_keep_editing_on_text_submit(true);
@@ -584,7 +593,7 @@ ActionMapEditor::ActionMapEditor() {
 	add_hbox->add_child(add_edit);
 
 	add_button = memnew(Button);
-	add_button->set_text(TTR("Add"));
+	add_button->set_text(TTRC("Add"));
 	add_button->connect(SceneStringName(pressed), callable_mp(this, &ActionMapEditor::_add_action_pressed));
 	add_hbox->add_child(add_button);
 	// Disable the button and set its tooltip.
@@ -593,7 +602,7 @@ ActionMapEditor::ActionMapEditor() {
 	add_hbox->add_child(memnew(VSeparator));
 
 	show_builtin_actions_checkbutton = memnew(CheckButton);
-	show_builtin_actions_checkbutton->set_text(TTR("Show Built-in Actions"));
+	show_builtin_actions_checkbutton->set_text(TTRC("Show Built-in Actions"));
 	show_builtin_actions_checkbutton->connect(SceneStringName(toggled), callable_mp(this, &ActionMapEditor::set_show_builtin_actions));
 	add_hbox->add_child(show_builtin_actions_checkbutton);
 
@@ -609,9 +618,9 @@ ActionMapEditor::ActionMapEditor() {
 	action_tree->set_columns(3);
 	action_tree->set_hide_root(true);
 	action_tree->set_column_titles_visible(true);
-	action_tree->set_column_title(0, TTR("Action"));
+	action_tree->set_column_title(0, TTRC("Action"));
 	action_tree->set_column_clip_content(0, true);
-	action_tree->set_column_title(1, TTR("Deadzone"));
+	action_tree->set_column_title(1, TTRC("Deadzone"));
 	action_tree->set_column_expand(1, false);
 	action_tree->set_column_custom_minimum_width(1, 80 * EDSCALE);
 	action_tree->set_column_expand(2, false);

editor/editor_autoload_settings.cpp

@@ -57,6 +57,12 @@ void EditorAutoloadSettings::_notification(int p_what) {
 			browse_button->set_button_icon(get_editor_theme_icon(SNAME("Folder")));
 		} break;
 
+		case NOTIFICATION_TRANSLATION_CHANGED: {
+			if (!error_message->get_text().is_empty()) {
+				_autoload_text_changed(autoload_add_name->get_text());
+			}
+		} break;
+
 		case NOTIFICATION_THEME_CHANGED: {
 			browse_button->set_button_icon(get_editor_theme_icon(SNAME("Folder")));
 			add_autoload->set_button_icon(get_editor_theme_icon(SNAME("Add")));
@@ -529,7 +535,7 @@ void EditorAutoloadSettings::update_autoload() {
 
 		item->set_cell_mode(2, TreeItem::CELL_MODE_CHECK);
 		item->set_editable(2, true);
-		item->set_text(2, TTR("Enable"));
+		item->set_text(2, TTRC("Enable"));
 		item->set_checked(2, info.is_singleton);
 		item->add_button(3, get_editor_theme_icon(SNAME("Load")), BUTTON_OPEN);
 		item->add_button(3, get_editor_theme_icon(SNAME("MoveUp")), BUTTON_MOVE_UP);
@@ -888,22 +894,23 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
 	add_child(hbc);
 
 	error_message = memnew(Label);
+	error_message->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	error_message->set_focus_mode(FOCUS_ACCESSIBILITY);
 	error_message->hide();
 	error_message->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_RIGHT);
 	error_message->add_theme_color_override(SceneStringName(font_color), EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("error_color"), EditorStringName(Editor)));
 	add_child(error_message);
 
 	Label *l = memnew(Label);
-	l->set_text(TTR("Path:"));
+	l->set_text(TTRC("Path:"));
 	hbc->add_child(l);
 
 	autoload_add_path = memnew(LineEdit);
 	hbc->add_child(autoload_add_path);
 	autoload_add_path->set_accessibility_name(TTRC("Autoload Path"));
 	autoload_add_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	autoload_add_path->set_clear_button_enabled(true);
-	autoload_add_path->set_placeholder(vformat(TTR("Set path or press \"%s\" to create a script."), TTR("Add")));
+	autoload_add_path->set_placeholder(TTRC("Set path or press \"Add\" to create a script."));
 	autoload_add_path->connect(SceneStringName(text_changed), callable_mp(this, &EditorAutoloadSettings::_autoload_path_text_changed));
 
 	browse_button = memnew(Button);
@@ -922,7 +929,7 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
 	file_dialog->connect("file_selected", callable_mp(this, &EditorAutoloadSettings::_autoload_file_callback));
 
 	l = memnew(Label);
-	l->set_text(TTR("Node Name:"));
+	l->set_text(TTRC("Node Name:"));
 	hbc->add_child(l);
 
 	autoload_add_name = memnew(LineEdit);
@@ -933,7 +940,7 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
 	hbc->add_child(autoload_add_name);
 
 	add_autoload = memnew(Button);
-	add_autoload->set_text(TTR("Add"));
+	add_autoload->set_text(TTRC("Add"));
 	add_autoload->connect(SceneStringName(pressed), callable_mp(this, &EditorAutoloadSettings::_autoload_add));
 	// The button will be enabled once a valid name is entered (either automatically or manually).
 	add_autoload->set_disabled(true);
@@ -950,16 +957,16 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
 	tree->set_columns(4);
 	tree->set_column_titles_visible(true);
 
-	tree->set_column_title(0, TTR("Name"));
+	tree->set_column_title(0, TTRC("Name"));
 	tree->set_column_expand(0, true);
 	tree->set_column_expand_ratio(0, 1);
 
-	tree->set_column_title(1, TTR("Path"));
+	tree->set_column_title(1, TTRC("Path"));
 	tree->set_column_expand(1, true);
 	tree->set_column_clip_content(1, true);
 	tree->set_column_expand_ratio(1, 2);
 
-	tree->set_column_title(2, TTR("Global Variable"));
+	tree->set_column_title(2, TTRC("Global Variable"));
 	tree->set_column_expand(2, false);
 
 	tree->set_column_expand(3, false);

editor/editor_locale_dialog.cpp

@@ -39,6 +39,18 @@
 #include "scene/gui/option_button.h"
 #include "scene/gui/tree.h"
 
+void EditorLocaleDialog::_notification(int p_what) {
+	if (p_what == NOTIFICATION_TRANSLATION_CHANGED) {
+		// TRANSLATORS: This is the label for a list of writing systems.
+		script_label1->set_text(TTR("Script:", "Locale"));
+		// TRANSLATORS: This refers to a writing system.
+		script_label2->set_text(TTR("Script", "Locale"));
+
+		script_list->set_accessibility_name(TTR("Script", "Locale"));
+		script_code->set_accessibility_name(TTR("Script", "Locale"));
+	}
+}
+
 void EditorLocaleDialog::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("locale_selected", PropertyInfo(Variant::STRING, "locale")));
 }
@@ -295,7 +307,7 @@ void EditorLocaleDialog::_update_tree() {
 
 	if (!is_edit_mode) {
 		TreeItem *t = script_list->create_item(s_root);
-		t->set_text(0, TTR("[Default]"));
+		t->set_text(0, TTRC("[Default]"));
 		t->set_metadata(0, "");
 	}
 
@@ -323,7 +335,7 @@ void EditorLocaleDialog::_update_tree() {
 
 	if (!is_edit_mode) {
 		TreeItem *t = cnt_list->create_item(c_root);
-		t->set_text(0, TTR("[Default]"));
+		t->set_text(0, TTRC("[Default]"));
 		t->set_metadata(0, "");
 	}
 
@@ -389,32 +401,32 @@ void EditorLocaleDialog::popup_locale_dialog() {
 }
 
 EditorLocaleDialog::EditorLocaleDialog() {
-	set_title(TTR("Select a Locale"));
+	set_title(TTRC("Select a Locale"));
 
 	VBoxContainer *vb = memnew(VBoxContainer);
 	{
 		HBoxContainer *hb_filter = memnew(HBoxContainer);
 		{
 			filter_mode = memnew(OptionButton);
 			filter_mode->set_accessibility_name(TTRC("Locale Filter"));
-			filter_mode->add_item(TTR("Show All Locales"), SHOW_ALL_LOCALES);
+			filter_mode->add_item(TTRC("Show All Locales"), SHOW_ALL_LOCALES);
 			filter_mode->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-			filter_mode->add_item(TTR("Show Selected Locales Only"), SHOW_ONLY_SELECTED_LOCALES);
+			filter_mode->add_item(TTRC("Show Selected Locales Only"), SHOW_ONLY_SELECTED_LOCALES);
 			filter_mode->select(0);
 			filter_mode->connect(SceneStringName(item_selected), callable_mp(this, &EditorLocaleDialog::_filter_mode_changed));
 			hb_filter->add_child(filter_mode);
 		}
 		{
 			edit_filters = memnew(CheckButton);
-			edit_filters->set_text(TTR("Edit Filters"));
+			edit_filters->set_text(TTRC("Edit Filters"));
 			edit_filters->set_toggle_mode(true);
 			edit_filters->set_pressed(false);
 			edit_filters->connect(SceneStringName(toggled), callable_mp(this, &EditorLocaleDialog::_edit_filters));
 			hb_filter->add_child(edit_filters);
 		}
 		{
 			advanced = memnew(CheckButton);
-			advanced->set_text(TTR("Advanced"));
+			advanced->set_text(TTRC("Advanced"));
 			advanced->set_toggle_mode(true);
 			advanced->set_pressed(false);
 			advanced->connect(SceneStringName(toggled), callable_mp(this, &EditorLocaleDialog::_toggle_advanced));
@@ -430,7 +442,7 @@ EditorLocaleDialog::EditorLocaleDialog() {
 			vb_lang_list->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 			{
 				Label *lang_lbl = memnew(Label);
-				lang_lbl->set_text(TTR("Language:"));
+				lang_lbl->set_text(TTRC("Language:"));
 				vb_lang_list->add_child(lang_lbl);
 			}
 			{
@@ -449,14 +461,12 @@ EditorLocaleDialog::EditorLocaleDialog() {
 			vb_script_list = memnew(VBoxContainer);
 			vb_script_list->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 			{
-				Label *script_lbl = memnew(Label);
-				// TRANSLATORS: This is the label for a list of writing systems.
-				script_lbl->set_text(TTR("Script:", "Locale"));
-				vb_script_list->add_child(script_lbl);
+				script_label1 = memnew(Label);
+				script_label1->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
+				vb_script_list->add_child(script_label1);
 			}
 			{
 				script_list = memnew(Tree);
-				script_list->set_accessibility_name(TTR("Script", "Locale"));
 				script_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 				script_list->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 				script_list->connect("cell_selected", callable_mp(this, &EditorLocaleDialog::_item_selected));
@@ -471,7 +481,7 @@ EditorLocaleDialog::EditorLocaleDialog() {
 			vb_cnt_list->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 			{
 				Label *cnt_lbl = memnew(Label);
-				cnt_lbl->set_text(TTR("Country:"));
+				cnt_lbl->set_text(TTRC("Country:"));
 				vb_cnt_list->add_child(cnt_lbl);
 			}
 			{
@@ -497,7 +507,7 @@ EditorLocaleDialog::EditorLocaleDialog() {
 				vb_language->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 				{
 					Label *language_lbl = memnew(Label);
-					language_lbl->set_text(TTR("Language"));
+					language_lbl->set_text(TTRC("Language"));
 					vb_language->add_child(language_lbl);
 				}
 				{
@@ -512,15 +522,13 @@ EditorLocaleDialog::EditorLocaleDialog() {
 				VBoxContainer *vb_script = memnew(VBoxContainer);
 				vb_script->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 				{
-					Label *script_lbl = memnew(Label);
-					// TRANSLATORS: This refers to a writing system.
-					script_lbl->set_text(TTR("Script", "Locale"));
-					vb_script->add_child(script_lbl);
+					script_label2 = memnew(Label);
+					script_label2->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
+					vb_script->add_child(script_label2);
 				}
 				{
 					script_code = memnew(LineEdit);
 					script_code->set_max_length(4);
-					script_code->set_accessibility_name("Script");
 					vb_script->add_child(script_code);
 				}
 				hb_locale->add_child(vb_script);
@@ -530,7 +538,7 @@ EditorLocaleDialog::EditorLocaleDialog() {
 				vb_country->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 				{
 					Label *country_lbl = memnew(Label);
-					country_lbl->set_text(TTR("Country"));
+					country_lbl->set_text(TTRC("Country"));
 					vb_country->add_child(country_lbl);
 				}
 				{
@@ -546,7 +554,7 @@ EditorLocaleDialog::EditorLocaleDialog() {
 				vb_variant->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 				{
 					Label *variant_lbl = memnew(Label);
-					variant_lbl->set_text(TTR("Variant"));
+					variant_lbl->set_text(TTRC("Variant"));
 					vb_variant->add_child(variant_lbl);
 				}
 				{
@@ -564,5 +572,5 @@ EditorLocaleDialog::EditorLocaleDialog() {
 	add_child(vb);
 	_update_tree();
 
-	set_ok_button_text(TTR("Select"));
+	set_ok_button_text(TTRC("Select"));
 }

editor/editor_locale_dialog.h

@@ -60,10 +60,14 @@ class EditorLocaleDialog : public ConfirmationDialog {
 	Tree *script_list = nullptr;
 	Tree *cnt_list = nullptr;
 
+	Label *script_label1 = nullptr;
+	Label *script_label2 = nullptr;
+
 	bool locale_set = false;
 	bool updating_lists = false;
 
 protected:
+	void _notification(int p_what);
 	static void _bind_methods();
 	virtual void _post_popup() override;
 	virtual void ok_pressed() override;

editor/editor_sectioned_inspector.cpp

@@ -326,7 +326,7 @@ void SectionedInspector::_search_changed(const String &p_what) {
 		} else {
 			advanced_toggle->set_pressed_no_signal(true);
 			advanced_toggle->set_disabled(true);
-			advanced_toggle->set_tooltip_text(TTR("Advanced settings are always shown when searching."));
+			advanced_toggle->set_tooltip_text(TTRC("Advanced settings are always shown when searching."));
 		}
 	}
 	update_category_list();
@@ -338,6 +338,15 @@ void SectionedInspector::_advanced_toggled(bool p_toggled_on) {
 	inspector->set_restrict_to_basic_settings(restrict_to_basic);
 }
 
+void SectionedInspector::_notification(int p_notification) {
+	if (p_notification == NOTIFICATION_TRANSLATION_CHANGED) {
+		if (sections->get_root()) {
+			// Only update when initialized.
+			callable_mp(this, &SectionedInspector::update_category_list).call_deferred();
+		}
+	}
+}
+
 EditorInspector *SectionedInspector::get_inspector() {
 	return inspector;
 }