From 1efe1aa9bb2e656ecdcf457e2d1b554e4d329d0c Mon Sep 17 00:00:00 2001 From: "cursor[bot]" <206951365+cursor[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2026 22:54:34 +0200 Subject: [PATCH] Fix inaccurate "Max Users Per Team" description in System Console (#37256) * Fix Max Users Per Team description to reflect active-only enforcement The System Console description for TeamSettings.MaxUsersPerTeam incorrectly stated that inactive users count toward the limit. Enforcement only counts active team members with active user accounts, so update the help text to match actual behavior. Co-authored-by: mattermost-code * Simplify Max Users Per Team description per review feedback Update help text to remove mention of removed members, per hanzei's review suggestion. Co-authored-by: mattermost-code --------- Co-authored-by: Cursor Agent Co-authored-by: mattermost-code --- .../channels/src/components/admin_console/admin_definition.tsx | 2 +- webapp/channels/src/i18n/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/channels/src/components/admin_console/admin_definition.tsx b/webapp/channels/src/components/admin_console/admin_definition.tsx index 93a5581713c..c6654d73e11 100644 --- a/webapp/channels/src/components/admin_console/admin_definition.tsx +++ b/webapp/channels/src/components/admin_console/admin_definition.tsx @@ -3123,7 +3123,7 @@ const AdminDefinition: AdminDefinitionType = { type: 'number', key: 'TeamSettings.MaxUsersPerTeam', label: defineMessage({id: 'admin.team.maxUsersTitle', defaultMessage: 'Max Users Per Team:'}), - help_text: defineMessage({id: 'admin.team.maxUsersDescription', defaultMessage: 'Maximum total number of users per team, including both active and inactive users.'}), + help_text: defineMessage({id: 'admin.team.maxUsersDescription', defaultMessage: 'Maximum number of active users per team. Deactivated users are not counted toward this limit.'}), placeholder: defineMessage({id: 'admin.team.maxUsersExample', defaultMessage: 'E.g.: "25"'}), isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.SITE.USERS_AND_TEAMS)), }, diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json index ddc75c5f8be..09bd06180ee 100644 --- a/webapp/channels/src/i18n/en.json +++ b/webapp/channels/src/i18n/en.json @@ -3605,7 +3605,7 @@ "admin.team.maxNotificationsPerChannelDescription": "The maximum number of users that can be mentioned using @here, @all, or @channel. Above this limit, mentions and typing indicators are disabled, and users will see a system message if they try to use them.", "admin.team.maxNotificationsPerChannelExample": "E.g.: \"1000\"", "admin.team.maxNotificationsPerChannelTitle": "Large Channel Notification Threshold:", - "admin.team.maxUsersDescription": "Maximum total number of users per team, including both active and inactive users.", + "admin.team.maxUsersDescription": "Maximum number of active users per team. Deactivated users are not counted toward this limit.", "admin.team.maxUsersExample": "E.g.: \"25\"", "admin.team.maxUsersTitle": "Max Users Per Team:", "admin.team.noBrandImage": "No brand image uploaded",