Document the option to use placeholders in email texts

Closes #5864

diff --git a/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php b/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
index d933657316c3ffd9ffca9fcd4cacbc64ed3c8a68..40954a407f242dd20f79d02ec6a7296b217adee1 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserMailForm.class.php
@@ -55,6 +55,7 @@ class UserMailForm extends AbstractFormBuilderForm
                 ->required(),
             MultilineTextFormField::create('text')
                 ->label('wcf.acp.user.sendMail.text')
+                ->description('wcf.acp.user.sendMail.description')
                 ->required(),
             BooleanFormField::create('enableHTML')
                 ->label('wcf.acp.user.sendMail.enableHTML'),

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 97f0e73090e3763aea5233e6dd62efc236d344f3..091ad108f47b6c13fdfeb660799ceed56a4035e3 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3108,6 +3108,7 @@ Abschnitte dürfen nicht leer sein und nur folgende Zeichen enthalten: <kbd>[a-z
                <item name="wcf.acp.user.sendMail.markedUsers"><![CDATA[E-Mail an folgende Benutzer senden]]></item>
                <item name="wcf.acp.user.sendMail.subject"><![CDATA[Betreff]]></item>
                <item name="wcf.acp.user.sendMail.text"><![CDATA[Nachricht]]></item>
+               <item name="wcf.acp.user.sendMail.description"><![CDATA[<kbd>{literal}{$username}{/literal}</kbd> sowie <kbd>{literal}{$email}{/literal}</kbd> können als Platzhalter verwendet werden, um den Benutzernamen bzw. die E-Mail-Adresse des jeweiligen Empfängers einzufügen.]]></item>
                <item name="wcf.acp.user.quickSearch"><![CDATA[Schnellsuche]]></item>
                <item name="wcf.acp.user.quickSearch.banned"><![CDATA[Gesperrte Benutzer]]></item>
                <item name="wcf.acp.user.quickSearch.newest"><![CDATA[Neueste Benutzer]]></item>
@@ -6565,7 +6566,6 @@ Benachrichtigungen auf <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phra
        <item name="wcf.acp.user.search.matches"/>
        <item name="wcf.acp.user.search.withinResults"/>
        <item name="wcf.acp.user.sendMail.subject.description"/>
-       <item name="wcf.acp.user.sendMail.text.description"/>
        <item name="wcf.acp.user.sendNewPassword.mail"/>
        <item name="wcf.acp.user.userNote"/>
        <item name="wcf.acp.worker.currentStep"/>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 9d1025127b53a74c46efb06a7ce13f7d42ce2a29..09cbb5070fd93e640cc13cc7c39cc66d661e89a2 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3037,6 +3037,7 @@ If you have <strong>already bought the licenses for the listed apps</strong>, th
                <item name="wcf.acp.user.sendMail.markedUsers"><![CDATA[Send email to following users]]></item>
                <item name="wcf.acp.user.sendMail.subject"><![CDATA[Email Subject]]></item>
                <item name="wcf.acp.user.sendMail.text"><![CDATA[Email Message]]></item>
+               <item name="wcf.acp.user.sendMail.description"><![CDATA[<kbd>{literal}{$username}{/literal}</kbd> and <kbd>{literal}{$email}{/literal}</kbd> can be used as placeholders to insert the username or email address of the respective recipient.]]></item>
                <item name="wcf.acp.user.quickSearch"><![CDATA[Quick Search]]></item>
                <item name="wcf.acp.user.quickSearch.banned"><![CDATA[Banned users]]></item>
                <item name="wcf.acp.user.quickSearch.newest"><![CDATA[Newest users]]></item>
@@ -6593,7 +6594,6 @@ your notifications on <a href="{link isHtmlEmail=true}{/link}">{PAGE_TITLE|phras
        <item name="wcf.acp.user.search.withinResults"/>
        <item name="wcf.acp.user.sendMail.enableHTML.description"/>
        <item name="wcf.acp.user.sendMail.subject.description"/>
-       <item name="wcf.acp.user.sendMail.text.description"/>
        <item name="wcf.acp.user.sendNewPassword.mail"/>
        <item name="wcf.acp.user.userNote"/>
        <item name="wcf.acp.worker.currentStep"/>