Replaces 'invalid' with 'notValid'

diff --git a/com.woltlab.wcf/templates/mail.tpl b/com.woltlab.wcf/templates/mail.tpl
index fce68ee0c28b633d5de8936c040abeaf532a9fb9..ed8d9aeb6c166fb00dd301d95971f29b849dae09 100644 (file)
--- 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 feaefd5fede7deda96e4c4943cef37ba37d331c1..23ffb5030566d4837c0dfa530bf78383fb277a85 100644 (file)
--- 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 9a78db9c0a08fae0fcdf3aba021cec6d13b9c736..d6eeed831753c2cfc37555ac84ba0c9e77e1e877 100644 (file)
--- 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 6301a653755ba13c9226e9cd608e932b5bc0ab15..541e96c01f7bc9e7c55621aa4d869cee0fd3bd20 100644 (file)
--- 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 5023e7bda79659a0ad42b5e251640d2f9fd539aa..01d173e37960d6fe4fb440d444daede525b1b9f0 100644 (file)
--- 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 8da439081bfb37175d0a4ebb975c0097ada69a43..06b7a864ced8cbdceb4327bdcc48148a60fac5ad 100755 (executable)
--- 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 882d0bcb9e75ac219ceef2c1e1a41541a5cfcc19..45ce44bca44bc882884c354a8fb042c19ba35b42 100644 (file)
--- 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 b9ea461267924bba9c74bcbf831b9dcb9ee826d8..8944bbff442da2fd2591b0e1a77f89238621e330 100644 (file)
--- 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 34e9ecc3476997502a60e3f675452e3b167eed89..63712fb79578a13ffccab67aab49dfe365dc1734 100644 (file)
--- 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 3239191ca5df6422fafbc394c835256a4308744c..b80370221c272864997460fd043ac7796c81ed72 100644 (file)
--- 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 1f31c3d796f4b773cbade7169e9ed57e45627383..4fd7bace3d67ccd0ff9386ecad226e1d2eb4035f 100644 (file)
--- 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 6ee848dd402172d72ced75283dabdecd16452db4..1ccfe55f0f0d6c20c00c30b43156a24f26e3c4a7 100644 (file)
--- 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: