From 821a304fa331c21395de30b600461196ffc3448c Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 4 Feb 2025 16:37:37 +1100 Subject: [PATCH] chore: add strings for recreating group, but will be overriden --- _locales/en/messages.json | 8 +++++++- ts/components/conversation/SessionConversation.tsx | 6 ++++-- ts/components/conversation/header/ConversationHeader.tsx | 6 +++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index fcc19bfd7..6d128540a 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -481,6 +481,11 @@ "learnMore": "Learn More", "leave": "Leave", "leaving": "Leaving...", + "legacyGroupAfterDeprecationAdmin": "This group is now read-only. Recreate this group to keep chatting.", + "legacyGroupAfterDeprecationMember": "This group is now read-only. Ask the group admin to recreate this group to keep chatting.", + "legacyGroupBeforeDeprecationAdmin": "Groups have been upgraded! Recreate this group for improved reliability. This group will become read-only on {date}.", + "legacyGroupBeforeDeprecationMember": "Groups have been upgraded! Ask the group admin to recreate this group for improved reliability. This group will become read-only on {date}.", + "legacyGroupChatHistory": "Chat history will not be transferred to the new group. You can still view all chat history in your old group.", "legacyGroupMemberNew": "{name} joined the group.", "legacyGroupMemberNewMultiple": "{name} and {count} others joined the group.", "legacyGroupMemberNewYouMultiple": "You and {count} others joined the group.", @@ -724,6 +729,7 @@ "recoveryPasswordRestoreDescription": "Enter your recovery password to load your account. If you haven't saved it, you can find it in your app settings.", "recoveryPasswordView": "View Password", "recoveryPasswordWarningSendDescription": "This is your recovery password. If you send it to someone they'll have full access to your account.", + "recreateGroup": "Recreate Group", "redo": "Redo", "remove": "Remove", "removePasswordFail": "Failed to remove password", @@ -773,6 +779,7 @@ "shareAccountIdDescription": "Invite your friend to chat with you on {app_name} by sharing your Account ID with them.", "shareAccountIdDescriptionCopied": "Share with your friends wherever you usually speak with them — then move the conversation here.", "shareExtensionDatabaseError": "There is an issue opening the database. Please restart the app and try again.", + "shareExtensionNoAccountError": "Oops! Looks like you don't have a {app_name} account yet.

You'll need to create one in the {app_name} app before you can share.", "shareToSession": "Share to {app_name}", "show": "Show", "showAll": "Show All", @@ -814,4 +821,3 @@ "yes": "Yes", "you": "You" } - diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx index eecbcd9d2..5063e703f 100644 --- a/ts/components/conversation/SessionConversation.tsx +++ b/ts/components/conversation/SessionConversation.tsx @@ -678,9 +678,11 @@ function OutdatedLegacyGroupBanner() { // FIXME change the date here. Remove after QA const text = deprecatedLegacyGroups ? localize( - weAreAdmin ? 'groupLegacyBannerAdminDeprecated' : 'groupLegacyBannerMemberDeprecated' + weAreAdmin ? 'legacyGroupAfterDeprecationAdmin' : 'legacyGroupAfterDeprecationMember' ).toString() - : localize(weAreAdmin ? 'groupLegacyBannerAdmin' : 'groupLegacyBannerMember') + : localize( + weAreAdmin ? 'legacyGroupBeforeDeprecationAdmin' : 'legacyGroupBeforeDeprecationMember' + ) .withArgs({ date: '[Date]' }) .toString(); diff --git a/ts/components/conversation/header/ConversationHeader.tsx b/ts/components/conversation/header/ConversationHeader.tsx index ec90a9a61..d8f5a3eae 100644 --- a/ts/components/conversation/header/ConversationHeader.tsx +++ b/ts/components/conversation/header/ConversationHeader.tsx @@ -91,8 +91,8 @@ function useShowRecreateModal() { (name: string, members: Array) => { dispatch( updateConfirmModal({ - title: localize('groupRecreate').toString(), - i18nMessage: { token: 'groupRecreateDescription' }, + title: localize('recreateGroup').toString(), + i18nMessage: { token: 'legacyGroupChatHistory' }, okText: localize('theContinue').toString(), cancelText: localize('cancel').toString(), okTheme: SessionButtonColor.Danger, @@ -135,7 +135,7 @@ function RecreateGroupButton() { showRecreateGroupModal(name || 'Unknown group name', members); }} > - {localize('groupRecreate').toString()} + {localize('recreateGroup').toString()} );