Merge 527d40be2d into 277d6fe0ce

src/components/notifications/Slack.vue

@@ -4,6 +4,11 @@
         <input id="slack-webhook-url" v-model="$parent.notification.slackwebhookURL" type="text" class="form-control" required>
         <label for="slack-username" class="form-label">{{ $t("Username") }}</label>
         <input id="slack-username" v-model="$parent.notification.slackusername" type="text" class="form-control">
+        <div class="form-text">
+            <p style="margin-top: 8px;">
+                {{ $t("aboutSlackUsername") }}
+            </p>
+        </div>
         <label for="slack-iconemo" class="form-label">{{ $t("Icon Emoji") }}</label>
         <input id="slack-iconemo" v-model="$parent.notification.slackiconemo" type="text" class="form-control">
         <label for="slack-channel" class="form-label">{{ $t("Channel Name") }}</label>
@@ -20,9 +25,6 @@
             <i18n-t tag="p" keypath="aboutWebhooks" style="margin-top: 8px;">
                 <a href="https://api.slack.com/messaging/webhooks" target="_blank">https://api.slack.com/messaging/webhooks</a>
             </i18n-t>
-            <p style="margin-top: 8px;">
-                {{ $t("aboutUsername", [$t("slack"), $t("Username"), $t("Friendly Name")]) }}
-            </p>
             <p style="margin-top: 8px;">
                 {{ $t("aboutChannelName", [$t("slack")]) }}
             </p>

src/lang/en.json

@@ -731,7 +731,7 @@
     "Icon Emoji": "Icon Emoji",
     "signalImportant": "IMPORTANT: You cannot mix groups and numbers in recipients!",
     "aboutWebhooks": "More info about Webhooks on: {0}",
-    "aboutUsername": "The {0} {1} can change the display name of the message sender. This is not for mentions. If you want to mention someone, include it in the {2}.",
+    "aboutSlackUsername": "Changes the display name of the message sender. If you want to mention someone, include it in the friendly name instead.",
     "aboutChannelName": "Enter the channel name on {0} Channel Name field if you want to bypass the Webhook channel. Ex: #other-channel",
     "aboutKumaURL": "If you leave the Uptime Kuma URL field blank, it will default to the Project GitHub page.",
     "smtpDkimSettings": "DKIM Settings",