Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop

This commit is contained in:
Barış Soner Uşaklı
2023-09-06 15:32:10 -04:00
3 changed files with 10 additions and 4 deletions

View File

@@ -20,7 +20,7 @@
"disableChat": 0,
"chatEditDuration": 0,
"chatDeleteDuration": 0,
"chatMessageDelay": 200,
"chatMessageDelay": 2000,
"notificationSendDelay": 60,
"newbiePostDelayThreshold": 3,
"postQueue": 0,

View File

@@ -1,4 +1,5 @@
{
"zero-is-disabled": "Enter 0 to disable this restriction",
"chat-settings": "Chat Settings",
"disable": "Disable chat",
"disable-editing": "Disable chat message editing/deletion",
@@ -7,7 +8,8 @@
"max-chat-room-name-length": "Maximum length of chat room names",
"max-room-size": "Maximum number of users in chat rooms",
"delay": "Time between chat messages in milliseconds",
"notification-delay": "Notification delay for chat messages. (0 for no delay)",
"restrictions.seconds-edit-after": "Number of seconds a chat message will remain editable. (0 disabled)",
"restrictions.seconds-delete-after": "Number of seconds a chat message will remain deletable. (0 disabled)"
"notification-delay": "Notification delay for chat messages",
"notification-delay-help": "Additional messages sent between this time are collated, and the user is notified once per delay period. Set this to 0 to disable the delay.",
"restrictions.seconds-edit-after": "Number of seconds a chat message will remain editable.",
"restrictions.seconds-delete-after": "Number of seconds a chat message will remain deletable."
}

View File

@@ -24,16 +24,19 @@
<div class="mb-3">
<label class="form-label" for="chatEditDuration">[[admin/settings/chat:restrictions.seconds-edit-after]]</label>
<input id="chatEditDuration" type="text" class="form-control" value="0" data-field="chatEditDuration">
<p class="form-text">[[admin/settings/chat:zero-is-disabled]]</p>
</div>
<div class="mb-3">
<label class="form-label" for="chatDeleteDuration">[[admin/settings/chat:restrictions.seconds-delete-after]]</label>
<input id="chatDeleteDuration" type="text" class="form-control" value="0" data-field="chatDeleteDuration">
<p class="form-text">[[admin/settings/chat:zero-is-disabled]]</p>
</div>
<div class="mb-3">
<label class="form-label" for="maximumChatRoomNameLength">[[admin/settings/chat:max-chat-room-name-length]]</label>
<input id="maximumChatRoomNameLength" type="text" class="form-control" value="50" data-field="maximumChatRoomNameLength">
<p class="form-text">[[admin/settings/chat:zero-is-disabled]]</p>
</div>
<div class="mb-3">
@@ -55,6 +58,7 @@
<div class="mb-3">
<label class="form-label" for="notificationSendDelay">[[admin/settings/chat:notification-delay]]</label>
<input id="notificationSendDelay" type="text" class="form-control" value="60" data-field="notificationSendDelay">
<p class="form-text">[[admin/settings/chat:notification-delay-help]]</p>
</div>
</div>
</div>