From 14a0e6fd95918f04769f12ce1476b637e55fa7b9 Mon Sep 17 00:00:00 2001 From: Suyash Choudhary <57896905+sssash18@users.noreply.github.com> Date: Sun, 16 Feb 2020 13:17:31 +0530 Subject: [PATCH 1/2] added unban --- app/views/users/list.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/users/list.html.erb b/app/views/users/list.html.erb index 3c14e3cb75..b0955afdec 100644 --- a/app/views/users/list.html.erb +++ b/app/views/users/list.html.erb @@ -51,9 +51,9 @@
  • See Full Profile
  • <% if current_user && (current_user.role == "admin" || current_user.role == "moderator") %> <% if user.status == 0 %> - <%= t('users.list.banned') %> - <% elsif user.status == 1 && user != current_user %> -
  • <%= t('users.list.ban') %>
  • +
  • <%= t('users.list.unban') %>
  • + <% elsif user.status == 1 && user != current_user %> +
  • <%= t('users.list.ban') %>
  • <% end %> <% end %> From 048850a9244e764aaf1145ab26360496588ec16c Mon Sep 17 00:00:00 2001 From: Suyash Choudhary <57896905+sssash18@users.noreply.github.com> Date: Sun, 16 Feb 2020 13:19:43 +0530 Subject: [PATCH 2/2] added translations --- config/locales/en.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index 54d3e63f08..d8755881a1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -136,7 +136,9 @@ en: notes_and_edits: "research notes and wiki edits" banned: "Banned" are_you_sure: "Are you sure? The user will no longer be able to log in or publish." + are_you_sure_to_unban: "Are you sure? The user will be eligible to log in or publish." ban: "Ban" + unban: "Unban" _photo: profile_photo: "Profile photo" drag_and_drop_image: "Drag and drop to add an image, or"