[education/rkward] /: Fixups

[Thomas Friedrichsmeier]

Git commit ac982e794c092eb842dfc9078d2b0d23ddef50b9 by Thomas Friedrichsmeier.
Committed on 15/10/2025 at 16:02.
Pushed by tfry into branch 'master'.

Fixups

M  +1    -1    Messages.sh
M  +1    -1    rkward/windows/rkcommandeditorwindow.cpp
R  +1    -1    scripts/extract_r_messages.py [from: scripts/extract_r_message.py - 098% similarity]

https://invent.kde.org/education/rkward/-/commit/ac982e794c092eb842dfc9078d2b0d23ddef50b9

diff --git a/Messages.sh b/Messages.sh
index 84aa07b47..91003788d 100755
--- a/Messages.sh
+++ b/Messages.sh
@@ -9,7 +9,7 @@
 # the results are stored in a pseudo .cpp file to be picked up by xgettext.
 $EXTRACTRC `find rkward -name \*.rc -a \! -name rkward_windows_icon.rc -o -name \*.ui -o -name \*.kcfg`  >> rc.cpp
 # merge messages from .R files into rc.cpp
-python3 scripts/update_plugin_messages.py rkward/rbackend/rpackages/rkward/R/*.R >> rc.cpp
+python3 scripts/extract_r_messages.py rkward/rbackend/rpackages/rkward/R/*.R >> rc.cpp
 # call xgettext on all source files in the main app.
 $XGETTEXT `find rkward -name \*.cpp -o -name \*.h -name \*.c` rc.cpp -o $podir/rkward.pot
 
diff --git a/rkward/windows/rkcommandeditorwindow.cpp b/rkward/windows/rkcommandeditorwindow.cpp
index 10f14f213..5bdcbcc02 100644
--- a/rkward/windows/rkcommandeditorwindow.cpp
+++ b/rkward/windows/rkcommandeditorwindow.cpp
@@ -692,7 +692,7 @@ void RKCommandEditorWindow::initPreviewModes(KActionMenu *menu) {
 		QString arg;
 		if (group->group()->checkedId() == HTML) arg = u"output_format=\"html_document\", "_s;
 		else if (group->group()->checkedId() == PDF) arg = u"output_format=\"pdf_document\", "_s;
-		return return QStringLiteral("rk.render.markdown.preview(%1, %2, %3)").args(RObject::rQuote(infile), RObject::rQuote(outdir), mode_arg);
+		return QStringLiteral("rk.render.markdown.preview(%1, %2, %3)").arg(RObject::rQuote(infile), RObject::rQuote(outdir), arg);
 	};
 	preview_modes->addButton(markdown);
 
diff --git a/scripts/extract_r_message.py b/scripts/extract_r_messages.py
similarity index 98%
rename from scripts/extract_r_message.py
rename to scripts/extract_r_messages.py
index 3bc399b28..1f721e211 100755
--- a/scripts/extract_r_message.py
+++ b/scripts/extract_r_messages.py
@@ -131,7 +131,7 @@ class RParseBuffer:
 
 def handleRChunk (filename):
   global outfile
-  keywords = ("gettext", "ngettext", "stop", "warning", "message", ".rk.i18n") # TODO change me!
+  keywords = (".rk.i18n")
 
   # Convert single quoted and backtick quoted strings in the input chunk to double quotes (so xgettext can work in C-style).
   def normalizeQuotes (chunk):