Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 04:06:14 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #99219 from Chaosus/fix_ttr_vformat

Browse Source 
Fix incorrect order: `TTR(vformat` instead of `vformat(TTR`
This commit is contained in:
Thaddeus Crews 2024-11-14 14:51:56 -06:00
commit 5dbc5af33d
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editor_help_search.cpp
View File

@ -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);

4
editor/export/editor_export_platform_pc.cpp
View File

@ -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);

4
modules/gridmap/editor/grid_map_editor_plugin.cpp
View File

@ -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);