From 0411c967949be475dc9ab42dc58bb5ca79b13268 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 16 Jun 2013 17:59:35 +0200
Subject: [PATCH] Replaces 'invalid' with 'notValid'

---
 com.woltlab.wcf/templates/mail.tpl                       | 2 +-
 com.woltlab.wcf/templates/newPassword.tpl                | 9 ++++++---
 .../files/acp/templates/userActivityPointOption.tpl      | 2 +-
 .../lib/acp/form/AbstractCategoryEditForm.class.php      | 2 +-
 .../install/files/lib/acp/form/LabelAddForm.class.php    | 2 +-
 .../files/lib/acp/form/MasterPasswordForm.class.php      | 2 +-
 .../lib/acp/form/UserActivityPointOptionForm.class.php   | 2 +-
 .../install/files/lib/acp/form/UserRankAddForm.class.php | 2 +-
 wcfsetup/install/files/lib/form/MailForm.class.php       | 2 +-
 .../install/files/lib/form/NewPasswordForm.class.php     | 4 ++--
 wcfsetup/install/lang/de.xml                             | 8 ++++----
 wcfsetup/install/lang/en.xml                             | 8 ++++----
 12 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/com.woltlab.wcf/templates/mail.tpl b/com.woltlab.wcf/templates/mail.tpl
index fce68ee0c2..ed8d9aeb6c 100644
--- a/com.woltlab.wcf/templates/mail.tpl
+++ b/com.woltlab.wcf/templates/mail.tpl
@@ -65,7 +65,7 @@
 							<small class="innerError">
 								{if $errorType == 'empty'}
 									{lang}wcf.global.form.error.empty{/lang}
-								{elseif $errorType == 'invalid'}
+								{elseif $errorType == 'notValid'}
 									{lang}wcf.user.email.error.notValid{/lang}
 								{else}
 									{lang}wcf.user.mail.senderEmail.error.{@$errorType}{/lang}
diff --git a/com.woltlab.wcf/templates/newPassword.tpl b/com.woltlab.wcf/templates/newPassword.tpl
index feaefd5fed..23ffb50305 100644
--- a/com.woltlab.wcf/templates/newPassword.tpl
+++ b/com.woltlab.wcf/templates/newPassword.tpl
@@ -44,7 +44,7 @@
 					<input type="text" id="userID" name="u" value="{@$userID}" required="required" class="medium" />
 					{if $errorField == 'userID'}
 						<small class="innerError">
-							{if $errorType == 'invalid'}{lang}wcf.user.userID.error.invalid{/lang}{/if}
+							{lang}wcf.user.userID.error.{$errorType}{/lang}
 						</small>
 					{/if}
 				</dd>
@@ -58,8 +58,11 @@
 					<input type="text" id="lostPasswordKey" name="k" value="{$lostPasswordKey}" required="required" class="medium" />
 					{if $errorField == 'lostPasswordKey'}
 						<small class="innerError">
-							{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
-							{if $errorType == 'invalid'}{lang}wcf.user.lostPasswordKey.error.invalid{/lang}{/if}
+							{if $errorType == 'empty'}
+								{lang}wcf.global.form.error.empty{/lang}
+							{else}
+								{lang}wcf.user.lostPasswordKey.error.{$errorType}{/lang}
+							{/if}
 						</small>
 					{/if}
 				</dd>
diff --git a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
index 9a78db9c0a..d6eeed8317 100644
--- a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
+++ b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
@@ -47,7 +47,7 @@
 						<input type="number" id="{$objectType->objectType}" name="points[{$objectType->objectTypeID}]" value="{$points[$objectType->objectTypeID]}" required="required" min="0" class="tiny" />
 						{if $errorField == $objectType->objectTypeID}
 							<small class="innerError">
-								{lang}wcf.acp.user.activityPoint.option.invalid{/lang}
+								{lang}wcf.acp.user.activityPoint.option.notValid{/lang}
 							</small>
 						{/if}
 					</dd>
diff --git a/wcfsetup/install/files/lib/acp/form/AbstractCategoryEditForm.class.php b/wcfsetup/install/files/lib/acp/form/AbstractCategoryEditForm.class.php
index 6301a65375..541e96c01f 100644
--- a/wcfsetup/install/files/lib/acp/form/AbstractCategoryEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/AbstractCategoryEditForm.class.php
@@ -166,7 +166,7 @@ class AbstractCategoryEditForm extends AbstractCategoryAddForm {
 		// check if new parent category is no child category of the category
 		$childCategories = CategoryHandler::getInstance()->getChildCategories($this->categoryID, $this->objectType->objectTypeID);
 		if (isset($childCategories[$this->parentCategoryID])) {
-			throw new UserInputException('parentCategoryID', 'invalid');
+			throw new UserInputException('parentCategoryID', 'notValid');
 		}
 	}
 }
diff --git a/wcfsetup/install/files/lib/acp/form/LabelAddForm.class.php b/wcfsetup/install/files/lib/acp/form/LabelAddForm.class.php
index 5023e7bda7..01d173e379 100644
--- a/wcfsetup/install/files/lib/acp/form/LabelAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LabelAddForm.class.php
@@ -127,7 +127,7 @@ class LabelAddForm extends AbstractForm {
 		}
 		$groups = $this->labelGroupList->getObjects();
 		if (!isset($groups[$this->groupID])) {
-			throw new UserInputException('groupID', 'invalid');
+			throw new UserInputException('groupID', 'notValid');
 		}
 		
 		if (empty($this->cssClassName)) {
diff --git a/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php b/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php
index 8da439081b..06b7a864ce 100755
--- a/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php
@@ -68,7 +68,7 @@ class MasterPasswordForm extends AbstractForm {
 		
 		// check password
 		if (!PasswordUtil::secureCompare(MASTER_PASSWORD, PasswordUtil::getDoubleSaltedHash($this->masterPassword, MASTER_PASSWORD))) {
-			throw new UserInputException('masterPassword', 'invalid');
+			throw new UserInputException('masterPassword', 'notValid');
 		}
 	}
 	
diff --git a/wcfsetup/install/files/lib/acp/form/UserActivityPointOptionForm.class.php b/wcfsetup/install/files/lib/acp/form/UserActivityPointOptionForm.class.php
index 882d0bcb9e..45ce44bca4 100644
--- a/wcfsetup/install/files/lib/acp/form/UserActivityPointOptionForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserActivityPointOptionForm.class.php
@@ -56,7 +56,7 @@ class UserActivityPointOptionForm extends AbstractForm {
 		parent::validate();
 		
 		foreach ($this->points as $objectTypeID => $points) {
-			if ($points < 0) throw new UserInputException($objectTypeID, 'invalid');
+			if ($points < 0) throw new UserInputException($objectTypeID, 'notValid');
 		}
 	}
 	
diff --git a/wcfsetup/install/files/lib/acp/form/UserRankAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserRankAddForm.class.php
index b9ea461267..8944bbff44 100644
--- a/wcfsetup/install/files/lib/acp/form/UserRankAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserRankAddForm.class.php
@@ -148,7 +148,7 @@ class UserRankAddForm extends AbstractForm {
 		}
 		$userGroup = UserGroup::getGroupByID($this->groupID);
 		if ($userGroup === null || $userGroup->groupType == UserGroup::GUESTS || $userGroup->groupType == UserGroup::EVERYONE) {
-			throw new UserInputException('groupID', 'invalid');
+			throw new UserInputException('groupID', 'notValid');
 		}
 		
 		// css class name
diff --git a/wcfsetup/install/files/lib/form/MailForm.class.php b/wcfsetup/install/files/lib/form/MailForm.class.php
index 34e9ecc347..63712fb795 100644
--- a/wcfsetup/install/files/lib/form/MailForm.class.php
+++ b/wcfsetup/install/files/lib/form/MailForm.class.php
@@ -103,7 +103,7 @@ class MailForm extends RecaptchaForm {
 			}
 			
 			if (!UserUtil::isValidEmail($this->email)) {
-				throw new UserInputException('email', 'invalid');
+				throw new UserInputException('email', 'notValid');
 			}
 		}
 		
diff --git a/wcfsetup/install/files/lib/form/NewPasswordForm.class.php b/wcfsetup/install/files/lib/form/NewPasswordForm.class.php
index 3239191ca5..b80370221c 100644
--- a/wcfsetup/install/files/lib/form/NewPasswordForm.class.php
+++ b/wcfsetup/install/files/lib/form/NewPasswordForm.class.php
@@ -73,14 +73,14 @@ class NewPasswordForm extends AbstractForm {
 		$this->user = new User($this->userID);
 		
 		if (!$this->user->userID) {
-			throw new UserInputException('userID', 'invalid');
+			throw new UserInputException('userID', 'notValid');
 		}
 		if (!$this->user->lostPasswordKey) {
 			throw new UserInputException('lostPasswordKey');
 		}
 		
 		if ($this->user->lostPasswordKey != $this->lostPasswordKey) {
-			throw new UserInputException('lostPasswordKey', 'invalid');
+			throw new UserInputException('lostPasswordKey', 'notValid');
 		}
 	}
 	
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 1f31c3d796..4fd7bace3d 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -400,9 +400,9 @@
 		<item name="wcf.acp.masterPassword.confirm"><![CDATA[Hauptkennwort wiederholen]]></item>
 		<item name="wcf.acp.masterPassword.enter"><![CDATA[Hauptkennwort erforderlich]]></item>
 		<item name="wcf.acp.masterPassword.enter.description"><![CDATA[Die aufgerufene Seite oder Aktion erfordert aus Sicherheitsgründen die Eingabe des Hauptkennwortes. Pro Sitzung ist die Eingabe des Hauptkennwortes nur einmal erforderlich. Falls Sie das Hauptkennwort vergessen haben sollten, können Sie es zurücksetzen, indem Sie die Datei <em>{@RELATIVE_WCF_DIR}acp/masterPassword.inc.php</em> löschen.]]></item>
-		<item name="wcf.acp.masterPassword.error.invalid"><![CDATA[Das Hauptkennwort ist nicht korrekt. Falls Sie das Hauptkennwort vergessen haben sollten, können Sie es zurücksetzen, indem Sie die Datei <em>{@RELATIVE_WCF_DIR}acp/masterPassword.inc.php</em> löschen.]]></item>
 		<item name="wcf.acp.masterPassword.error.notEqual"><![CDATA[Die eingegebenen Kennwörter sind nicht identisch.]]></item>
 		<item name="wcf.acp.masterPassword.error.notSecure"><![CDATA[Das Kennwort wurde als unsicher eingestuft. Das Kennwort sollte mindestens acht Zeichen lang sein, große und kleine lateinische Buchstaben, Zahlen und Sonderzeichen enthalten. Es darf nicht mit den Kennwörtern von anderen Administratoren übereinstimmen.]]></item>
+		<item name="wcf.acp.masterPassword.error.notValid"><![CDATA[Das Hauptkennwort ist nicht korrekt. Falls Sie das Hauptkennwort vergessen haben sollten, können Sie es zurücksetzen, indem Sie die Datei <em>{@RELATIVE_WCF_DIR}acp/masterPassword.inc.php</em> löschen.]]></item>
 		<item name="wcf.acp.masterPassword.example"><![CDATA[Vorschlag]]></item>
 		<item name="wcf.acp.masterPassword.example.set"><![CDATA[Vorschlag übernehmen]]></item>
 		<item name="wcf.acp.masterPassword.init"><![CDATA[Hauptkennwort festlegen]]></item>
@@ -1311,7 +1311,7 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getAllowedExtensions()
 		<item name="wcf.category.list"><![CDATA[Kategorien]]></item>
 		<item name="wcf.category.noneAvailable"><![CDATA[Es wurde noch keine Kategorie hinzugefügt.]]></item>
 		<item name="wcf.category.parentCategoryID"><![CDATA[Übergeordnete Kategorie]]></item>
-		<item name="wcf.category.parentCategoryID.error.invalid"><![CDATA[Die ausgewählte Kategorie existiert nicht.]]></item>
+		<item name="wcf.category.parentCategoryID.error.notValid"><![CDATA[Die ausgewählte Kategorie existiert nicht.]]></item>
 		<item name="wcf.category.showOrder"><![CDATA[Position]]></item>
 		<item name="wcf.category.description"><![CDATA[Beschreibung]]></item>
 		<item name="wcf.category.title"><![CDATA[Titel]]></item>
@@ -1905,8 +1905,8 @@ Falls Sie Ihr Kennwort nicht vergessen haben, können Sie diese E-Mail ignoriere
 		<item name="wcf.user.lostPassword.mail.sent"><![CDATA[Sie erhalten in Kürze eine E-Mail mit weiteren Informationen.]]></item>
 		<item name="wcf.user.newPassword"><![CDATA[Neues Kennwort anfordern]]></item>
 		<item name="wcf.user.lostPasswordKey"><![CDATA[Sicherheitsschlüssel]]></item>
-		<item name="wcf.user.lostPasswordKey.error.invalid"><![CDATA[Sie haben einen ungültigen Sicherheitsschlüssel angegeben.]]></item>
-		<item name="wcf.user.userID.error.invalid"><![CDATA[Sie haben eine ungültige Benutzer-ID angegeben.]]></item>
+		<item name="wcf.user.lostPasswordKey.error.notValid"><![CDATA[Sie haben einen ungültigen Sicherheitsschlüssel angegeben.]]></item>
+		<item name="wcf.user.userID.error.notValid"><![CDATA[Sie haben eine ungültige Benutzer-ID angegeben.]]></item>
 		<item name="wcf.user.newPassword.mail"><![CDATA[Hallo {@$username},
 
 Ihr neues Kennwort für die Website "{@PAGE_TITLE|language}" lautet:
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 6ee848dd40..1ccfe55f0f 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -399,7 +399,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.masterPassword.confirm"><![CDATA[Confirm Master Password]]></item>
 		<item name="wcf.acp.masterPassword.enter"><![CDATA[Master Password Required]]></item>
 		<item name="wcf.acp.masterPassword.enter.description"><![CDATA[The page or action requires the master password for security reasons, the password will be remembered for your current session. In case you forgot the password, please reset it by removing the file <em>{@RELATIVE_WCF_DIR}acp/masterPassword.inc.php</em>.]]></item>
-		<item name="wcf.acp.masterPassword.error.invalid"><![CDATA[Password is incorrect. In case you forgot the password, please reset it by removing the file <em>{@RELATIVE_WCF_DIR}acp/masterPassword.inc.php</em>.]]></item>
+		<item name="wcf.acp.masterPassword.error.notValid"><![CDATA[Password is incorrect. In case you forgot the password, please reset it by removing the file <em>{@RELATIVE_WCF_DIR}acp/masterPassword.inc.php</em>.]]></item>
 		<item name="wcf.acp.masterPassword.error.notEqual"><![CDATA[Passwords do not match.]]></item>
 		<item name="wcf.acp.masterPassword.error.notSecure"><![CDATA[Password is regarded unsafe. It should be at least 8 characters, containing upper and lower latin letters, as well as numbers and special symbols.]]></item>
 		<item name="wcf.acp.masterPassword.example"><![CDATA[Suggestion]]></item>
@@ -1309,7 +1309,7 @@ Allowed extensions: {', '|implode:$attachmentHandler->getAllowedExtensions()}]]>
 		<item name="wcf.category.list"><![CDATA[Categories]]></item>
 		<item name="wcf.category.noneAvailable"><![CDATA[No category has been added yet.]]></item>
 		<item name="wcf.category.parentCategoryID"><![CDATA[Parent Category]]></item>
-		<item name="wcf.category.parentCategoryID.error.invalid"><![CDATA[The chosen category does not exist.]]></item>
+		<item name="wcf.category.parentCategoryID.error.notValid"><![CDATA[The chosen category does not exist.]]></item>
 		<item name="wcf.category.showOrder"><![CDATA[Position]]></item>
 		<item name="wcf.category.description"><![CDATA[Description]]></item>
 		<item name="wcf.category.title"><![CDATA[Title]]></item>
@@ -1904,8 +1904,8 @@ If you have not lost your password, you can safely ignore this email.]]></item>
 		<item name="wcf.user.lostPassword.mail.sent"><![CDATA[You should receive an email shortly.]]></item>
 		<item name="wcf.user.newPassword"><![CDATA[Request New Password]]></item>
 		<item name="wcf.user.lostPasswordKey"><![CDATA[Security Key]]></item>
-		<item name="wcf.user.lostPasswordKey.error.invalid"><![CDATA[Security Key is invalid.]]></item>
-		<item name="wcf.user.userID.error.invalid"><![CDATA[User ID is invalid.]]></item>
+		<item name="wcf.user.lostPasswordKey.error.notValid"><![CDATA[Security Key is invalid.]]></item>
+		<item name="wcf.user.userID.error.notValid"><![CDATA[User ID is invalid.]]></item>
 		<item name="wcf.user.newPassword.mail"><![CDATA[Dear {@$username},
 
 your new password for "{@PAGE_TITLE|language}" is:
-- 
2.20.1