IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename CRT to Threaded Discussions (#27755)

Browse Source 
Automatic Merge
This commit is contained in:
Maria A Nunez 2024-07-31 10:57:51 -04:00 committed by GitHub
parent 08ed72f060
commit 988939521e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webapp/channels/src/components/admin_console/admin_definition.tsx
View File

@ -2515,7 +2515,7 @@ const AdminDefinition: AdminDefinitionType = {
type: 'bool',
key: 'ServiceSettings.ThreadAutoFollow',
label: defineMessage({id: 'admin.experimental.threadAutoFollow.title', defaultMessage: 'Automatically Follow Threads'}),
help_text: defineMessage({id: 'admin.experimental.threadAutoFollow.desc', defaultMessage: 'This setting must be enabled in order to enable Collapsed Reply Threads. When enabled, threads a user starts, participates in, or is mentioned in are automatically followed. A new `Threads` table is added in the database that tracks threads and thread participants, and a `ThreadMembership` table tracks followed threads for each user and the read or unread state of each followed thread. When false, all backend operations to support Collapsed Reply Threads are disabled.'}),
help_text: defineMessage({id: 'admin.experimental.threadAutoFollow.desc', defaultMessage: 'This setting must be enabled in order to enable Threaded Discussions. When enabled, threads a user starts, participates in, or is mentioned in are automatically followed. A new `Threads` table is added in the database that tracks threads and thread participants, and a `ThreadMembership` table tracks followed threads for each user and the read or unread state of each followed thread. When false, all backend operations to support Threaded Discussions are disabled.'}),
help_text_markdown: true,
isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.EXPERIMENTAL.FEATURES)),
isHidden: it.licensedForFeature('Cloud'),
@ -2523,8 +2523,8 @@ const AdminDefinition: AdminDefinitionType = {
{
type: 'dropdown',
key: 'ServiceSettings.CollapsedThreads',
label: defineMessage({id: 'admin.experimental.collapsedThreads.title', defaultMessage: 'Collapsed Reply Threads'}),
help_text: defineMessage({id: 'admin.experimental.collapsedThreads.desc', defaultMessage: 'When enabled (default off), users must enable collapsed reply threads in Settings. When disabled, users cannot access Collapsed Reply Threads. Please review our <linkKnownIssues>documentation for known issues</linkKnownIssues> and help provide feedback in our <linkCommunityChannel>Community Channel</linkCommunityChannel>.'}),
label: defineMessage({id: 'admin.experimental.collapsedThreads.title', defaultMessage: 'Threaded Discussions'}),
help_text: defineMessage({id: 'admin.experimental.collapsedThreads.desc', defaultMessage: 'When enabled (default off), users must enable Threaded Discussions in Settings. When disabled, users cannot access Threaded Discussions. Please review our <linkKnownIssues>documentation for known issues</linkKnownIssues> and help provide feedback in our <linkCommunityChannel>Community Channel</linkCommunityChannel>.'}),
help_text_values: {
linkKnownIssues: (msg: string) => (
<ExternalLink

28
webapp/channels/src/components/user_settings/display/__snapshots__/user_settings_display.test.tsx.snap
View File

@ -37,7 +37,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapsed_reply_threads"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Collapsed Reply Threads"
defaultMessage="Threaded Discussions"
id="user.settings.display.collapsedReplyThreadsTitle"
/>
}
@ -390,7 +390,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapsed_reply_threads"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Collapsed Reply Threads"
defaultMessage="Threaded Discussions"
id="user.settings.display.collapsedReplyThreadsTitle"
/>
}
@ -743,7 +743,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapsed_reply_threads"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Collapsed Reply Threads"
defaultMessage="Threaded Discussions"
id="user.settings.display.collapsedReplyThreadsTitle"
/>
}
@ -1096,7 +1096,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapsed_reply_threads"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Collapsed Reply Threads"
defaultMessage="Threaded Discussions"
id="user.settings.display.collapsedReplyThreadsTitle"
/>
}
@ -1449,7 +1449,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapsed_reply_threads"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Collapsed Reply Threads"
defaultMessage="Threaded Discussions"
id="user.settings.display.collapsedReplyThreadsTitle"
/>
}
@ -1729,7 +1729,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapsed_reply_threads"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Collapsed Reply Threads"
defaultMessage="Threaded Discussions"
id="user.settings.display.collapsedReplyThreadsTitle"
/>
}
@ -1991,7 +1991,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapsed_reply_threads"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Collapsed Reply Threads"
defaultMessage="Threaded Discussions"
id="user.settings.display.collapsedReplyThreadsTitle"
/>
}
@ -2344,7 +2344,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapsed_reply_threads"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Collapsed Reply Threads"
defaultMessage="Threaded Discussions"
id="user.settings.display.collapsedReplyThreadsTitle"
/>
}
@ -2715,7 +2715,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapsed_reply_threads"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Collapsed Reply Threads"
defaultMessage="Threaded Discussions"
id="user.settings.display.collapsedReplyThreadsTitle"
/>
}
@ -2995,7 +2995,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapsed_reply_threads"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Collapsed Reply Threads"
defaultMessage="Threaded Discussions"
id="user.settings.display.collapsedReplyThreadsTitle"
/>
}
@ -3275,7 +3275,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapsed_reply_threads"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Collapsed Reply Threads"
defaultMessage="Threaded Discussions"
id="user.settings.display.collapsedReplyThreadsTitle"
/>
}
@ -3568,7 +3568,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapsed_reply_threads"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Collapsed Reply Threads"
defaultMessage="Threaded Discussions"
id="user.settings.display.collapsedReplyThreadsTitle"
/>
}
@ -3848,7 +3848,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
section="collapsed_reply_threads"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Collapsed Reply Threads"
defaultMessage="Threaded Discussions"
id="user.settings.display.collapsedReplyThreadsTitle"
/>
}
@ -4128,7 +4128,7 @@ exports[`components/user_settings/display/UserSettingsDisplay should not show la
section="collapsed_reply_threads"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="Collapsed Reply Threads"
defaultMessage="Threaded Discussions"
id="user.settings.display.collapsedReplyThreadsTitle"
/>
}

2
webapp/channels/src/components/user_settings/display/user_settings_display.tsx
View File

@ -968,7 +968,7 @@ export default class UserSettingsDisplay extends React.PureComponent<Props, Stat
defaultDisplay: Preferences.COLLAPSED_REPLY_THREADS_FALLBACK_DEFAULT,
title: defineMessage({
id: 'user.settings.display.collapsedReplyThreadsTitle',
defaultMessage: 'Collapsed Reply Threads',
defaultMessage: 'Threaded Discussions',
}),
firstOption: {
value: Preferences.COLLAPSED_REPLY_THREADS_ON,

8
webapp/channels/src/i18n/en.json
View File

@ -897,9 +897,9 @@
"admin.experimental.collapsedThreads.always_on": "Always On",
"admin.experimental.collapsedThreads.default_off": "Enabled (Default Off)",
"admin.experimental.collapsedThreads.default_on": "Enabled (Default On)",
"admin.experimental.collapsedThreads.desc": "When enabled (default off), users have the option to enable Collapsed Reply Threads in Account Settings. When enabled (default on), users see Collapsed Reply Threads by default and have the option to disable it in Account Settings. When always on, users are required to use Collapsed Reply Threads and cannot disable it.",
"admin.experimental.collapsedThreads.desc": "When enabled (default off), users have the option to enable Threaded Discussions in Account Settings. When enabled (default on), users see Threaded Discussions by default and have the option to disable it in Account Settings. When always on, users are required to use Threaded Discussions and cannot disable it.",
"admin.experimental.collapsedThreads.off": "Disabled",
"admin.experimental.collapsedThreads.title": "Collapsed Reply Threads",
"admin.experimental.collapsedThreads.title": "Threaded Discussions",
"admin.experimental.defaultTheme.desc": "Set a default theme that applies to all new users on the system.",
"admin.experimental.defaultTheme.options.denim": "Denim",
"admin.experimental.defaultTheme.options.indigo": "Indigo",
@ -980,7 +980,7 @@
"admin.experimental.samlSettingsLoginButtonColor.title": "SAML Login Button Color:",
"admin.experimental.samlSettingsLoginButtonTextColor.desc": "Specify the color of the SAML login button text for white labeling purposes. Use a hex code with a #-sign before the code. This setting only applies to the mobile apps.",
"admin.experimental.samlSettingsLoginButtonTextColor.title": "SAML login Button Text Color:",
"admin.experimental.threadAutoFollow.desc": "This setting must be enabled in order to enable Collapsed Reply Threads. When enabled, threads a user starts, participates in, or is mentioned in are automatically followed. A new `Threads` table is added in the database that tracks threads and thread participants, and a `ThreadMembership` table tracks followed threads for each user and the read or unread state of each followed thread. When false, all backend operations to support Collapsed Reply Threads are disabled.",
"admin.experimental.threadAutoFollow.desc": "This setting must be enabled in order to enable Threaded Discussions. When enabled, threads a user starts, participates in, or is mentioned in are automatically followed. A new `Threads` table is added in the database that tracks threads and thread participants, and a `ThreadMembership` table tracks followed threads for each user and the read or unread state of each followed thread. When false, all backend operations to support Threaded Discussions are disabled.",
"admin.experimental.threadAutoFollow.title": "Automatically Follow Threads",
"admin.experimental.timeBetweenUserTypingUpdatesMilliseconds.desc": "The number of milliseconds to wait between emitting user typing websocket events.",
"admin.experimental.timeBetweenUserTypingUpdatesMilliseconds.example": "E.g.: \"5000\"",
@ -5379,7 +5379,7 @@
"user.settings.display.collapsedReplyThreadsDescription": "When enabled, reply messages are not shown in the channel and you'll be notified about threads you're following in the \"Threads\" view.",
"user.settings.display.collapsedReplyThreadsOff": "Off",
"user.settings.display.collapsedReplyThreadsOn": "On",
"user.settings.display.collapsedReplyThreadsTitle": "Collapsed Reply Threads",
"user.settings.display.collapsedReplyThreadsTitle": "Threaded Discussions",
"user.settings.display.collapseOff": "Collapsed",
"user.settings.display.collapseOn": "Expanded",
"user.settings.display.colorize": "Colorize usernames",