From b561ac8cb2b567207f99ac6560bf7e98e567d592 Mon Sep 17 00:00:00 2001
From: Scott Bishel <scott.bishel@mattermost.com>
Date: Thu, 30 May 2024 10:37:15 -0600
Subject: [PATCH] MM-58479 - Revert text changes on channel archive. (#27195)

* revert text changes on channel archive.

* revert channel_store.go

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 .../__snapshots__/channel_details.test.tsx.snap      | 12 ++++++------
 .../channel/details/channel_details.tsx              |  2 +-
 webapp/channels/src/i18n/en.json                     |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/__snapshots__/channel_details.test.tsx.snap b/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/__snapshots__/channel_details.test.tsx.snap
index 31fb1d4a1e..606e53335a 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/__snapshots__/channel_details.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/__snapshots__/channel_details.test.tsx.snap
@@ -78,7 +78,7 @@ exports[`admin_console/team_channel_settings/channel/ChannelDetails should match
         }
         message={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Archiving will remove the team from the user interface but it's contents remain in the database and may still be accessible with the API. Are you sure you wish to save and archive this channel?"
+            defaultMessage="Saving will archive the channel from the team and make it's contents inaccessible for all users. Are you sure you wish to save and archive this channel?"
             id="admin.channel_settings.channel_detail.archive_confirm.message"
           />
         }
@@ -260,7 +260,7 @@ exports[`admin_console/team_channel_settings/channel/ChannelDetails should match
         }
         message={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Archiving will remove the team from the user interface but it's contents remain in the database and may still be accessible with the API. Are you sure you wish to save and archive this channel?"
+            defaultMessage="Saving will archive the channel from the team and make it's contents inaccessible for all users. Are you sure you wish to save and archive this channel?"
             id="admin.channel_settings.channel_detail.archive_confirm.message"
           />
         }
@@ -461,7 +461,7 @@ exports[`admin_console/team_channel_settings/channel/ChannelDetails should match
         }
         message={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Archiving will remove the team from the user interface but it's contents remain in the database and may still be accessible with the API. Are you sure you wish to save and archive this channel?"
+            defaultMessage="Saving will archive the channel from the team and make it's contents inaccessible for all users. Are you sure you wish to save and archive this channel?"
             id="admin.channel_settings.channel_detail.archive_confirm.message"
           />
         }
@@ -595,7 +595,7 @@ exports[`admin_console/team_channel_settings/channel/ChannelDetails should match
         }
         message={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Archiving will remove the team from the user interface but it's contents remain in the database and may still be accessible with the API. Are you sure you wish to save and archive this channel?"
+            defaultMessage="Saving will archive the channel from the team and make it's contents inaccessible for all users. Are you sure you wish to save and archive this channel?"
             id="admin.channel_settings.channel_detail.archive_confirm.message"
           />
         }
@@ -748,7 +748,7 @@ exports[`admin_console/team_channel_settings/channel/ChannelDetails should match
         }
         message={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Archiving will remove the team from the user interface but it's contents remain in the database and may still be accessible with the API. Are you sure you wish to save and archive this channel?"
+            defaultMessage="Saving will archive the channel from the team and make it's contents inaccessible for all users. Are you sure you wish to save and archive this channel?"
             id="admin.channel_settings.channel_detail.archive_confirm.message"
           />
         }
@@ -882,7 +882,7 @@ exports[`admin_console/team_channel_settings/channel/ChannelDetails should match
         }
         message={
           <Memo(MemoizedFormattedMessage)
-            defaultMessage="Archiving will remove the team from the user interface but it's contents remain in the database and may still be accessible with the API. Are you sure you wish to save and archive this channel?"
+            defaultMessage="Saving will archive the channel from the team and make it's contents inaccessible for all users. Are you sure you wish to save and archive this channel?"
             id="admin.channel_settings.channel_detail.archive_confirm.message"
           />
         }
diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_details.tsx b/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_details.tsx
index ea981055f4..dfdf802af0 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_details.tsx
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_details.tsx
@@ -824,7 +824,7 @@ export default class ChannelDetails extends React.PureComponent<ChannelDetailsPr
                             message={
                                 <FormattedMessage
                                     id='admin.channel_settings.channel_detail.archive_confirm.message'
-                                    defaultMessage={'Archiving will remove the team from the user interface but it\'s contents remain in the database and may still be accessible with the API. Are you sure you wish to save and archive this channel?'}
+                                    defaultMessage={'Saving will archive the channel from the team and make it\'s contents inaccessible for all users. Are you sure you wish to save and archive this channel?'}
                                 />
                             }
                             confirmButtonText={
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index aec28d9e20..a169894747 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -445,7 +445,7 @@
   "admin.channel_list.private": "Private",
   "admin.channel_list.public": "Public",
   "admin.channel_settings.channel_detail.archive_confirm.button": "Save and Archive Channel",
-  "admin.channel_settings.channel_detail.archive_confirm.message": "Archiving will remove the team from the user interface but it's contents remain in the database and may still be accessible with the API. Are you sure you wish to save and archive this channel?",
+  "admin.channel_settings.channel_detail.archive_confirm.message": "Saving will archive the channel from the team and make it's contents inaccessible for all users. Are you sure you wish to save and archive this channel?",
   "admin.channel_settings.channel_detail.archive_confirm.title": "Save and Archive Channel",
   "admin.channel_settings.channel_detail.channel_configuration": "Channel Configuration",
   "admin.channel_settings.channel_detail.channelName": "**Name**",