diff --git a/public/language/en-GB/admin/settings/chat.json b/public/language/en-GB/admin/settings/chat.json index 86360a34ee..a5412d1095 100644 --- a/public/language/en-GB/admin/settings/chat.json +++ b/public/language/en-GB/admin/settings/chat.json @@ -8,7 +8,6 @@ "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 (ms)", - "newbieDelay": "... for new users (ms)", "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.", diff --git a/public/language/en-GB/admin/settings/post.json b/public/language/en-GB/admin/settings/post.json index 9de7dc76fa..c93c901455 100644 --- a/public/language/en-GB/admin/settings/post.json +++ b/public/language/en-GB/admin/settings/post.json @@ -10,7 +10,6 @@ "length": "Post Length", "post-queue": "Post Queue", "restrictions": "Posting Restrictions", - "restrictions-new": "New User Restrictions", "restrictions.post-queue": "Enable post queue", "restrictions.post-queue-rep-threshold": "Reputation required to bypass post queue", "restrictions.groups-exempt-from-post-queue": "Select groups that should be exempt from the post queue", @@ -18,9 +17,6 @@ "restrictions.post-queue-help": "Enabling post queue will put the posts of new users in a queue for approval", "restrictions-new.post-queue-help": "Enabling new user restrictions will set restrictions on posts created by new users", "restrictions.seconds-between": "Number of seconds between posts", - "restrictions.seconds-between-new": "Seconds between posts for new users", - "restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted", - "restrictions.seconds-before-new": "Seconds before a new user can make their first post", "restrictions.seconds-edit-after": "Number of seconds a post remains editable (set to 0 to disable)", "restrictions.seconds-delete-after": "Number of seconds a post remains deletable (set to 0 to disable)", "restrictions.replies-no-delete": "Number of replies after users are disallowed to delete their own topics (set to 0 to disable)", diff --git a/public/language/en-GB/admin/settings/user.json b/public/language/en-GB/admin/settings/user.json index 88f14c76cd..7c55d69ee5 100644 --- a/public/language/en-GB/admin/settings/user.json +++ b/public/language/en-GB/admin/settings/user.json @@ -81,5 +81,11 @@ "categoryWatchState": "Default category watch state", "categoryWatchState.tracking": "Tracking", "categoryWatchState.notwatching": "Not Watching", - "categoryWatchState.ignoring": "Ignoring" + "categoryWatchState.ignoring": "Ignoring", + "restrictions-new": "New User Restrictions", + "restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted", + "restrictions.seconds-between-new": "Seconds between posts for new users", + "restrictions.seconds-before-new": "Seconds before a new user can make their first post", + "restrictions.seconds-edit-after-new": "Number of seconds a post remains editable for new users (set to 0 to disable)", + "restrictions.milliseconds-between-messages": "Time between chat messages for new users (ms)" } diff --git a/src/views/admin/settings/chat.tpl b/src/views/admin/settings/chat.tpl index cbd138d0c8..bc37c83757 100644 --- a/src/views/admin/settings/chat.tpl +++ b/src/views/admin/settings/chat.tpl @@ -49,16 +49,10 @@ -
-
- - -
-
- - -
-
+
+ + +
diff --git a/src/views/admin/settings/post.tpl b/src/views/admin/settings/post.tpl index 816dfabede..bd99f75a4a 100644 --- a/src/views/admin/settings/post.tpl +++ b/src/views/admin/settings/post.tpl @@ -120,33 +120,6 @@
- -
-
[[admin/settings/post:restrictions-new]]
- -
- - -
- -
- - -
- -
- - -
- -
- - -
-
- -
-
[[admin/settings/post:post-queue]]
diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl index 60d80f781e..4a2bcc19b7 100644 --- a/src/views/admin/settings/user.tpl +++ b/src/views/admin/settings/user.tpl @@ -213,6 +213,38 @@
+ +
+
[[admin/settings/user:restrictions-new]]
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+ +
+
[[admin/settings/guest:guest-settings]]