From bda20442ffb6888123c91ebd5186b618d50a530d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Thu, 2 Jul 2020 12:36:43 +0200
Subject: [PATCH] Add missing language items for parallel workers

---
 wcfsetup/install/files/lib/system/CLIWCF.class.php     |  2 +-
 .../lib/system/cli/command/WorkerCLICommand.class.php  | 10 +++++-----
 wcfsetup/install/lang/de.xml                           |  5 +++++
 wcfsetup/install/lang/en.xml                           |  5 +++++
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/wcfsetup/install/files/lib/system/CLIWCF.class.php b/wcfsetup/install/files/lib/system/CLIWCF.class.php
index 6a22658fca..6178e57279 100644
--- a/wcfsetup/install/files/lib/system/CLIWCF.class.php
+++ b/wcfsetup/install/files/lib/system/CLIWCF.class.php
@@ -133,7 +133,7 @@ class CLIWCF extends WCF {
 			'disableUpdateCheck' => WCF::getLanguage()->get('wcf.cli.help.disableUpdateCheck'),
 			'exitOnFail' => WCF::getLanguage()->get('wcf.cli.help.exitOnFail'),
 			'packageID=i' => WCF::getLanguage()->get('wcf.cli.help.packageID'),
-			'sessionID=s' => 'sessionid',
+			'sessionID=s' => WCF::getLanguage()->get('wcf.cli.help.sessionID'),
 		]);
 		self::getArgvParser()->setOptions([
 			ArgvParser::CONFIG_CUMULATIVE_FLAGS => true,
diff --git a/wcfsetup/install/files/lib/system/cli/command/WorkerCLICommand.class.php b/wcfsetup/install/files/lib/system/cli/command/WorkerCLICommand.class.php
index b1bdab7657..8a2b18e5b3 100644
--- a/wcfsetup/install/files/lib/system/cli/command/WorkerCLICommand.class.php
+++ b/wcfsetup/install/files/lib/system/cli/command/WorkerCLICommand.class.php
@@ -35,8 +35,8 @@ class WorkerCLICommand implements IArgumentedCLICommand {
 		$this->argv = new ArgvParser([
 			'l|list' => CLIWCF::getLanguage()->get('wcf.cli.worker.list'),
 			'setParameter=s' => CLIWCF::getLanguage()->get('wcf.cli.worker.setParameter'),
-			'threads=i' => 'threads',
-			'threadId=i' => 'threadId',
+			'threads=i' => CLIWCF::getLanguage()->get('wcf.cli.worker.threads'),
+			'threadId=i' => CLIWCF::getLanguage()->get('wcf.cli.worker.threadId'),
 		]);
 		$this->argv->setOptions([
 			ArgvParser::CONFIG_FREEFORM_FLAGS => true,
@@ -64,7 +64,7 @@ class WorkerCLICommand implements IArgumentedCLICommand {
 			if ($this->argv->threadId !== null) {
 				$threadId = $this->argv->threadId;
 				if ($this->argv->threadId >= $this->argv->threads) {
-					CLIWCF::getReader()->println("Invalid threadId");
+					CLIWCF::getReader()->println(CLIWCF::getLanguage()->get('wcf.cli.worker.threadId.invalid'));
 					return;
 				}
 			}
@@ -129,7 +129,7 @@ class WorkerCLICommand implements IArgumentedCLICommand {
 		// is the controller process invoked by the Administrator.
 		if ($threads > 1 && $threadId === null) {
 			if (PHP_EOL === "\r\n") {
-				CLIWCF::getReader()->println('The --threads option is not available on Windows.');
+				CLIWCF::getReader()->println(CLIWCF::getLanguage()->get('wcf.cli.worker.threads.windows'));
 				return;
 			}
 			$this->spawnController($worker, $threads);
@@ -198,7 +198,7 @@ class WorkerCLICommand implements IArgumentedCLICommand {
 		$arguments[] = '--sessionID='.CLIWCF::getSession()->sessionID;
 		$commandLine = PHP_BINARY.' '.implode(' ', array_map('escapeshellarg', $arguments));
 		
-		CLIWCF::getReader()->println('Using "'.$commandLine.'" as the worker command line.');
+		Log::debug('Using "'.$commandLine.'" as the worker command line.');
 		
 		// Reuse the environment.
 		// - Specify TERM=dumb to prevent the worker from messing around with our terminal.
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index dec2ee8189..ac46d052ee 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3365,8 +3365,13 @@ Fehler sind beispielsweise:
 - Befehle, welche ihre Aktion nicht erfolgreich ausführen konnten
 - Systemfehler]]></item>
 		<item name="wcf.cli.help.packageID"><![CDATA[Die App mit der angegebenen Paket-ID wird als Standard für diese Sitzung verwendet.]]></item>
+		<item name="wcf.cli.help.sessionID"><![CDATA[Verwendet die Sitzung mit der angegebenen Session-ID, anstatt einen separaten Login durchzuführen. Dieser Parameter wird intern zur Parallelisierung von Aufgaben genutzt.]]></item>
 		<item name="wcf.cli.worker.setParameter"><![CDATA[Übergibt einen Parameter an den Worker. Bsp.: --setParameter param=wert]]></item>
 		<item name="wcf.cli.worker.list"><![CDATA[Listet alle Worker auf.]]></item>
+		<item name="wcf.cli.worker.threads"><![CDATA[Gewünschte Anzahl von parallelen Prozessen.]]></item>
+		<item name="wcf.cli.worker.threads.windows"><![CDATA[Die parallele Verarbeitung mittels --threads steht unter Windows nicht zur Verfügung.]]></item>
+		<item name="wcf.cli.worker.threadId"><![CDATA[Gibt die Thread-ID während einer parallelen Verarbeitung an. Wird intern genutzt, wenn --threads gesetzt ist.]]></item>
+		<item name="wcf.cli.worker.threadId.invalid"><![CDATA[Die angegebene Thread-ID ist nicht gültig.]]></item>
 		<item name="wcf.cli.error.help.noArguments"><![CDATA[Der Befehl "{$command}" unterstützt keine Parameter.]]></item>
 		<item name="wcf.cli.error.language.notFound"><![CDATA[Die Sprache mit dem Sprachcode "{$languageCode}" konnte nicht gefunden werden.]]></item>
 		<item name="wcf.cli.error.command.notFound"><![CDATA[Der Befehl "{$command}" konnte nicht gefunden werden. Benutze "commands", um verfügbare Befehle aufzulisten.]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index fcf6a70e28..e4c785415a 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3288,8 +3288,13 @@ Errors are:
 - Failing commands
 - Core errors]]></item>
 		<item name="wcf.cli.help.packageID"><![CDATA[The given package id will be used as a default for this session.]]></item>
+		<item name="wcf.cli.help.sessionID"><![CDATA[Uses the session with the given session id instead of performing a login. This parameter is used internally for parallel processing of jobs.]]></item>
 		<item name="wcf.cli.worker.setParameter"><![CDATA[Sets a worker parameter e.g.: --setParameter param=value]]></item>
 		<item name="wcf.cli.worker.list"><![CDATA[Lists all workers.]]></item>
+		<item name="wcf.cli.worker.threads"><![CDATA[Requested number of parallel processes.]]></item>
+		<item name="wcf.cli.worker.threads.windows"><![CDATA[Parallel processing using --threads is not available on Windows.]]></item>
+		<item name="wcf.cli.worker.threadId"><![CDATA[Specifies the thread id when processing in parallel. Used internally when --threads is given.]]></item>
+		<item name="wcf.cli.worker.threadId.invalid"><![CDATA[The given thread id is not valid.]]></item>
 		<item name="wcf.cli.error.help.noArguments"><![CDATA[The command "{$command}" does not support any parameters.]]></item>
 		<item name="wcf.cli.error.language.notFound"><![CDATA[The language with the language code "{$languageCode}" could not be found.]]></item>
 		<item name="wcf.cli.error.command.notFound"><![CDATA[The command "{$command}" could not be found. Type in "commands" to list available commands.]]></item>
-- 
2.20.1