github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-31 02:49:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Remove elder from codebase and also update 'regular' to 'member' (#20065)

Browse Source 
A while back the definition of TL was changed but many
areas in the codebase still use the term 'Regular user'
despite it having some implicit meaning (TL2).

See 20140905055251_rename_trust_level_badges.rb
This commit is contained in:
Natalie Tay 2023-01-31 01:41:25 +08:00 committed by GitHub
parent b334f0070d
commit 58234246ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/app/models/user.js
View File

@ -368,9 +368,9 @@ const User = RestModel.extend({
}, },
isBasic: equal("trust_level", 0), isBasic: equal("trust_level", 0),
isLeader: equal("trust_level", 3), isRegular: equal("trust_level", 3),
isElder: equal("trust_level", 4), isLeader: equal("trust_level", 4),
canManageTopic: or("staff", "isElder"), canManageTopic: or("staff", "isLeader"),
@discourseComputed("previous_visit_at") @discourseComputed("previous_visit_at")
previousVisitAt(previous_visit_at) { previousVisitAt(previous_visit_at) {

4
app/assets/javascripts/discourse/tests/fixtures/badges-fixture.js vendored
View File

@ -141,7 +141,7 @@ export default {
}, },
{ {
id: 2, id: 2,
name: "Regular User", name: "Member",
description: null, description: null,
grant_count: 467, grant_count: 467,
allow_title: false, allow_title: false,
@ -170,7 +170,7 @@ export default {
}, },
{ {
id: 4, id: 4,
name: "Elder", name: "Leader",
description: null, description: null,
grant_count: 4, grant_count: 4,
allow_title: true, allow_title: true,

2
app/controllers/composer_controller.rb
View File

@ -102,7 +102,7 @@ class ComposerController < ApplicationController
:not_allowed :not_allowed
end end
# Regular users can see only basic information why the users cannot see the topic. # Non-staff users can see only basic information why the users cannot see the topic.
reason = nil if !guardian.is_staff? && reason != :private && reason != :category reason = nil if !guardian.is_staff? && reason != :private && reason != :category
reason reason

4
config/locales/server.en.yml
View File

@ -2197,9 +2197,9 @@ en:
topic_page_title_includes_category: "Topic page <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>title tag</a> includes the category name." topic_page_title_includes_category: "Topic page <a href='https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title' target='_blank'>title tag</a> includes the category name."
native_app_install_banner_ios: "Displays DiscourseHub app banner on iOS devices to regular users (trust level 1 and up)." native_app_install_banner_ios: "Displays DiscourseHub app banner on iOS devices to basic users (trust level 1) and up."
native_app_install_banner_android: "Displays DiscourseHub app banner on Android devices to regular users (trust level 1 and up)." native_app_install_banner_android: "Displays DiscourseHub app banner on Android devices to basic users (trust level 1) and up."
app_association_android: "Contents of <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a> endpoint, used for Google's Digital Asset Links API." app_association_android: "Contents of <a href='%{base_path}/.well-known/assetlinks.json'>.well-known/assetlinks.json</a> endpoint, used for Google's Digital Asset Links API."
app_association_ios: "Contents of <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a> endpoint, used to create Universal Links between this site and iOS apps." app_association_ios: "Contents of <a href='%{base_path}/apple-app-site-association'>apple-app-site-association</a> endpoint, used to create Universal Links between this site and iOS apps."