diff --git a/app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs b/app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs
index 93df84f2bc1..c78e2630035 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs
@@ -1,6 +1,6 @@
{{report.title}} |
{{#link-to 'adminUsersList.show' 'newuser'}}{{value-at-tl report.data level="0"}}{{/link-to}} |
{{#link-to 'adminUsersList.show' 'basic'}}{{value-at-tl report.data level="1"}}{{/link-to}} |
-{{#link-to 'adminUsersList.show' 'regular'}}{{value-at-tl report.data level="2"}}{{/link-to}} |
-{{#link-to 'adminUsersList.show' 'leader'}}{{value-at-tl report.data level="3"}}{{/link-to}} |
-{{#link-to 'adminUsersList.show' 'elder'}}{{value-at-tl report.data level="4"}}{{/link-to}} |
+{{#link-to 'adminUsersList.show' 'member'}}{{value-at-tl report.data level="2"}}{{/link-to}} |
+{{#link-to 'adminUsersList.show' 'regular'}}{{value-at-tl report.data level="3"}}{{/link-to}} |
+{{#link-to 'adminUsersList.show' 'leader'}}{{value-at-tl report.data level="4"}}{{/link-to}} |
diff --git a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
index ca4a74e3fe5..0897d019b08 100644
--- a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
+++ b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
@@ -2,7 +2,7 @@
- {{#link-to 'adminUser' model}} {{model.username}}{{/link-to}}
- - {{#link-to 'adminUsersList.show' 'regular'}}{{i18n 'admin.user.trust_level_2_users'}}{{/link-to}}
+ - {{#link-to 'adminUsersList.show' 'member'}}{{i18n 'admin.user.trust_level_2_users'}}{{/link-to}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 7974d558019..eacc34f2fde 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2303,9 +2303,9 @@ en:
pending: 'Users Pending Review'
newuser: 'Users at Trust Level 0 (New User)'
basic: 'Users at Trust Level 1 (Basic User)'
- regular: 'Users at Trust Level 2 (Member)'
- leader: 'Users at Trust Level 3 (Regular)'
- elder: 'Users at Trust Level 4 (Leader)'
+ member: 'Users at Trust Level 2 (Member)'
+ regular: 'Users at Trust Level 3 (Regular)'
+ leader: 'Users at Trust Level 4 (Leader)'
staff: "Staff"
admins: 'Admin Users'
moderators: 'Moderators'
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index f9f9a6585d7..a5d59872d6e 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -367,11 +367,11 @@ en:
title: "new user"
basic:
title: "basic user"
- regular:
+ member:
title: "member"
- leader:
+ regular:
title: "regular"
- elder:
+ leader:
title: "leader"
change_failed_explanation: "You attempted to demote %{user_name} to '%{new_trust_level}'. However their trust level is already '%{current_trust_level}'. %{user_name} will remain at '%{current_trust_level}' - if you wish to demote user lock trust level first"
diff --git a/lib/trust_level.rb b/lib/trust_level.rb
index a81f5fb3831..a3044bcdd3b 100644
--- a/lib/trust_level.rb
+++ b/lib/trust_level.rb
@@ -14,7 +14,7 @@ class TrustLevel
end
def levels
- @levels ||= Enum.new(:newuser, :basic, :regular, :leader, :elder, start: 0)
+ @levels ||= Enum.new(:newuser, :basic, :member, :regular, :leader, start: 0)
end
def all