From 063bbf4645fae2ee2baa272af6905a45a5d01219 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Fri, 2 Sep 2016 18:08:49 +0200 Subject: [PATCH] Change `notValid` to `invalid` --- .../templates/__messageFormPollInline.tpl | 4 +- .../templates/accountManagement.tpl | 4 +- com.woltlab.wcf/templates/emailActivation.tpl | 4 +- com.woltlab.wcf/templates/mail.tpl | 4 +- com.woltlab.wcf/templates/register.tpl | 8 +- .../templates/registerActivation.tpl | 2 +- .../install/files/acp/templates/bbcodeAdd.tpl | 4 +- .../files/acp/templates/languageServerAdd.tpl | 2 +- wcfsetup/install/files/js/WCF.Poll.js | 2 +- wcfsetup/install/files/js/WCF.User.js | 2 +- .../form/AbstractCategoryAddForm.class.php | 4 +- .../form/AbstractCategoryEditForm.class.php | 2 +- .../acp/form/ApplicationEditForm.class.php | 2 +- .../lib/acp/form/BBCodeAddForm.class.php | 6 +- .../form/BBCodeMediaProviderAddForm.class.php | 2 +- .../acp/form/CaptchaQuestionAddForm.class.php | 4 +- .../lib/acp/form/CronjobAddForm.class.php | 2 +- .../files/lib/acp/form/LabelAddForm.class.php | 6 +- .../lib/acp/form/MasterPasswordForm.class.php | 2 +- .../lib/acp/form/NoticeAddForm.class.php | 4 +- .../form/PackageUpdateServerAddForm.class.php | 2 +- .../lib/acp/form/SmileyAddForm.class.php | 2 +- .../files/lib/acp/form/StyleAddForm.class.php | 10 +-- .../lib/acp/form/TemplateAddForm.class.php | 2 +- .../acp/form/TemplateGroupAddForm.class.php | 4 +- .../files/lib/acp/form/UserAddForm.class.php | 4 +- .../lib/acp/form/UserGroupAddForm.class.php | 2 +- .../lib/acp/form/UserRankAddForm.class.php | 6 +- ...ssageQuickReplyGuestDialogAction.class.php | 2 +- .../data/category/CategoryAction.class.php | 2 +- .../lib/data/comment/CommentAction.class.php | 2 +- .../user/UserRegistrationAction.class.php | 4 +- .../lib/form/AccountManagementForm.class.php | 4 +- .../lib/form/EmailActivationForm.class.php | 4 +- .../install/files/lib/form/MailForm.class.php | 2 +- .../files/lib/form/MessageForm.class.php | 2 +- .../lib/form/RegisterActivationForm.class.php | 2 +- .../files/lib/form/RegisterForm.class.php | 4 +- .../RegisterNewActivationCodeForm.class.php | 2 +- .../files/lib/system/WCFSetup.class.php | 4 +- ...tDatabaseObjectListBoxController.class.php | 4 +- .../cli/command/ImportCLICommand.class.php | 6 +- .../AbstractTimestampCondition.class.php | 8 +- .../system/condition/TimeCondition.class.php | 12 +-- .../UserRegistrationDateCondition.class.php | 8 +- .../lib/system/poll/PollManager.class.php | 4 +- wcfsetup/install/lang/de.xml | 74 +++++++++---------- wcfsetup/install/lang/en.xml | 74 +++++++++---------- wcfsetup/setup/lang/setup_de.xml | 4 +- wcfsetup/setup/lang/setup_en.xml | 4 +- wcfsetup/setup/template/stepCreateUser.tpl | 4 +- 51 files changed, 169 insertions(+), 169 deletions(-) diff --git a/com.woltlab.wcf/templates/__messageFormPollInline.tpl b/com.woltlab.wcf/templates/__messageFormPollInline.tpl index 01f778c226..6621e120e6 100644 --- a/com.woltlab.wcf/templates/__messageFormPollInline.tpl +++ b/com.woltlab.wcf/templates/__messageFormPollInline.tpl @@ -5,8 +5,8 @@ WCF.Language.addObject({ 'wcf.poll.button.addOption': '{lang}wcf.poll.button.addOption{/lang}', 'wcf.poll.button.removeOption': '{lang}wcf.poll.button.removeOption{/lang}', - 'wcf.poll.endTime.error.notValid': '{lang}wcf.poll.endTime.error.notValid{/lang}', - 'wcf.poll.maxVotes.error.notValid': '{lang}wcf.poll.maxVotes.error.notValid{/lang}' + 'wcf.poll.endTime.error.invalid': '{lang}wcf.poll.endTime.error.invalid{/lang}', + 'wcf.poll.maxVotes.error.invalid': '{lang}wcf.poll.maxVotes.error.invalid{/lang}' }); new WCF.Poll.Management( diff --git a/com.woltlab.wcf/templates/accountManagement.tpl b/com.woltlab.wcf/templates/accountManagement.tpl index 84d895b331..487bf9b8a1 100644 --- a/com.woltlab.wcf/templates/accountManagement.tpl +++ b/com.woltlab.wcf/templates/accountManagement.tpl @@ -52,7 +52,7 @@ {if $errorField == 'username'} {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} - {if $errorType == 'notValid'}{lang}wcf.user.username.error.notValid{/lang}{/if} + {if $errorType == 'invalid'}{lang}wcf.user.username.error.invalid{/lang}{/if} {if $errorType == 'notUnique'}{lang}wcf.user.username.error.notUnique{/lang}{/if} {if $errorType == 'alreadyRenamed'}{lang}wcf.user.username.error.alreadyRenamed{/lang}{/if} @@ -115,7 +115,7 @@ {if $errorField == 'email'} {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} - {if $errorType == 'notValid'}{lang}wcf.user.email.error.notValid{/lang}{/if} + {if $errorType == 'invalid'}{lang}wcf.user.email.error.invalid{/lang}{/if} {if $errorType == 'notUnique'}{lang}wcf.user.email.error.notUnique{/lang}{/if} {/if} diff --git a/com.woltlab.wcf/templates/emailActivation.tpl b/com.woltlab.wcf/templates/emailActivation.tpl index 9e09d8ad3a..4c6f442056 100644 --- a/com.woltlab.wcf/templates/emailActivation.tpl +++ b/com.woltlab.wcf/templates/emailActivation.tpl @@ -10,7 +10,7 @@ {if $errorField == 'u'} - {if $errorType == 'notValid'}{lang}wcf.user.userID.error.invalid{/lang}{/if} + {if $errorType == 'invalid'}{lang}wcf.user.userID.error.invalid{/lang}{/if} {/if} @@ -22,7 +22,7 @@ {if $errorField == 'a'} - {if $errorType == 'notValid'}{lang}wcf.user.activationCode.error.notValid{/lang}{/if} + {if $errorType == 'invalid'}{lang}wcf.user.activationCode.error.invalid{/lang}{/if} {/if} {lang}wcf.user.newActivationCode{/lang} diff --git a/com.woltlab.wcf/templates/mail.tpl b/com.woltlab.wcf/templates/mail.tpl index 7f691c2615..93866b4c48 100644 --- a/com.woltlab.wcf/templates/mail.tpl +++ b/com.woltlab.wcf/templates/mail.tpl @@ -36,8 +36,8 @@ {if $errorType == 'empty'} {lang}wcf.global.form.error.empty{/lang} - {elseif $errorType == 'notValid'} - {lang}wcf.user.email.error.notValid{/lang} + {elseif $errorType == 'invalid'} + {lang}wcf.user.email.error.invalid{/lang} {else} {lang}wcf.user.mail.senderEmail.error.{@$errorType}{/lang} {/if} diff --git a/com.woltlab.wcf/templates/register.tpl b/com.woltlab.wcf/templates/register.tpl index 937bb14d4f..69322676c9 100644 --- a/com.woltlab.wcf/templates/register.tpl +++ b/com.woltlab.wcf/templates/register.tpl @@ -25,7 +25,7 @@ {if $errorType.username|isset} {if $errorType.username == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} - {if $errorType.username == 'notValid'}{lang}wcf.user.username.error.notValid{/lang}{/if} + {if $errorType.username == 'invalid'}{lang}wcf.user.username.error.invalid{/lang}{/if} {if $errorType.username == 'notUnique'}{lang}wcf.user.username.error.notUnique{/lang}{/if} {/if} @@ -75,7 +75,7 @@ {if $errorType.email|isset} {if $errorType.email == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} - {if $errorType.email == 'notValid'}{lang}wcf.user.email.error.notValid{/lang}{/if} + {if $errorType.email == 'invalid'}{lang}wcf.user.email.error.invalid{/lang}{/if} {if $errorType.email == 'notUnique'}{lang}wcf.user.email.error.notUnique{/lang}{/if} {/if} @@ -193,9 +193,9 @@ $(function() { WCF.Language.addObject({ 'wcf.global.form.error.empty': '{lang}wcf.global.form.error.empty{/lang}', - 'wcf.user.username.error.notValid': '{lang}wcf.user.username.error.notValid{/lang}', + 'wcf.user.username.error.invalid': '{lang}wcf.user.username.error.invalid{/lang}', 'wcf.user.username.error.notUnique': '{lang}wcf.user.username.error.notUnique{/lang}', - 'wcf.user.email.error.notValid' : '{lang}wcf.user.email.error.notValid{/lang}', + 'wcf.user.email.error.invalid' : '{lang}wcf.user.email.error.invalid{/lang}', 'wcf.user.email.error.notUnique' : '{lang}wcf.user.email.error.notUnique{/lang}', 'wcf.user.confirmEmail.error.notEqual' : '{lang}wcf.user.confirmEmail.error.notEqual{/lang}', 'wcf.user.password.error.notSecure' : '{lang}wcf.user.password.error.notSecure{/lang}', diff --git a/com.woltlab.wcf/templates/registerActivation.tpl b/com.woltlab.wcf/templates/registerActivation.tpl index 864db871b2..16bbcd8c65 100644 --- a/com.woltlab.wcf/templates/registerActivation.tpl +++ b/com.woltlab.wcf/templates/registerActivation.tpl @@ -24,7 +24,7 @@ {if $errorField == 'activationCode'} - {if $errorType == 'notValid'}{lang}wcf.user.activationCode.error.notValid{/lang}{/if} + {if $errorType == 'invalid'}{lang}wcf.user.activationCode.error.invalid{/lang}{/if} {/if} {lang}wcf.user.newActivationCode{/lang} diff --git a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl index 3ad8774c20..85de2e840b 100644 --- a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl +++ b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl @@ -229,8 +229,8 @@ {if $errorField == 'attributeValidationPattern'|concat:$attribute->attributeNo} - {if $errorType == 'notValid'} - {lang}wcf.acp.bbcode.attribute.validationPattern.error.notValid{/lang} + {if $errorType == 'invalid'} + {lang}wcf.acp.bbcode.attribute.validationPattern.error.invalid{/lang} {/if} {/if} diff --git a/wcfsetup/install/files/acp/templates/languageServerAdd.tpl b/wcfsetup/install/files/acp/templates/languageServerAdd.tpl index 5fab7274a9..6ec8caef60 100644 --- a/wcfsetup/install/files/acp/templates/languageServerAdd.tpl +++ b/wcfsetup/install/files/acp/templates/languageServerAdd.tpl @@ -31,7 +31,7 @@ {if $errorField == 'server'} {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} - {if $errorType == 'notValid'}{lang}wcf.acp.languageServer.server.error.notValid{/lang}{/if} + {if $errorType == 'invalid'}{lang}wcf.acp.languageServer.server.error.invalid{/lang}{/if} {/if} {lang}wcf.acp.languageServer.server.description{/lang} diff --git a/wcfsetup/install/files/js/WCF.Poll.js b/wcfsetup/install/files/js/WCF.Poll.js index a8bfc328d0..b789e2cd1c 100644 --- a/wcfsetup/install/files/js/WCF.Poll.js +++ b/wcfsetup/install/files/js/WCF.Poll.js @@ -291,7 +291,7 @@ WCF.Poll.Management = Class.extend({ var pollMaxVotes = elById('pollMaxVotes_' + this._editorId); var num = ~~pollMaxVotes.value; if (num && num > count) { - data.api.throwError(pollMaxVotes, WCF.Language.get('wcf.poll.maxVotes.error.notValid')); + data.api.throwError(pollMaxVotes, WCF.Language.get('wcf.poll.maxVotes.error.invalid')); data.valid = false; } } diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js index 57180163c6..df8608d45e 100644 --- a/wcfsetup/install/files/js/WCF.User.js +++ b/wcfsetup/install/files/js/WCF.User.js @@ -1346,7 +1346,7 @@ WCF.User.Registration.Validation.Username = WCF.User.Registration.Validation.ext _validateOptions: function() { var $value = this._element.val(); if ($value.length < this._options.minlength || $value.length > this._options.maxlength) { - this._showError(this._element, WCF.Language.get('wcf.user.username.error.notValid')); + this._showError(this._element, WCF.Language.get('wcf.user.username.error.invalid')); return false; } diff --git a/wcfsetup/install/files/lib/acp/form/AbstractCategoryAddForm.class.php b/wcfsetup/install/files/lib/acp/form/AbstractCategoryAddForm.class.php index ec46b0622a..3202e5b643 100644 --- a/wcfsetup/install/files/lib/acp/form/AbstractCategoryAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/AbstractCategoryAddForm.class.php @@ -331,12 +331,12 @@ abstract class AbstractCategoryAddForm extends AbstractForm { $category = CategoryHandler::getInstance()->getCategory($this->parentCategoryID); if ($category === null) { - throw new UserInputException('parentCategoryID', 'notValid'); + throw new UserInputException('parentCategoryID', 'invalid'); } if ($this->objectType->getProcessor()->getMaximumNestingLevel() != -1) { if (count($category->getParentCategories()) + 1 > $this->objectType->getProcessor()->getMaximumNestingLevel()) { - throw new UserInputException('parentCategoryID', 'notValid'); + throw new UserInputException('parentCategoryID', 'invalid'); } } } diff --git a/wcfsetup/install/files/lib/acp/form/AbstractCategoryEditForm.class.php b/wcfsetup/install/files/lib/acp/form/AbstractCategoryEditForm.class.php index f74c303b5e..4773cfa3dd 100644 --- a/wcfsetup/install/files/lib/acp/form/AbstractCategoryEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/AbstractCategoryEditForm.class.php @@ -171,7 +171,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', 'notValid'); + throw new UserInputException('parentCategoryID', 'invalid'); } } } diff --git a/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php b/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php index 0c313ddc70..58a3f1fa86 100644 --- a/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php @@ -133,7 +133,7 @@ class ApplicationEditForm extends AbstractForm { // check if cookie domain shares the same domain (may exclude subdomains) if (!StringUtil::endsWith($regex->replace($this->domainName, ''), $this->cookieDomain)) { - throw new UserInputException('cookieDomain', 'notValid'); + throw new UserInputException('cookieDomain', 'invalid'); } } diff --git a/wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php b/wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php index 29c1b08e3e..fb1f4cbfc7 100644 --- a/wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php @@ -159,12 +159,12 @@ class BBCodeAddForm extends AbstractForm { // tag may only contain alphanumeric chars if (!Regex::compile('^[a-z0-9]+$', Regex::CASE_INSENSITIVE)->match($this->bbcodeTag)) { - throw new UserInputException('bbcodeTag', 'notValid'); + throw new UserInputException('bbcodeTag', 'invalid'); } // disallow the Pseudo-BBCodes all and none if ($this->bbcodeTag == 'all' || $this->bbcodeTag == 'none') { - throw new UserInputException('bbcodeTag', 'notValid'); + throw new UserInputException('bbcodeTag', 'invalid'); } // check whether the tag is in use @@ -182,7 +182,7 @@ class BBCodeAddForm extends AbstractForm { foreach ($this->attributes as $attribute) { // Check whether the pattern is a valid regex if (!Regex::compile($attribute->validationPattern)->isValid()) { - throw new UserInputException('attributeValidationPattern'.$attribute->attributeNo, 'notValid'); + throw new UserInputException('attributeValidationPattern'.$attribute->attributeNo, 'invalid'); } } diff --git a/wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderAddForm.class.php b/wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderAddForm.class.php index 798b8b0a65..be6148c53d 100644 --- a/wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/BBCodeMediaProviderAddForm.class.php @@ -80,7 +80,7 @@ class BBCodeMediaProviderAddForm extends AbstractForm { $lines = explode("\n", StringUtil::unifyNewlines($this->regex)); foreach ($lines as $line) { - if (!Regex::compile($line)->isValid()) throw new UserInputException('regex', 'notValid'); + if (!Regex::compile($line)->isValid()) throw new UserInputException('regex', 'invalid'); } } diff --git a/wcfsetup/install/files/lib/acp/form/CaptchaQuestionAddForm.class.php b/wcfsetup/install/files/lib/acp/form/CaptchaQuestionAddForm.class.php index 52e11878c8..51a6465a36 100644 --- a/wcfsetup/install/files/lib/acp/form/CaptchaQuestionAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/CaptchaQuestionAddForm.class.php @@ -154,7 +154,7 @@ class CaptchaQuestionAddForm extends AbstractForm { if (!$regexLength || !Regex::compile(mb_substr($answer, 1, $regexLength))->isValid()) { $this->invalidRegex = $answer; - throw new UserInputException('answers', 'regexNotValid'); + throw new UserInputException('answers', 'invalidRegex'); } } } @@ -167,7 +167,7 @@ class CaptchaQuestionAddForm extends AbstractForm { if (!$regexLength || !Regex::compile(mb_substr($answer, 1, $regexLength))->isValid()) { $this->invalidRegex = $answer; - throw new UserInputException('answers', 'regexNotValid'); + throw new UserInputException('answers', 'invalidRegex'); } } } diff --git a/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php b/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php index c276ad27ac..77eaf4196a 100755 --- a/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/CronjobAddForm.class.php @@ -139,7 +139,7 @@ class CronjobAddForm extends AbstractForm { $fieldName = $match[1]; } - throw new UserInputException($fieldName, 'notValid'); + throw new UserInputException($fieldName, 'invalid'); } } diff --git a/wcfsetup/install/files/lib/acp/form/LabelAddForm.class.php b/wcfsetup/install/files/lib/acp/form/LabelAddForm.class.php index 681e0e8c3a..8f1c75b824 100644 --- a/wcfsetup/install/files/lib/acp/form/LabelAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/LabelAddForm.class.php @@ -121,7 +121,7 @@ class LabelAddForm extends AbstractForm { } $groups = $this->labelGroupList->getObjects(); if (!isset($groups[$this->groupID])) { - throw new UserInputException('groupID', 'notValid'); + throw new UserInputException('groupID', 'invalid'); } // validate label @@ -139,11 +139,11 @@ class LabelAddForm extends AbstractForm { throw new UserInputException('cssClassName', 'empty'); } else if (!in_array($this->cssClassName, $this->availableCssClassNames)) { - throw new UserInputException('cssClassName', 'notValid'); + throw new UserInputException('cssClassName', 'invalid'); } else if ($this->cssClassName == 'custom') { if (!empty($this->customCssClassName) && !Regex::compile('^-?[_a-zA-Z]+[_a-zA-Z0-9-]+$')->match($this->customCssClassName)) { - throw new UserInputException('cssClassName', 'notValid'); + throw new UserInputException('cssClassName', 'invalid'); } } diff --git a/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php b/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php index 7e16394202..a33e59514f 100755 --- a/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php @@ -65,7 +65,7 @@ class MasterPasswordForm extends AbstractForm { // check password if (!PasswordUtil::secureCompare(MASTER_PASSWORD, PasswordUtil::getDoubleSaltedHash($this->masterPassword, MASTER_PASSWORD))) { - throw new UserInputException('masterPassword', 'notValid'); + throw new UserInputException('masterPassword', 'invalid'); } } diff --git a/wcfsetup/install/files/lib/acp/form/NoticeAddForm.class.php b/wcfsetup/install/files/lib/acp/form/NoticeAddForm.class.php index 2506f966ec..d0232cd8f9 100644 --- a/wcfsetup/install/files/lib/acp/form/NoticeAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/NoticeAddForm.class.php @@ -267,14 +267,14 @@ class NoticeAddForm extends AbstractForm { throw new UserInputException('cssClassName'); } else if (!in_array($this->cssClassName, $this->availableCssClassNames)) { - throw new UserInputException('cssClassName', 'notValid'); + throw new UserInputException('cssClassName', 'invalid'); } else if ($this->cssClassName == 'custom') { if (empty($this->cssClassName)) { throw new UserInputException('cssClassName'); } if (!Regex::compile('^-?[_a-zA-Z]+[_a-zA-Z0-9-]+$')->match($this->customCssClassName)) { - throw new UserInputException('cssClassName', 'notValid'); + throw new UserInputException('cssClassName', 'invalid'); } } diff --git a/wcfsetup/install/files/lib/acp/form/PackageUpdateServerAddForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageUpdateServerAddForm.class.php index d124536ef0..aadeff7595 100755 --- a/wcfsetup/install/files/lib/acp/form/PackageUpdateServerAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/PackageUpdateServerAddForm.class.php @@ -67,7 +67,7 @@ class PackageUpdateServerAddForm extends AbstractForm { } if (!PackageUpdateServer::isValidServerURL($this->serverURL)) { - throw new UserInputException('serverURL', 'notValid'); + throw new UserInputException('serverURL', 'invalid'); } } diff --git a/wcfsetup/install/files/lib/acp/form/SmileyAddForm.class.php b/wcfsetup/install/files/lib/acp/form/SmileyAddForm.class.php index 9f3f89ad95..2d0e3cbd4f 100644 --- a/wcfsetup/install/files/lib/acp/form/SmileyAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/SmileyAddForm.class.php @@ -252,7 +252,7 @@ class SmileyAddForm extends AbstractForm { if ($this->categoryID) { $category = new Category($this->categoryID); if (!$category->categoryID) { - throw new UserInputException('categoryID', 'notValid'); + throw new UserInputException('categoryID', 'invalid'); } } diff --git a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php index fa3c81dcdf..763cd1e555 100644 --- a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php @@ -274,7 +274,7 @@ class StyleAddForm extends AbstractForm { DateUtil::validateDate($this->styleDate); } catch (SystemException $e) { - throw new UserInputException('styleDate', 'notValid'); + throw new UserInputException('styleDate', 'invalid'); } } @@ -287,13 +287,13 @@ class StyleAddForm extends AbstractForm { throw new UserInputException('styleVersion'); } else if (!Package::isValidVersion($this->styleVersion)) { - throw new UserInputException('styleVersion', 'notValid'); + throw new UserInputException('styleVersion', 'invalid'); } // validate style package name if (!empty($this->packageName)) { if (!Package::isValidPackageName($this->packageName)) { - throw new UserInputException('packageName', 'notValid'); + throw new UserInputException('packageName', 'invalid'); } // 3rd party styles may never have com.woltlab.* as name @@ -313,7 +313,7 @@ class StyleAddForm extends AbstractForm { if ($this->imagePath) { $relativePath = FileUtil::unifyDirSeparator(FileUtil::getRelativePath(WCF_DIR.'images/', WCF_DIR.$this->imagePath)); if (strpos($relativePath, '../') !== false) { - throw new UserInputException('imagePath', 'notValid'); + throw new UserInputException('imagePath', 'invalid'); } } @@ -372,7 +372,7 @@ class StyleAddForm extends AbstractForm { else { // not valid $errors[] = [ - 'error' => 'notValid', + 'error' => 'invalid', 'text' => $line ]; } diff --git a/wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php b/wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php index 85c02d51fb..79a622e995 100644 --- a/wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/TemplateAddForm.class.php @@ -141,7 +141,7 @@ class TemplateAddForm extends AbstractForm { } if (!preg_match('/^[a-z0-9_\-]+$/i', $this->tplName)) { - throw new UserInputException('tplName', 'notValid'); + throw new UserInputException('tplName', 'invalid'); } $conditionBuilder = new PreparedStatementConditionBuilder(); diff --git a/wcfsetup/install/files/lib/acp/form/TemplateGroupAddForm.class.php b/wcfsetup/install/files/lib/acp/form/TemplateGroupAddForm.class.php index 9a5af945d0..5f4bc90d58 100644 --- a/wcfsetup/install/files/lib/acp/form/TemplateGroupAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/TemplateGroupAddForm.class.php @@ -75,7 +75,7 @@ class TemplateGroupAddForm extends AbstractForm { $this->validateFolderName(); if ($this->parentTemplateGroupID && !isset($this->availableTemplateGroups[$this->parentTemplateGroupID])) { - throw new UserInputException('parentTemplateGroupID', 'notValid'); + throw new UserInputException('parentTemplateGroupID', 'invalid'); } } @@ -107,7 +107,7 @@ class TemplateGroupAddForm extends AbstractForm { } if (!preg_match('/^[a-z0-9_\- ]+\/$/i', $this->templateGroupFolderName)) { - throw new UserInputException('templateGroupFolderName', 'notValid'); + throw new UserInputException('templateGroupFolderName', 'invalid'); } $sql = "SELECT COUNT(*) diff --git a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php index fa39aadf68..2f06eb5598 100644 --- a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php @@ -307,7 +307,7 @@ class UserAddForm extends UserOptionListForm { // check for forbidden chars (e.g. the ",") if (!UserUtil::isValidUsername($username)) { - throw new UserInputException('username', 'notValid'); + throw new UserInputException('username', 'invalid'); } // Check if username exists already. @@ -330,7 +330,7 @@ class UserAddForm extends UserOptionListForm { // check for valid email (one @ etc.) if (!UserUtil::isValidEmail($email)) { - throw new UserInputException('email', 'notValid'); + throw new UserInputException('email', 'invalid'); } // Check if email exists already. diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php index 044291da7b..4f9b6a5cf3 100755 --- a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php @@ -124,7 +124,7 @@ class UserGroupAddForm extends AbstractOptionListForm { } } if (mb_strpos($this->userOnlineMarking, '%s') === false) { - throw new UserInputException('userOnlineMarking', 'notValid'); + throw new UserInputException('userOnlineMarking', 'invalid'); } } catch (UserInputException $e) { diff --git a/wcfsetup/install/files/lib/acp/form/UserRankAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserRankAddForm.class.php index 1e124e863c..700effb7f7 100644 --- a/wcfsetup/install/files/lib/acp/form/UserRankAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserRankAddForm.class.php @@ -150,7 +150,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', 'notValid'); + throw new UserInputException('groupID', 'invalid'); } // css class name @@ -158,11 +158,11 @@ class UserRankAddForm extends AbstractForm { throw new UserInputException('cssClassName', 'empty'); } else if (!in_array($this->cssClassName, $this->availableCssClassNames)) { - throw new UserInputException('cssClassName', 'notValid'); + throw new UserInputException('cssClassName', 'invalid'); } else if ($this->cssClassName == 'custom') { if (!empty($this->customCssClassName) && !Regex::compile('^-?[_a-zA-Z]+[_a-zA-Z0-9-]+$')->match($this->customCssClassName)) { - throw new UserInputException('cssClassName', 'notValid'); + throw new UserInputException('cssClassName', 'invalid'); } } diff --git a/wcfsetup/install/files/lib/data/TMessageQuickReplyGuestDialogAction.class.php b/wcfsetup/install/files/lib/data/TMessageQuickReplyGuestDialogAction.class.php index d5cf46bc39..e68f49e920 100644 --- a/wcfsetup/install/files/lib/data/TMessageQuickReplyGuestDialogAction.class.php +++ b/wcfsetup/install/files/lib/data/TMessageQuickReplyGuestDialogAction.class.php @@ -102,7 +102,7 @@ trait TMessageQuickReplyGuestDialogAction { $this->readString('username', false, 'data'); if (!UserUtil::isValidUsername($this->parameters['data']['username'])) { - throw new UserInputException('username', 'notValid'); + throw new UserInputException('username', 'invalid'); } if (!UserUtil::isAvailableUsername($this->parameters['data']['username'])) { throw new UserInputException('username', 'notUnique'); diff --git a/wcfsetup/install/files/lib/data/category/CategoryAction.class.php b/wcfsetup/install/files/lib/data/category/CategoryAction.class.php index 1ab427ebff..93bc44dc6a 100644 --- a/wcfsetup/install/files/lib/data/category/CategoryAction.class.php +++ b/wcfsetup/install/files/lib/data/category/CategoryAction.class.php @@ -162,7 +162,7 @@ class CategoryAction extends AbstractDatabaseObjectAction implements ISortableAc $objectType = CategoryHandler::getInstance()->getObjectType($this->parameters['data']['objectTypeID']); if ($objectType === null) { - throw new UserInputException('objectTypeID', 'notValid'); + throw new UserInputException('objectTypeID', 'invalid'); } if (!$objectType->getProcessor()->canAddCategory()) { throw new PermissionDeniedException(); diff --git a/wcfsetup/install/files/lib/data/comment/CommentAction.class.php b/wcfsetup/install/files/lib/data/comment/CommentAction.class.php index 0ab5789d9a..bebd4f90d6 100644 --- a/wcfsetup/install/files/lib/data/comment/CommentAction.class.php +++ b/wcfsetup/install/files/lib/data/comment/CommentAction.class.php @@ -774,7 +774,7 @@ class CommentAction extends AbstractDatabaseObjectAction { $this->readString('username', false, 'data'); if (!UserUtil::isValidUsername($this->parameters['data']['username'])) { - throw new UserInputException('username', 'notValid'); + throw new UserInputException('username', 'invalid'); } if (!UserUtil::isAvailableUsername($this->parameters['data']['username'])) { throw new UserInputException('username', 'notUnique'); diff --git a/wcfsetup/install/files/lib/data/user/UserRegistrationAction.class.php b/wcfsetup/install/files/lib/data/user/UserRegistrationAction.class.php index bc4ee35bc8..ef64a3f2af 100644 --- a/wcfsetup/install/files/lib/data/user/UserRegistrationAction.class.php +++ b/wcfsetup/install/files/lib/data/user/UserRegistrationAction.class.php @@ -47,7 +47,7 @@ class UserRegistrationAction extends UserAction { if (!UserRegistrationUtil::isValidUsername($this->parameters['username'])) { return [ 'isValid' => false, - 'error' => 'notValid' + 'error' => 'invalid' ]; } @@ -72,7 +72,7 @@ class UserRegistrationAction extends UserAction { if (!UserRegistrationUtil::isValidEmail($this->parameters['email'])) { return [ 'isValid' => false, - 'error' => 'notValid' + 'error' => 'invalid' ]; } diff --git a/wcfsetup/install/files/lib/form/AccountManagementForm.class.php b/wcfsetup/install/files/lib/form/AccountManagementForm.class.php index cd2d70e72f..b56a99c949 100644 --- a/wcfsetup/install/files/lib/form/AccountManagementForm.class.php +++ b/wcfsetup/install/files/lib/form/AccountManagementForm.class.php @@ -194,7 +194,7 @@ class AccountManagementForm extends AbstractForm { // checks for forbidden chars (e.g. the ",") if (!UserRegistrationUtil::isValidUsername($this->username)) { - throw new UserInputException('username', 'notValid'); + throw new UserInputException('username', 'invalid'); } // checks if user name exists already. @@ -235,7 +235,7 @@ class AccountManagementForm extends AbstractForm { if (mb_strtolower($this->email) != mb_strtolower(WCF::getUser()->email)) { // check for valid email (one @ etc.) if (!UserRegistrationUtil::isValidEmail($this->email)) { - throw new UserInputException('email', 'notValid'); + throw new UserInputException('email', 'invalid'); } // checks if email already exists. diff --git a/wcfsetup/install/files/lib/form/EmailActivationForm.class.php b/wcfsetup/install/files/lib/form/EmailActivationForm.class.php index 495dd53af1..16d282e8fc 100644 --- a/wcfsetup/install/files/lib/form/EmailActivationForm.class.php +++ b/wcfsetup/install/files/lib/form/EmailActivationForm.class.php @@ -67,7 +67,7 @@ class EmailActivationForm extends AbstractForm { // check given user id $this->user = new User($this->userID); if (!$this->user->userID) { - throw new UserInputException('u', 'notValid'); + throw new UserInputException('u', 'invalid'); } // user is already enabled @@ -82,7 +82,7 @@ class EmailActivationForm extends AbstractForm { // check given activation code if ($this->user->reactivationCode != $this->activationCode) { - throw new UserInputException('a', 'notValid'); + throw new UserInputException('a', 'invalid'); } } diff --git a/wcfsetup/install/files/lib/form/MailForm.class.php b/wcfsetup/install/files/lib/form/MailForm.class.php index 03c3da60d3..bc9c6df020 100644 --- a/wcfsetup/install/files/lib/form/MailForm.class.php +++ b/wcfsetup/install/files/lib/form/MailForm.class.php @@ -114,7 +114,7 @@ class MailForm extends AbstractCaptchaForm { } if (!UserUtil::isValidEmail($this->email)) { - throw new UserInputException('email', 'notValid'); + throw new UserInputException('email', 'invalid'); } } diff --git a/wcfsetup/install/files/lib/form/MessageForm.class.php b/wcfsetup/install/files/lib/form/MessageForm.class.php index 065817f592..beba3dbfd4 100644 --- a/wcfsetup/install/files/lib/form/MessageForm.class.php +++ b/wcfsetup/install/files/lib/form/MessageForm.class.php @@ -249,7 +249,7 @@ abstract class MessageForm extends AbstractCaptchaForm { } if (!isset($this->availableContentLanguages[$this->languageID])) { - throw new UserInputException('languageID', 'notValid'); + throw new UserInputException('languageID', 'invalid'); } } diff --git a/wcfsetup/install/files/lib/form/RegisterActivationForm.class.php b/wcfsetup/install/files/lib/form/RegisterActivationForm.class.php index 30e254b87c..20886f8b94 100644 --- a/wcfsetup/install/files/lib/form/RegisterActivationForm.class.php +++ b/wcfsetup/install/files/lib/form/RegisterActivationForm.class.php @@ -83,7 +83,7 @@ class RegisterActivationForm extends AbstractForm { // check given activation code if ($this->user->activationCode != $this->activationCode) { - throw new UserInputException('activationCode', 'notValid'); + throw new UserInputException('activationCode', 'invalid'); } } diff --git a/wcfsetup/install/files/lib/form/RegisterForm.class.php b/wcfsetup/install/files/lib/form/RegisterForm.class.php index f3232865b8..4d0376db76 100644 --- a/wcfsetup/install/files/lib/form/RegisterForm.class.php +++ b/wcfsetup/install/files/lib/form/RegisterForm.class.php @@ -262,7 +262,7 @@ class RegisterForm extends UserAddForm { // check for min-max length if (!UserRegistrationUtil::isValidUsername($username)) { - throw new UserInputException('username', 'notValid'); + throw new UserInputException('username', 'invalid'); } } @@ -287,7 +287,7 @@ class RegisterForm extends UserAddForm { parent::validateEmail($email, $confirmEmail); if (!UserRegistrationUtil::isValidEmail($email)) { - throw new UserInputException('email', 'notValid'); + throw new UserInputException('email', 'invalid'); } } diff --git a/wcfsetup/install/files/lib/form/RegisterNewActivationCodeForm.class.php b/wcfsetup/install/files/lib/form/RegisterNewActivationCodeForm.class.php index 29db8278a7..18c3140c6a 100644 --- a/wcfsetup/install/files/lib/form/RegisterNewActivationCodeForm.class.php +++ b/wcfsetup/install/files/lib/form/RegisterNewActivationCodeForm.class.php @@ -115,7 +115,7 @@ class RegisterNewActivationCodeForm extends AbstractForm { // check whether user entered the same email, instead of leaving the input empty if (mb_strtolower($this->email) != mb_strtolower($this->user->email)) { if (!UserRegistrationUtil::isValidEmail($this->email)) { - throw new UserInputException('email', 'notValid'); + throw new UserInputException('email', 'invalid'); } // Check if email exists already. diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php index 81699a8db9..788ef8f0c7 100644 --- a/wcfsetup/install/files/lib/system/WCFSetup.class.php +++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php @@ -954,7 +954,7 @@ class WCFSetup extends WCF { throw new UserInputException('username'); } if (!UserUtil::isValidUsername($username)) { - throw new UserInputException('username', 'notValid'); + throw new UserInputException('username', 'invalid'); } // e-mail address @@ -962,7 +962,7 @@ class WCFSetup extends WCF { throw new UserInputException('email'); } if (!UserUtil::isValidEmail($email)) { - throw new UserInputException('email', 'notValid'); + throw new UserInputException('email', 'invalid'); } // confirm e-mail address diff --git a/wcfsetup/install/files/lib/system/box/AbstractDatabaseObjectListBoxController.class.php b/wcfsetup/install/files/lib/system/box/AbstractDatabaseObjectListBoxController.class.php index d53e9036d7..6ffff2f123 100644 --- a/wcfsetup/install/files/lib/system/box/AbstractDatabaseObjectListBoxController.class.php +++ b/wcfsetup/install/files/lib/system/box/AbstractDatabaseObjectListBoxController.class.php @@ -314,11 +314,11 @@ abstract class AbstractDatabaseObjectListBoxController extends AbstractBoxContro if (!empty($this->validSortFields)) { if (!in_array($this->sortField, $this->validSortFields)) { - throw new UserInputException('sorting', 'sortFieldNotValid'); + throw new UserInputException('sorting', 'invalidSortField'); } if ($this->sortOrder !== 'ASC' && $this->sortOrder !== 'DESC') { - throw new UserInputException('sorting', 'sortOrderNotValid'); + throw new UserInputException('sorting', 'invalidSortOrder'); } } diff --git a/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php b/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php index 1e75dcfea9..fa2c4fac89 100644 --- a/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php +++ b/wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php @@ -268,7 +268,7 @@ class ImportCLICommand implements ICLICommand { break; } - CLIWCF::getReader()->println(WCF::getLanguage()->get('wcf.acp.dataImport.selectExporter.error.notValid')); + CLIWCF::getReader()->println(WCF::getLanguage()->get('wcf.acp.dataImport.selectExporter.error.invalid')); } $this->exporter = $this->exporters[$this->exporterName]->getProcessor(); @@ -375,7 +375,7 @@ class ImportCLICommand implements ICLICommand { continue; } else { - CLIWCF::getReader()->println(WCF::getLanguage()->get('wcf.acp.dataImport.cli.configure.data.error.notValid')); + CLIWCF::getReader()->println(WCF::getLanguage()->get('wcf.acp.dataImport.cli.configure.data.error.invalid')); continue; } @@ -422,7 +422,7 @@ class ImportCLICommand implements ICLICommand { continue; } else { - CLIWCF::getReader()->println(' '.WCF::getLanguage()->get('wcf.acp.dataImport.cli.configure.data.error.notValid')); + CLIWCF::getReader()->println(' '.WCF::getLanguage()->get('wcf.acp.dataImport.cli.configure.data.error.invalid')); continue; } diff --git a/wcfsetup/install/files/lib/system/condition/AbstractTimestampCondition.class.php b/wcfsetup/install/files/lib/system/condition/AbstractTimestampCondition.class.php index 89c67f5fbe..041007a210 100644 --- a/wcfsetup/install/files/lib/system/condition/AbstractTimestampCondition.class.php +++ b/wcfsetup/install/files/lib/system/condition/AbstractTimestampCondition.class.php @@ -188,17 +188,17 @@ HTML; if (strlen($this->startTime)) { $startTime = @strtotime($this->startTime); if ($startTime === false) { - $this->errorMessage = 'wcf.condition.timestamp.error.startNotValid'; + $this->errorMessage = 'wcf.condition.timestamp.error.invalidStart'; - throw new UserInputException($this->getPropertyName(), 'startNotValid'); + throw new UserInputException($this->getPropertyName(), 'invalidStart'); } } if (strlen($this->endTime)) { $endTime = @strtotime($this->endTime); if ($endTime === false) { - $this->errorMessage = 'wcf.condition.timestamp.error.endNotValid'; + $this->errorMessage = 'wcf.condition.timestamp.error.invalidEnd'; - throw new UserInputException($this->getPropertyName(), 'endNotValid'); + throw new UserInputException($this->getPropertyName(), 'invalidEnd'); } } diff --git a/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php b/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php index 0f7f6cc770..ea7ecb23db 100644 --- a/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php +++ b/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php @@ -154,17 +154,17 @@ HTML; if ($this->startTime) { $startDateTime = \DateTime::createFromFormat('H:i', $this->startTime); if ($startDateTime === false) { - $this->errorMessages['time'] = 'wcf.date.startTime.error.notValid'; + $this->errorMessages['time'] = 'wcf.date.startTime.error.invalid'; - throw new UserInputException('startTime', 'notValid'); + throw new UserInputException('startTime', 'invalid'); } } if ($this->endTime) { $endDateTime = \DateTime::createFromFormat('H:i', $this->endTime); if ($endDateTime === false) { - $this->errorMessages['time'] = 'wcf.date.endTime.error.notValid'; + $this->errorMessages['time'] = 'wcf.date.endTime.error.invalid'; - throw new UserInputException('endTime', 'notValid'); + throw new UserInputException('endTime', 'invalid'); } } @@ -177,9 +177,9 @@ HTML; } if ($this->timezone && !in_array($this->timezone, DateUtil::getAvailableTimezones())) { - $this->errorMessages['timezone'] = 'wcf.global.form.error.notValidSelection'; + $this->errorMessages['timezone'] = 'wcf.global.form.error.noValidSelection'; - throw new UserInputException('timezone', 'notValidSelection'); + throw new UserInputException('timezone', 'noValidSelection'); } } diff --git a/wcfsetup/install/files/lib/system/condition/UserRegistrationDateCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserRegistrationDateCondition.class.php index 4adeac3a75..33f2c5478e 100644 --- a/wcfsetup/install/files/lib/system/condition/UserRegistrationDateCondition.class.php +++ b/wcfsetup/install/files/lib/system/condition/UserRegistrationDateCondition.class.php @@ -134,17 +134,17 @@ HTML; if (strlen($this->registrationDateStart)) { $registrationDateStart = @strtotime($this->registrationDateStart); if ($registrationDateStart === false) { - $this->errorMessage = 'wcf.condition.timestamp.error.startNotValid'; + $this->errorMessage = 'wcf.condition.timestamp.error.invalidStart'; - throw new UserInputException('registrationDate', 'startNotValid'); + throw new UserInputException('registrationDate', 'invalidStart'); } } if (strlen($this->registrationDateEnd)) { $registrationDateEnd = @strtotime($this->registrationDateEnd); if ($registrationDateEnd === false) { - $this->errorMessage = 'wcf.condition.timestamp.error.endNotValid'; + $this->errorMessage = 'wcf.condition.timestamp.error.invalidEnd'; - throw new UserInputException('registrationDate', 'endNotValid'); + throw new UserInputException('registrationDate', 'invalidEnd'); } } diff --git a/wcfsetup/install/files/lib/system/poll/PollManager.class.php b/wcfsetup/install/files/lib/system/poll/PollManager.class.php index 35e98f90d6..3236876317 100644 --- a/wcfsetup/install/files/lib/system/poll/PollManager.class.php +++ b/wcfsetup/install/files/lib/system/poll/PollManager.class.php @@ -219,7 +219,7 @@ class PollManager extends SingletonFactory { if ($this->pollData['endTime'] && $this->pollData['endTime'] <= TIME_NOW) { if ($this->poll === null || $this->poll->endTime >= TIME_NOW) { // end time is in the past - throw new UserInputException('pollEndTime', 'notValid'); + throw new UserInputException('pollEndTime', 'invalid'); } } @@ -235,7 +235,7 @@ class PollManager extends SingletonFactory { // less options available than allowed if ($count < $this->pollData['maxVotes']) { - throw new UserInputException('pollMaxVotes', 'notValid'); + throw new UserInputException('pollMaxVotes', 'invalid'); } } diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 25a6cb1072..f177265568 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -52,7 +52,7 @@ - + @@ -98,14 +98,14 @@ - + - + @@ -135,7 +135,7 @@
  • (?<ID>[0-9]+) erkennt eine Medium-ID aus Zahlen.
  • (?<ID>[0-9a-zA-Z]+) erkennt eine alphanumerische Medium-ID.
    • ]]> - + @@ -208,7 +208,7 @@ - + {$question->question|language} wirklich löschen?]]> @@ -243,7 +243,7 @@ getPath('wcf')}acp/dereferrer.php?url={"http://www.unixgeeks.org/security/newbie/unix/cron-1.html"|rawurlencode}" class="externalURL">Newbie: Intro to cron]]> - + {$cronjob->description|language} wirklich löschen?]]> @@ -261,7 +261,7 @@ - + @@ -299,7 +299,7 @@ löschen. {if LANGUAGE_USE_INFORMAL_VARIANT}Du solltest{else}Sie sollten{/if} die Zuordnungen nicht löschen, wenn {if LANGUAGE_USE_INFORMAL_VARIANT}du{else}Sie{/if} jetzt oder zukünftig noch weitere Inhalte aus dem selben Forum übernehmen {if LANGUAGE_USE_INFORMAL_VARIANT}willst{else}wollen{/if}.]]> - + @@ -432,7 +432,7 @@ <strong>%s</strong> stellt Mitglieder dieser Gruppe beispielsweise in Fettdruck dar.]]> - + @@ -551,7 +551,7 @@ - + {$label} wirklich löschen?]]> @@ -562,7 +562,7 @@ {$group->groupName|language} wirklich löschen?]]> - + @@ -622,7 +622,7 @@ {@$relativeWcfDir}acp/masterPassword.inc.php {if LANGUAGE_USE_INFORMAL_VARIANT}löscht{else}löschen{/if}.]]> - {@$relativeWcfDir}acp/masterPassword.inc.php {if LANGUAGE_USE_INFORMAL_VARIANT}löscht{else}löschen{/if}.]]> + {@$relativeWcfDir}acp/masterPassword.inc.php {if LANGUAGE_USE_INFORMAL_VARIANT}löscht{else}löschen{/if}.]]> @@ -766,7 +766,7 @@ CSS-Klasse nutzen.]]> - + @@ -1507,7 +1507,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> - + @@ -1535,7 +1535,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> - + @@ -1560,7 +1560,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> - + @@ -1625,7 +1625,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> - + Schutz aufheben.]]> @@ -1639,9 +1639,9 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> - - - + + + @@ -1684,13 +1684,13 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> - + - + {$templateGroup->getName()} wirklich löschen?]]> - + {$template->templateName} wirklich löschen?]]> @@ -1812,7 +1812,7 @@ Wenn {if LANGUAGE_USE_INFORMAL_VARIANT}du{else}Sie{/if} unter System -> O CSS-Klasse nutzen.]]> - + {$userRank->rankTitle|language} wirklich löschen?]]> @@ -2025,7 +2025,7 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getFormattedAllowedExt - + @@ -2100,8 +2100,8 @@ Fehler sind beispielsweise: - - + + @@ -2285,8 +2285,8 @@ Fehler sind beispielsweise: - - + + @@ -2515,7 +2515,7 @@ Fehler sind beispielsweise: - + @@ -2771,12 +2771,12 @@ Fehler sind beispielsweise: - + - + maxVotes} Antwortmöglichkeiten wählen.]]> @@ -2849,7 +2849,7 @@ Fehler sind beispielsweise: - + @@ -2873,7 +2873,7 @@ Fehler sind beispielsweise: - + user->username}]]> @@ -2947,11 +2947,11 @@ haben:

    ]]> dann wird diese Anfrage am {$mailbox->getUser()->lastLostPasswordRequestTime+86400|plainTime} automatisch ablaufen.

    ]]> - + username}“ zu ändern.]]> username}“ wurde erfolgreich geändert. {if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst dich{else}Sie können sich{/if} nun mit dem neuen Kennwort einloggen.]]> - + bisheriges Kennwort ein!]]> @@ -3008,7 +3008,7 @@ sich{/if} nicht bei uns registriert {if LANGUAGE_USE_INFORMAL_VARIANT}hast{else} - + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 19c497cad8..fc5f4ed284 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -52,7 +52,7 @@ - + @@ -98,14 +98,14 @@ - + - + @@ -134,7 +134,7 @@ Examples for medium ID detection:
  • (?<ID>[0-9]+) detects a numeric ID.
  • (?<ID>[0-9a-zA-Z]+) detects an alphanumeric ID
    • ]]> - + @@ -207,7 +207,7 @@ Examples for medium ID detection: - + {$question->question|language}?]]> @@ -242,7 +242,7 @@ Examples for medium ID detection: getPath('wcf')}acp/dereferrer.php?url={"http://www.unixgeeks.org/security/newbie/unix/cron-1.html"|rawurlencode}" class="externalURL">Newbie: Intro to cron.]]> - + {$cronjob->description|language}?]]> @@ -260,7 +260,7 @@ Examples for medium ID detection: - + @@ -298,7 +298,7 @@ Examples for medium ID detection: delete the mappings. It is strongly recommended to keep these mappings as long as there is still data to be imported now or in the future.]]> - +     @@ -432,7 +432,7 @@ Examples for medium ID detection: <strong>%s</strong>     results in a bolder appearance.]]> - + @@ -551,7 +551,7 @@ Examples for medium ID detection: - + {$label}?]]> @@ -561,7 +561,7 @@ Examples for medium ID detection: {$group->groupName|language}?]]> - + @@ -619,7 +619,7 @@ Examples for medium ID detection: {@$relativeWcfDir}acp/masterPassword.inc.php.]]> - {@$relativeWcfDir}acp/masterPassword.inc.php.]]> + {@$relativeWcfDir}acp/masterPassword.inc.php.]]> @@ -764,7 +764,7 @@ Examples for medium ID detection: - + @@ -1479,7 +1479,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> - + @@ -1507,7 +1507,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> - + @@ -1532,7 +1532,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> - + @@ -1597,7 +1597,7 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> - + disable this protection.]]> @@ -1611,9 +1611,9 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> - - - + + + @@ -1656,13 +1656,13 @@ GmbH=Gesellschaft mit beschränkter Haftung]]> - + - + {$templateGroup->getName()}?]]> - + {$template->templateName}?]]> @@ -1784,7 +1784,7 @@ You can define the default sender in System -> Options -> General -> CSS class name.]]> - + {$userRank->rankTitle|language}?]]> @@ -1987,7 +1987,7 @@ Allowed extensions: {', '|implode:$attachmentHandler->getFormattedAllowedExtensi - + @@ -2066,8 +2066,8 @@ Errors are: - - + + @@ -2251,8 +2251,8 @@ Errors are: - - + + @@ -2480,7 +2480,7 @@ Errors are: - + @@ -2804,12 +2804,12 @@ Errors are: - + - + maxVotes} options.]]> @@ -2882,7 +2882,7 @@ Errors are: - + @@ -2906,7 +2906,7 @@ Errors are: - + user->username}]]> @@ -2976,11 +2976,11 @@ the website {@PAGE_TITLE|language}.

    If you don’t want to change your password you can simply wait. The request will expire at {$mailbox->getUser()->lastLostPasswordRequestTime+86400|plainTime}.

    ]]> - + username}”.]]> username}” has been changed successfully. You may now login with your new password.]]> - + current password!]]> @@ -3036,7 +3036,7 @@ not register with us.]]> - + diff --git a/wcfsetup/setup/lang/setup_de.xml b/wcfsetup/setup/lang/setup_de.xml index 9680c242fd..2703976d72 100644 --- a/wcfsetup/setup/lang/setup_de.xml +++ b/wcfsetup/setup/lang/setup_de.xml @@ -64,8 +64,8 @@ - - + + - - + + {if $errorType == 'empty'}{lang}wcf.global.createUser.error.empty{/lang}{/if} - {if $errorType == 'notValid'}{lang}wcf.global.createUser.error.username.notValid{/lang}{/if} + {if $errorType == 'invalid'}{lang}wcf.global.createUser.error.username.invalid{/lang}{/if}     {/if} @@ -31,7 +31,7 @@ {if $errorField == 'email'} {if $errorType == 'empty'}{lang}wcf.global.createUser.error.empty{/lang}{/if} - {if $errorType == 'notValid'}{lang}wcf.global.createUser.error.email.notValid{/lang}{/if} + {if $errorType == 'invalid'}{lang}wcf.global.createUser.error.email.invalid{/lang}{/if} {/if} -- 2.20.1