Merge pull request #40660 from SkyLucilfer/TTRFix

Fix TTR misuse

editor/editor_autoload_settings.cpp

@@ -688,12 +688,12 @@ bool EditorAutoloadSettings::autoload_add(const String &p_name, const String &p_
 
 	const String &path = p_path;
 	if (!FileAccess::exists(path)) {
-		EditorNode::get_singleton()->show_warning(TTR("Can't add autoload:") + "\n" + TTR(vformat("%s is an invalid path. File does not exist.", path)));
+		EditorNode::get_singleton()->show_warning(TTR("Can't add autoload:") + "\n" + vformat(TTR("%s is an invalid path. File does not exist."), path));
 		return false;
 	}
 
 	if (!path.begins_with("res://")) {
-		EditorNode::get_singleton()->show_warning(TTR("Can't add autoload:") + "\n" + TTR(vformat("%s is an invalid path. Not in resource path (res://).", path)));
+		EditorNode::get_singleton()->show_warning(TTR("Can't add autoload:") + "\n" + vformat(TTR("%s is an invalid path. Not in resource path (res://)."), path));
 		return false;
 	}
 

editor/input_map_editor.cpp

@@ -36,44 +36,44 @@
 #include "editor/editor_scale.h"
 
 static const char *_button_descriptions[JOY_SDL_BUTTONS] = {
-	"Face Bottom, DualShock Cross, Xbox A, Nintendo B",
-	"Face Right, DualShock Circle, Xbox B, Nintendo A",
-	"Face Left, DualShock Square, Xbox X, Nintendo Y",
-	"Face Top, DualShock Triangle, Xbox Y, Nintendo X",
-	"DualShock Select, Xbox Back, Nintendo -",
-	"Home, DualShock PS, Guide",
-	"Start, Nintendo +",
-	"Left Stick, DualShock L3, Xbox L/LS",
-	"Right Stick, DualShock R3, Xbox R/RS",
-	"Left Shoulder, DualShock L1, Xbox LB",
-	"Right Shoulder, DualShock R1, Xbox RB",
-	"D-Pad Up",
-	"D-Pad Down",
-	"D-Pad Left",
-	"D-Pad Right"
+	TTRC("Face Bottom, DualShock Cross, Xbox A, Nintendo B"),
+	TTRC("Face Right, DualShock Circle, Xbox B, Nintendo A"),
+	TTRC("Face Left, DualShock Square, Xbox X, Nintendo Y"),
+	TTRC("Face Top, DualShock Triangle, Xbox Y, Nintendo X"),
+	TTRC("DualShock Select, Xbox Back, Nintendo -"),
+	TTRC("Home, DualShock PS, Guide"),
+	TTRC("Start, Nintendo +"),
+	TTRC("Left Stick, DualShock L3, Xbox L/LS"),
+	TTRC("Right Stick, DualShock R3, Xbox R/RS"),
+	TTRC("Left Shoulder, DualShock L1, Xbox LB"),
+	TTRC("Right Shoulder, DualShock R1, Xbox RB"),
+	TTRC("D-Pad Up"),
+	TTRC("D-Pad Down"),
+	TTRC("D-Pad Left"),
+	TTRC("D-Pad Right")
 };
 
 static const char *_axis_descriptions[JOY_AXIS_MAX * 2] = {
-	"Left Stick Left",
-	"Left Stick Right",
-	"Left Stick Up",
-	"Left Stick Down",
-	"Right Stick Left",
-	"Right Stick Right",
-	"Right Stick Up",
-	"Right Stick Down",
-	"Joystick 2 Left",
-	"Joystick 2 Right, Left Trigger, L2, LT",
-	"Joystick 2 Up",
-	"Joystick 2 Down, Right Trigger, R2, RT",
-	"Joystick 3 Left",
-	"Joystick 3 Right",
-	"Joystick 3 Up",
-	"Joystick 3 Down",
-	"Joystick 4 Left",
-	"Joystick 4 Right",
-	"Joystick 4 Up",
-	"Joystick 4 Down",
+	TTRC("Left Stick Left"),
+	TTRC("Left Stick Right"),
+	TTRC("Left Stick Up"),
+	TTRC("Left Stick Down"),
+	TTRC("Right Stick Left"),
+	TTRC("Right Stick Right"),
+	TTRC("Right Stick Up"),
+	TTRC("Right Stick Down"),
+	TTRC("Joystick 2 Left"),
+	TTRC("Joystick 2 Right, Left Trigger, L2, LT"),
+	TTRC("Joystick 2 Up"),
+	TTRC("Joystick 2 Down, Right Trigger, R2, RT"),
+	TTRC("Joystick 3 Left"),
+	TTRC("Joystick 3 Right"),
+	TTRC("Joystick 3 Up"),
+	TTRC("Joystick 3 Down"),
+	TTRC("Joystick 4 Left"),
+	TTRC("Joystick 4 Right"),
+	TTRC("Joystick 4 Up"),
+	TTRC("Joystick 4 Down"),
 };
 
 void InputMapEditor::_notification(int p_what) {

editor/plugins/animation_player_editor_plugin.cpp

@@ -411,7 +411,7 @@ void AnimationPlayerEditor::_animation_remove() {
 
 	String current = animation->get_item_text(animation->get_selected());
 
-	delete_dialog->set_text(TTR("Delete Animation '" + current + "'?"));
+	delete_dialog->set_text(vformat(TTR("Delete Animation '%s'?"), current));
 	delete_dialog->popup_centered();
 }
 

editor/plugins/node_3d_editor_plugin.cpp

@@ -5407,7 +5407,7 @@ void Node3DEditor::_update_gizmos_menu() {
 		}
 		String plugin_name = gizmo_plugins_by_name[i]->get_name();
 		const int plugin_state = gizmo_plugins_by_name[i]->get_state();
-		gizmos_menu->add_multistate_item(TTR(plugin_name), 3, plugin_state, i);
+		gizmos_menu->add_multistate_item(plugin_name, 3, plugin_state, i);
 		const int idx = gizmos_menu->get_item_index(i);
 		gizmos_menu->set_item_tooltip(
 				idx,

editor/plugins/tile_set_editor_plugin.cpp

@@ -698,7 +698,7 @@ void TileSetEditor::_on_tileset_toolbar_confirm() {
 			List<int> ids;
 			tileset->get_tile_list(&ids);
 
-			undo_redo->create_action(TTR(option == TOOL_TILESET_MERGE_SCENE ? "Merge Tileset from Scene" : "Create Tileset from Scene"));
+			undo_redo->create_action(option == TOOL_TILESET_MERGE_SCENE ? TTR("Merge Tileset from Scene") : TTR("Create Tileset from Scene"));
 			undo_redo->add_do_method(this, "_undo_redo_import_scene", scene, option == TOOL_TILESET_MERGE_SCENE);
 			undo_redo->add_undo_method(tileset.ptr(), "clear");
 			for (List<int>::Element *E = ids.front(); E; E = E->next()) {

editor/scene_tree_dock.cpp

@@ -2718,7 +2718,7 @@ void SceneTreeDock::_update_create_root_dialog() {
 				if (l != String()) {
 					Button *button = memnew(Button);
 					favorite_nodes->add_child(button);
-					button->set_text(TTR(l));
+					button->set_text(l);
 					String name = l.get_slicec(' ', 0);
 					if (ScriptServer::is_global_class(name)) {
 						name = ScriptServer::get_global_class_native_base(name);

editor/script_create_dialog.cpp

@@ -603,7 +603,7 @@ void ScriptCreateDialog::_path_entered(const String &p_path) {
 }
 
 void ScriptCreateDialog::_msg_script_valid(bool valid, const String &p_msg) {
-	error_label->set_text("- " + TTR(p_msg));
+	error_label->set_text("- " + p_msg);
 	if (valid) {
 		error_label->add_theme_color_override("font_color", gc->get_theme_color("success_color", "Editor"));
 	} else {
@@ -612,7 +612,7 @@ void ScriptCreateDialog::_msg_script_valid(bool valid, const String &p_msg) {
 }
 
 void ScriptCreateDialog::_msg_path_valid(bool valid, const String &p_msg) {
-	path_error_label->set_text("- " + TTR(p_msg));
+	path_error_label->set_text("- " + p_msg);
 	if (valid) {
 		path_error_label->add_theme_color_override("font_color", gc->get_theme_color("success_color", "Editor"));
 	} else {