Translate the errors

apps/workflowengine/lib/Check/AbstractStringCheck.php

@@ -23,13 +23,24 @@
 
 
 use OCP\Files\Storage\IStorage;
+use OCP\IL10N;
 use OCP\WorkflowEngine\ICheck;
 
 abstract class AbstractStringCheck implements ICheck {
 
 	/** @var array[] Nested array: [Pattern => [ActualValue => Regex Result]] */
 	protected $matches;
 
+	/** @var IL10N */
+	protected $l;
+
+	/**
+	 * @param IL10N $l
+	 */
+	public function __construct(IL10N $l) {
+		$this->l = $l;
+	}
+
 	/**
 	 * @param IStorage $storage
 	 * @param string $path
@@ -81,12 +92,12 @@ protected function executeStringCheck($operator, $checkValue, $actualValue) {
 	 */
 	public function validateCheck($operator, $value) {
 		if (!in_array($operator, ['is', '!is', 'matches', '!matches'])) {
-			throw new \UnexpectedValueException('Invalid operator', 1);
+			throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
 		}
 
 		if (in_array($operator, ['matches', '!matches']) &&
 			  @preg_match($value, null) === false) {
-			throw new \UnexpectedValueException('Invalid regex', 2);
+			throw new \UnexpectedValueException($this->l->t('The given regular expression is invalid'), 2);
 		}
 	}
 

apps/workflowengine/lib/Check/FileMimeType.php

@@ -23,6 +23,7 @@
 
 
 use OCP\Files\IMimeTypeDetector;
+use OCP\IL10N;
 use OCP\IRequest;
 
 class FileMimeType extends AbstractStringCheck {
@@ -37,10 +38,12 @@ class FileMimeType extends AbstractStringCheck {
 	protected $mimeTypeDetector;
 
 	/**
+	 * @param IL10N $l
 	 * @param IRequest $request
 	 * @param IMimeTypeDetector $mimeTypeDetector
 	 */
-	public function __construct(IRequest $request, IMimeTypeDetector $mimeTypeDetector) {
+	public function __construct(IL10N $l, IRequest $request, IMimeTypeDetector $mimeTypeDetector) {
+		parent::__construct($l);
 		$this->request = $request;
 		$this->mimeTypeDetector = $mimeTypeDetector;
 	}

apps/workflowengine/lib/Check/FileSize.php

@@ -23,6 +23,7 @@
 
 
 use OCP\Files\Storage\IStorage;
+use OCP\IL10N;
 use OCP\IRequest;
 use OCP\Util;
 use OCP\WorkflowEngine\ICheck;
@@ -32,13 +33,18 @@ class FileSize implements ICheck {
 	/** @var int */
 	protected $size;
 
+	/** @var IL10N */
+	protected $l;
+
 	/** @var IRequest */
 	protected $request;
 
 	/**
+	 * @param IL10N $l
 	 * @param IRequest $request
 	 */
-	public function __construct(IRequest $request) {
+	public function __construct(IL10N $l, IRequest $request) {
+		$this->l = $l;
 		$this->request = $request;
 	}
 
@@ -80,11 +86,11 @@ public function executeCheck($operator, $value) {
 	 */
 	public function validateCheck($operator, $value) {
 		if (!in_array($operator, ['less', '!less', 'greater', '!greater'])) {
-			throw new \UnexpectedValueException('Invalid operator', 1);
+			throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
 		}
 
 		if (!preg_match('/^[0-9]+[ ]?[kmgt]?b$/i', $value)) {
-			throw new \UnexpectedValueException('Invalid file size', 2);
+			throw new \UnexpectedValueException($this->l->t('The given file size is invalid'), 2);
 		}
 	}
 

apps/workflowengine/lib/Check/FileSystemTags.php

@@ -24,6 +24,7 @@
 
 use OCP\Files\Cache\ICache;
 use OCP\Files\Storage\IStorage;
+use OCP\IL10N;
 use OCP\SystemTag\ISystemTagManager;
 use OCP\SystemTag\ISystemTagObjectMapper;
 use OCP\SystemTag\TagNotFoundException;
@@ -37,6 +38,9 @@ class FileSystemTags implements ICheck {
 	/** @var array */
 	protected $fileSystemTags;
 
+	/** @var IL10N */
+	protected $l;
+
 	/** @var ISystemTagManager */
 	protected $systemTagManager;
 
@@ -50,10 +54,12 @@ class FileSystemTags implements ICheck {
 	protected $path;
 
 	/**
+	 * @param IL10N $l
 	 * @param ISystemTagManager $systemTagManager
 	 * @param ISystemTagObjectMapper $systemTagObjectMapper
 	 */
-	public function __construct(ISystemTagManager $systemTagManager, ISystemTagObjectMapper $systemTagObjectMapper) {
+	public function __construct(IL10N $l, ISystemTagManager $systemTagManager, ISystemTagObjectMapper $systemTagObjectMapper) {
+		$this->l = $l;
 		$this->systemTagManager = $systemTagManager;
 		$this->systemTagObjectMapper = $systemTagObjectMapper;
 	}
@@ -84,15 +90,15 @@ public function executeCheck($operator, $value) {
 	 */
 	public function validateCheck($operator, $value) {
 		if (!in_array($operator, ['is', '!is'])) {
-			throw new \UnexpectedValueException('Invalid operator', 1);
+			throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
 		}
 
 		try {
 			$this->systemTagManager->getTagsByIds($value);
 		} catch (TagNotFoundException $e) {
-			throw new \UnexpectedValueException('Tag does not exist', 2);
+			throw new \UnexpectedValueException($this->l->t('The given tag id is invalid'), 2);
 		} catch (\InvalidArgumentException $e) {
-			throw new \UnexpectedValueException('Tag does not exist', 3);
+			throw new \UnexpectedValueException($this->l->t('The given tag id is invalid'), 3);
 		}
 	}
 

apps/workflowengine/lib/Check/RequestRemoteAddress.php

@@ -23,18 +23,24 @@
 
 
 use OCP\Files\Storage\IStorage;
+use OCP\IL10N;
 use OCP\IRequest;
 use OCP\WorkflowEngine\ICheck;
 
 class RequestRemoteAddress implements ICheck {
 
+	/** @var IL10N */
+	protected $l;
+
 	/** @var IRequest */
 	protected $request;
 
 	/**
+	 * @param IL10N $l
 	 * @param IRequest $request
 	 */
-	public function __construct(IRequest $request) {
+	public function __construct(IL10N $l, IRequest $request) {
+		$this->l = $l;
 		$this->request = $request;
 	}
 
@@ -73,27 +79,27 @@ public function executeCheck($operator, $value) {
 	 */
 	public function validateCheck($operator, $value) {
 		if (!in_array($operator, ['matchesIPv4', '!matchesIPv4', 'matchesIPv6', '!matchesIPv6'])) {
-			throw new \UnexpectedValueException('Invalid operator', 1);
+			throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
 		}
 
 		$decodedValue = explode('/', $value);
 		if (sizeof($decodedValue) !== 2) {
-			throw new \UnexpectedValueException('Invalid IP range', 2);
+			throw new \UnexpectedValueException($this->l->t('The given IP range is invalid'), 2);
 		}
 
 		if (in_array($operator, ['matchesIPv4', '!matchesIPv4'])) {
 			if (!filter_var($decodedValue[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-				throw new \UnexpectedValueException('Invalid IPv4 range', 3);
+				throw new \UnexpectedValueException($this->l->t('The given IP range is not valid for IPv4'), 3);
 			}
 			if ($decodedValue[1] > 32 || $decodedValue[1] <= 0) {
-				throw new \UnexpectedValueException('Invalid IPv4 range', 4);
+				throw new \UnexpectedValueException($this->l->t('The given IP range is not valid for IPv4'), 4);
 			}
 		} else {
 			if (!filter_var($decodedValue[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-				throw new \UnexpectedValueException('Invalid IPv6 range', 3);
+				throw new \UnexpectedValueException($this->l->t('The given IP range is not valid for IPv6'), 3);
 			}
 			if ($decodedValue[1] > 128 || $decodedValue[1] <= 0) {
-				throw new \UnexpectedValueException('Invalid IPv6 range', 4);
+				throw new \UnexpectedValueException($this->l->t('The given IP range is not valid for IPv6'), 4);
 			}
 		}
 	}

apps/workflowengine/lib/Check/RequestTime.php

@@ -24,6 +24,7 @@
 
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Files\Storage\IStorage;
+use OCP\IL10N;
 use OCP\WorkflowEngine\ICheck;
 
 class RequestTime implements ICheck {
@@ -34,13 +35,17 @@ class RequestTime implements ICheck {
 	/** @var bool[] */
 	protected $cachedResults;
 
+	/** @var IL10N */
+	protected $l;
+
 	/** @var ITimeFactory */
 	protected $timeFactory;
 
 	/**
 	 * @param ITimeFactory $timeFactory
 	 */
-	public function __construct(ITimeFactory $timeFactory) {
+	public function __construct(IL10N $l, ITimeFactory $timeFactory) {
+		$this->l = $l;
 		$this->timeFactory = $timeFactory;
 	}
 
@@ -101,24 +106,24 @@ protected function getTimestamp($currentTimestamp, $value) {
 	 */
 	public function validateCheck($operator, $value) {
 		if (!in_array($operator, ['in', '!in'])) {
-			throw new \UnexpectedValueException('Invalid operator', 1);
+			throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
 		}
 
 		$regexValue = '\"' . self::REGEX_TIME . ' ' . self::REGEX_TIMEZONE . '\"';
 		$result = preg_match('/^\[' . $regexValue . ',' . $regexValue . '\]$/', $value, $matches);
 		if (!$result) {
-			throw new \UnexpectedValueException('Invalid time limits', 2);
+			throw new \UnexpectedValueException($this->l->t('The given time span is invalid'), 2);
 		}
 
 		$values = json_decode($value, true);
 		$time1 = \DateTime::createFromFormat('H:i e', $values[0]);
 		if ($time1 === false) {
-			throw new \UnexpectedValueException('Invalid start time given', 3);
+			throw new \UnexpectedValueException($this->l->t('The given start time is invalid'), 3);
 		}
 
 		$time2 = \DateTime::createFromFormat('H:i e', $values[1]);
 		if ($time2 === false) {
-			throw new \UnexpectedValueException('Invalid end time given', 3);
+			throw new \UnexpectedValueException($this->l->t('The given end time is invalid'), 4);
 		}
 	}
 }

apps/workflowengine/lib/Check/RequestURL.php

@@ -22,6 +22,7 @@
 namespace OCA\WorkflowEngine\Check;
 
 
+use OCP\IL10N;
 use OCP\IRequest;
 
 class RequestURL extends AbstractStringCheck {
@@ -33,9 +34,11 @@ class RequestURL extends AbstractStringCheck {
 	protected $request;
 
 	/**
+	 * @param IL10N $l
 	 * @param IRequest $request
 	 */
-	public function __construct(IRequest $request) {
+	public function __construct(IL10N $l, IRequest $request) {
+		parent::__construct($l);
 		$this->request = $request;
 	}
 

apps/workflowengine/lib/Check/RequestUserAgent.php

@@ -22,6 +22,7 @@
 namespace OCA\WorkflowEngine\Check;
 
 
+use OCP\IL10N;
 use OCP\IRequest;
 
 class RequestUserAgent extends AbstractStringCheck {
@@ -30,9 +31,11 @@ class RequestUserAgent extends AbstractStringCheck {
 	protected $request;
 
 	/**
+	 * @param IL10N $l
 	 * @param IRequest $request
 	 */
-	public function __construct(IRequest $request) {
+	public function __construct(IL10N $l, IRequest $request) {
+		parent::__construct($l);
 		$this->request = $request;
 	}
 

apps/workflowengine/lib/Check/UserGroupMembership.php

@@ -89,11 +89,11 @@ public function executeCheck($operator, $value) {
 	 */
 	public function validateCheck($operator, $value) {
 		if (!in_array($operator, ['is', '!is'])) {
-			throw new \UnexpectedValueException($this->l->t('Operator %s is invalid', $operator), 1);
+			throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
 		}
 
 		if (!$this->groupManager->groupExists($value)) {
-			throw new \UnexpectedValueException($this->l->t('Group %s does not exist', $value), 2);
+			throw new \UnexpectedValueException($this->l->t('The given group does not exist'), 2);
 		}
 	}