From c3f76a3ab84026dd4431e1b081c089fae8fd484f Mon Sep 17 00:00:00 2001 From: Matt Baer Date: Tue, 12 Nov 2019 00:16:44 +0900 Subject: [PATCH] Change "suspend" to "silence" where user-facing This puts the verbiage more in line with what the feature does, and leaves room for other moderation controls in the future. NOTE: this includes no backend refactoring, which may be confusing. We should rename things to fit ASAP. Ref T661 --- errors.go | 2 +- templates/pad.tmpl | 2 +- templates/user/admin/users.tmpl | 2 +- templates/user/admin/view-user.tmpl | 12 ++++++------ templates/user/include/suspended.tmpl | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/errors.go b/errors.go index fa7304f..c0d435c 100644 --- a/errors.go +++ b/errors.go @@ -48,7 +48,7 @@ var ( ErrUserNotFound = impart.HTTPError{http.StatusNotFound, "User doesn't exist."} ErrUserNotFoundEmail = impart.HTTPError{http.StatusNotFound, "Please enter your username instead of your email address."} - ErrUserSuspended = impart.HTTPError{http.StatusForbidden, "Account is suspended, contact the administrator."} + ErrUserSuspended = impart.HTTPError{http.StatusForbidden, "Account is silenced."} ) // Post operation errors diff --git a/templates/pad.tmpl b/templates/pad.tmpl index 4be311e..0b73b94 100644 --- a/templates/pad.tmpl +++ b/templates/pad.tmpl @@ -134,7 +134,7 @@ var suspended = {{.Suspended}}; var publish = function(content, font) { if (suspended === true) { - alert("Your account is currently suspended, posting is disabled."); + alert("Your account is silenced, so you can't publish or update posts."); return; } {{if and (and .Post.Id (not .Post.Slug)) (not .User)}} diff --git a/templates/user/admin/users.tmpl b/templates/user/admin/users.tmpl index df840b2..fb69d3a 100644 --- a/templates/user/admin/users.tmpl +++ b/templates/user/admin/users.tmpl @@ -18,7 +18,7 @@ {{.Username}} {{.CreatedFriendly}} {{if .IsAdmin}}Admin{{else}}User{{end}} - {{if .IsSuspended}}Suspended{{else}}Active{{end}} + {{if .IsSilenced}}Silenced{{else}}Active{{end}} {{end}} diff --git a/templates/user/admin/view-user.tmpl b/templates/user/admin/view-user.tmpl index 3b13c33..dc7b2ef 100644 --- a/templates/user/admin/view-user.tmpl +++ b/templates/user/admin/view-user.tmpl @@ -57,16 +57,16 @@ td.active-suspend > input[type="submit"] { {{if .LastPost}}{{.LastPost}}{{else}}Never{{end}} -
+ Status {{if .User.IsSuspended}} -

Suspended

- +

Silenced

+ {{else}}

Active

- + {{end}} @@ -117,8 +117,8 @@ td.active-suspend > input[type="submit"] { diff --git a/templates/user/include/suspended.tmpl b/templates/user/include/suspended.tmpl index e5d9be8..76906de 100644 --- a/templates/user/include/suspended.tmpl +++ b/templates/user/include/suspended.tmpl @@ -1,5 +1,5 @@ {{define "user-suspended"}}
-

Your account is suspended. You can still access all of your posts and blogs, but no one else can currently see them.

+

Your account has been silenced. You can still access all of your posts and blogs, but no one else can currently see them.

{{end}}