diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-11-12 22:59:38 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-11-12 22:59:38 +0100 |
commit | 5a5b456fca2f6130293c81ab6cbeb9094e87e60a (patch) | |
tree | 2c03e7ffe900b8a02c279b4852a0e551f5d0923c /platform | |
parent | d443f127ef1db9fb2fe623ba1c17ded5402aff10 (diff) | |
parent | 15b8185c68cbf46802834fc629a758d144abaeb6 (diff) | |
download | redot-engine-5a5b456fca2f6130293c81ab6cbeb9094e87e60a.tar.gz |
Merge pull request #84774 from akien-mga/fix-TTR-in-ERR-WARN-prints
Don't use TTR/RTR for ERR/WARN prints
Diffstat (limited to 'platform')
-rw-r--r-- | platform/linuxbsd/freedesktop_portal_desktop.cpp | 2 | ||||
-rw-r--r-- | platform/macos/display_server_macos.mm | 18 | ||||
-rw-r--r-- | platform/macos/godot_menu_delegate.mm | 4 | ||||
-rw-r--r-- | platform/windows/display_server_windows.cpp | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/platform/linuxbsd/freedesktop_portal_desktop.cpp b/platform/linuxbsd/freedesktop_portal_desktop.cpp index d9aa98ba70..6a5b5b8064 100644 --- a/platform/linuxbsd/freedesktop_portal_desktop.cpp +++ b/platform/linuxbsd/freedesktop_portal_desktop.cpp @@ -434,7 +434,7 @@ void FreeDesktopPortalDesktop::_file_dialog_callback(const Callable &p_callable, p_callable.callp(args, 3, ret, ce); if (ce.error != Callable::CallError::CALL_OK) { - ERR_PRINT(vformat(RTR("Failed to execute file dialogs callback: %s."), Variant::get_callable_error_text(p_callable, args, 3, ce))); + ERR_PRINT(vformat("Failed to execute file dialogs callback: %s.", Variant::get_callable_error_text(p_callable, args, 3, ce))); } } diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm index cb4c80cc75..20c1a5342f 100644 --- a/platform/macos/display_server_macos.mm +++ b/platform/macos/display_server_macos.mm @@ -616,7 +616,7 @@ void DisplayServerMacOS::menu_open(NSMenu *p_menu) { md.open.callp(nullptr, 0, ret, ce); if (ce.error != Callable::CallError::CALL_OK) { - ERR_PRINT(vformat(RTR("Failed to execute menu open callback: %s."), Variant::get_callable_error_text(md.open, nullptr, 0, ce))); + ERR_PRINT(vformat("Failed to execute menu open callback: %s.", Variant::get_callable_error_text(md.open, nullptr, 0, ce))); } } } @@ -632,7 +632,7 @@ void DisplayServerMacOS::menu_close(NSMenu *p_menu) { md.close.callp(nullptr, 0, ret, ce); if (ce.error != Callable::CallError::CALL_OK) { - ERR_PRINT(vformat(RTR("Failed to execute menu close callback: %s."), Variant::get_callable_error_text(md.close, nullptr, 0, ce))); + ERR_PRINT(vformat("Failed to execute menu close callback: %s.", Variant::get_callable_error_text(md.close, nullptr, 0, ce))); } } } @@ -2009,7 +2009,7 @@ Error DisplayServerMacOS::dialog_show(String p_title, String p_description, Vect p_callback.callp(args, 1, ret, ce); if (ce.error != Callable::CallError::CALL_OK) { - ERR_PRINT(vformat(RTR("Failed to execute dialog callback: %s."), Variant::get_callable_error_text(p_callback, args, 1, ce))); + ERR_PRINT(vformat("Failed to execute dialog callback: %s.", Variant::get_callable_error_text(p_callback, args, 1, ce))); } } @@ -2194,7 +2194,7 @@ Error DisplayServerMacOS::file_dialog_show(const String &p_title, const String & callback.callp(args, 3, ret, ce); if (ce.error != Callable::CallError::CALL_OK) { - ERR_PRINT(vformat(RTR("Failed to execute file dialog callback: %s."), Variant::get_callable_error_text(callback, args, 3, ce))); + ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(callback, args, 3, ce))); } } } else { @@ -2208,7 +2208,7 @@ Error DisplayServerMacOS::file_dialog_show(const String &p_title, const String & callback.callp(args, 3, ret, ce); if (ce.error != Callable::CallError::CALL_OK) { - ERR_PRINT(vformat(RTR("Failed to execute file dialogs callback: %s."), Variant::get_callable_error_text(callback, args, 3, ce))); + ERR_PRINT(vformat("Failed to execute file dialogs callback: %s.", Variant::get_callable_error_text(callback, args, 3, ce))); } } } @@ -2279,7 +2279,7 @@ Error DisplayServerMacOS::file_dialog_show(const String &p_title, const String & callback.callp(args, 3, ret, ce); if (ce.error != Callable::CallError::CALL_OK) { - ERR_PRINT(vformat(RTR("Failed to execute file dialog callback: %s."), Variant::get_callable_error_text(callback, args, 3, ce))); + ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(callback, args, 3, ce))); } } } else { @@ -2293,7 +2293,7 @@ Error DisplayServerMacOS::file_dialog_show(const String &p_title, const String & callback.callp(args, 3, ret, ce); if (ce.error != Callable::CallError::CALL_OK) { - ERR_PRINT(vformat(RTR("Failed to execute file dialogs callback: %s."), Variant::get_callable_error_text(callback, args, 3, ce))); + ERR_PRINT(vformat("Failed to execute file dialogs callback: %s.", Variant::get_callable_error_text(callback, args, 3, ce))); } } } @@ -2335,7 +2335,7 @@ Error DisplayServerMacOS::dialog_input_text(String p_title, String p_description p_callback.callp(args, 1, ret, ce); if (ce.error != Callable::CallError::CALL_OK) { - ERR_PRINT(vformat(RTR("Failed to execute input dialog callback: %s."), Variant::get_callable_error_text(p_callback, args, 1, ce))); + ERR_PRINT(vformat("Failed to execute input dialog callback: %s.", Variant::get_callable_error_text(p_callback, args, 1, ce))); } } @@ -4107,7 +4107,7 @@ void DisplayServerMacOS::process_events() { call.callback.callp(args, 1, ret, ce); if (ce.error != Callable::CallError::CALL_OK) { - ERR_PRINT(vformat(RTR("Failed to execute menu callback: %s."), Variant::get_callable_error_text(call.callback, args, 1, ce))); + ERR_PRINT(vformat("Failed to execute menu callback: %s.", Variant::get_callable_error_text(call.callback, args, 1, ce))); } } diff --git a/platform/macos/godot_menu_delegate.mm b/platform/macos/godot_menu_delegate.mm index 844fd27f01..dd57d9f251 100644 --- a/platform/macos/godot_menu_delegate.mm +++ b/platform/macos/godot_menu_delegate.mm @@ -64,7 +64,7 @@ value->hover_callback.callp(args, 1, ret, ce); if (ce.error != Callable::CallError::CALL_OK) { - ERR_PRINT(vformat(RTR("Failed to execute menu hover callback: %s."), Variant::get_callable_error_text(value->hover_callback, args, 1, ce))); + ERR_PRINT(vformat("Failed to execute menu hover callback: %s.", Variant::get_callable_error_text(value->hover_callback, args, 1, ce))); } } } @@ -89,7 +89,7 @@ value->key_callback.callp(args, 1, ret, ce); if (ce.error != Callable::CallError::CALL_OK) { - ERR_PRINT(vformat(RTR("Failed to execute menu key callback: %s."), Variant::get_callable_error_text(value->key_callback, args, 1, ce))); + ERR_PRINT(vformat("Failed to execute menu key callback: %s.", Variant::get_callable_error_text(value->key_callback, args, 1, ce))); } } else { // Otherwise redirect event to the engine. diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index 55a6c290f1..e8d81405f0 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -355,7 +355,7 @@ Error DisplayServerWindows::file_dialog_show(const String &p_title, const String p_callback.callp(args, 3, ret, ce); if (ce.error != Callable::CallError::CALL_OK) { - ERR_PRINT(vformat(RTR("Failed to execute file dialogs callback: %s."), Variant::get_callable_error_text(p_callback, args, 3, ce))); + ERR_PRINT(vformat("Failed to execute file dialogs callback: %s.", Variant::get_callable_error_text(p_callback, args, 3, ce))); } } } else { @@ -369,7 +369,7 @@ Error DisplayServerWindows::file_dialog_show(const String &p_title, const String p_callback.callp(args, 3, ret, ce); if (ce.error != Callable::CallError::CALL_OK) { - ERR_PRINT(vformat(RTR("Failed to execute file dialogs callback: %s."), Variant::get_callable_error_text(p_callback, args, 3, ce))); + ERR_PRINT(vformat("Failed to execute file dialogs callback: %s.", Variant::get_callable_error_text(p_callback, args, 3, ce))); } } } |