summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-03-24 01:23:47 +0100
committerRémi Verschelde <rverschelde@gmail.com>2024-03-24 01:23:47 +0100
commit1999b661d0e174996fa087e8dcc32a2f8f2001ee (patch)
treeeed6d9761ec753fe9bafc860d43a3236f8dc75ac
parentf79896fd069f444e31be25680c8e80f11cb2a602 (diff)
parent9dadeac658667e82bf38d1f2e5c2beb98076aa31 (diff)
downloadredot-engine-1999b661d0e174996fa087e8dcc32a2f8f2001ee.tar.gz
Merge pull request #89799 from timothyqiu/line-numbers
Translate "Line N" as a whole
-rw-r--r--editor/plugins/script_text_editor.cpp7
-rw-r--r--editor/plugins/text_shader_editor.cpp3
2 files changed, 4 insertions, 6 deletions
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index 750e4d263f..882ccce501 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -598,8 +598,7 @@ void ScriptTextEditor::_update_warnings() {
warnings_panel->push_cell();
warnings_panel->push_meta(w.start_line - 1);
warnings_panel->push_color(warnings_panel->get_theme_color(SNAME("warning_color"), EditorStringName(Editor)));
- warnings_panel->add_text(TTR("Line") + " " + itos(w.start_line));
- warnings_panel->add_text(" (" + w.string_code + "):");
+ warnings_panel->add_text(vformat(TTR("Line %d (%s):"), w.start_line, w.string_code));
warnings_panel->pop(); // Color.
warnings_panel->pop(); // Meta goto.
warnings_panel->pop(); // Cell.
@@ -625,7 +624,7 @@ void ScriptTextEditor::_update_errors() {
errors_panel->push_cell();
errors_panel->push_meta(err.line - 1);
errors_panel->push_color(warnings_panel->get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
- errors_panel->add_text(TTR("Line") + " " + itos(err.line) + ":");
+ errors_panel->add_text(vformat(TTR("Line %d:"), err.line));
errors_panel->pop(); // Color.
errors_panel->pop(); // Meta goto.
errors_panel->pop(); // Cell.
@@ -659,7 +658,7 @@ void ScriptTextEditor::_update_errors() {
errors_panel->push_cell();
errors_panel->push_meta(click_meta);
errors_panel->push_color(errors_panel->get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
- errors_panel->add_text(TTR("Line") + " " + itos(err.line) + ":");
+ errors_panel->add_text(vformat(TTR("Line %d:"), err.line));
errors_panel->pop(); // Color.
errors_panel->pop(); // Meta goto.
errors_panel->pop(); // Cell.
diff --git a/editor/plugins/text_shader_editor.cpp b/editor/plugins/text_shader_editor.cpp
index 5a1fe833d6..6e786c1d94 100644
--- a/editor/plugins/text_shader_editor.cpp
+++ b/editor/plugins/text_shader_editor.cpp
@@ -598,8 +598,7 @@ void ShaderTextEditor::_update_warning_panel() {
warnings_panel->push_color(warnings_panel->get_theme_color(SNAME("warning_color"), EditorStringName(Editor)));
if (line != -1) {
warnings_panel->push_meta(line - 1);
- warnings_panel->add_text(TTR("Line") + " " + itos(line));
- warnings_panel->add_text(" (" + w.get_name() + "):");
+ warnings_panel->add_text(vformat(TTR("Line %d (%s):"), line, w.get_name()));
warnings_panel->pop(); // Meta goto.
} else {
warnings_panel->add_text(w.get_name() + ":");