Browse Source

Fix incorrect order: `TTR(vformat` instead of `vformat(TTR`

Chaosus 9 months ago
parent
commit
f3344b71b1

+ 2 - 2
editor/editor_help_search.cpp

@@ -1166,7 +1166,7 @@ TreeItem *EditorHelpSearch::Runner::_create_class_item(TreeItem *p_parent, const
 	if (p_matching_keyword.is_empty()) {
 	if (p_matching_keyword.is_empty()) {
 		item->set_text(0, p_doc->name);
 		item->set_text(0, p_doc->name);
 	} else {
 	} else {
-		item->set_text(0, p_doc->name + "      - " + TTR(vformat("Matches the \"%s\" keyword.", p_matching_keyword)));
+		item->set_text(0, p_doc->name + "      - " + vformat(TTR("Matches the \"%s\" keyword."), p_matching_keyword));
 	}
 	}
 
 
 	if (!term.is_empty()) {
 	if (!term.is_empty()) {
@@ -1272,7 +1272,7 @@ TreeItem *EditorHelpSearch::Runner::_create_member_item(TreeItem *p_parent, cons
 		text = p_class_name + "." + p_text;
 		text = p_class_name + "." + p_text;
 	}
 	}
 	if (!p_matching_keyword.is_empty()) {
 	if (!p_matching_keyword.is_empty()) {
-		text += "      - " + TTR(vformat("Matches the \"%s\" keyword.", p_matching_keyword));
+		text += "      - " + vformat(TTR("Matches the \"%s\" keyword."), p_matching_keyword);
 	}
 	}
 	item->set_text(0, text);
 	item->set_text(0, text);
 
 

+ 2 - 2
editor/export/editor_export_platform_pc.cpp

@@ -223,13 +223,13 @@ Error EditorExportPlatformPC::export_project_data(const Ref<EditorExportPreset>
 				if (err == OK) {
 				if (err == OK) {
 					err = da->copy_dir(src_path, target_path, -1, true);
 					err = da->copy_dir(src_path, target_path, -1, true);
 					if (err != OK) {
 					if (err != OK) {
-						add_message(EXPORT_MESSAGE_ERROR, TTR("GDExtension"), TTR(vformat("Failed to copy shared object \"%s\".", src_path)));
+						add_message(EXPORT_MESSAGE_ERROR, TTR("GDExtension"), vformat(TTR("Failed to copy shared object \"%s\"."), src_path));
 					}
 					}
 				}
 				}
 			} else {
 			} else {
 				err = da->copy(src_path, target_path);
 				err = da->copy(src_path, target_path);
 				if (err != OK) {
 				if (err != OK) {
-					add_message(EXPORT_MESSAGE_ERROR, TTR("GDExtension"), TTR(vformat("Failed to copy shared object \"%s\".", src_path)));
+					add_message(EXPORT_MESSAGE_ERROR, TTR("GDExtension"), vformat(TTR("Failed to copy shared object \"%s\"."), src_path));
 				}
 				}
 				if (err == OK) {
 				if (err == OK) {
 					err = sign_shared_object(p_preset, p_debug, target_path);
 					err = sign_shared_object(p_preset, p_debug, target_path);

+ 2 - 2
modules/gridmap/editor/grid_map_editor_plugin.cpp

@@ -1462,9 +1462,9 @@ GridMapEditor::GridMapEditor() {
 	floor->set_max(32767);
 	floor->set_max(32767);
 	floor->set_step(1);
 	floor->set_step(1);
 	floor->set_tooltip_text(
 	floor->set_tooltip_text(
-			TTR(vformat("Change Grid Floor:\nPrevious Plane (%s)\nNext Plane (%s)",
+			vformat(TTR("Change Grid Floor:\nPrevious Plane (%s)\nNext Plane (%s)"),
 					ED_GET_SHORTCUT("grid_map/previous_floor")->get_as_text(),
 					ED_GET_SHORTCUT("grid_map/previous_floor")->get_as_text(),
-					ED_GET_SHORTCUT("grid_map/next_floor")->get_as_text())));
+					ED_GET_SHORTCUT("grid_map/next_floor")->get_as_text()));
 	toolbar->add_child(floor);
 	toolbar->add_child(floor);
 	floor->get_line_edit()->add_theme_constant_override("minimum_character_width", 2);
 	floor->get_line_edit()->add_theme_constant_override("minimum_character_width", 2);
 	floor->get_line_edit()->set_context_menu_enabled(false);
 	floor->get_line_edit()->set_context_menu_enabled(false);