From c71e9c88f5583ef5748edfdffcf682cd6a94bc8d Mon Sep 17 00:00:00 2001 From: Virgile Date: Tue, 10 Dec 2024 12:53:28 +0100 Subject: [PATCH 1/3] chore: address copy review for group deletion --- src/i18n/en-US.json | 6 +++--- src/script/view_model/ActionsViewModel.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json index f822f721ded..ed69a3480c5 100644 --- a/src/i18n/en-US.json +++ b/src/i18n/en-US.json @@ -1061,9 +1061,9 @@ "modalConversationOptionsToggleServiceMessage": "Could not change services state.", "modalConversationRemoveAction": "Remove", "modalConversationRemoveCloseBtn": "Close window 'Remove'", - "modalConversationRemoveGroupAction": "Remove", - "modalConversationRemoveGroupHeadline": "Remove group conversation?", - "modalConversationRemoveGroupMessage": "This will delete the group on this device. There is no option to restore the content.", + "modalConversationRemoveGroupAction": "Delete for me", + "modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?", + "modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.", "modalConversationRemoveGuestsHeadline": "Disable guest access?", "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.", "modalConversationRemoveGuestsOrServicesAction": "Disable", diff --git a/src/script/view_model/ActionsViewModel.ts b/src/script/view_model/ActionsViewModel.ts index 902bf8ad127..b488d0cf1a0 100644 --- a/src/script/view_model/ActionsViewModel.ts +++ b/src/script/view_model/ActionsViewModel.ts @@ -327,7 +327,7 @@ export class ActionsViewModel { }, text: { message: t('modalConversationRemoveGroupMessage'), - title: t('modalConversationRemoveGroupHeadline'), + title: t('modalConversationRemoveGroupHeadline', {conversation: conversationEntity.display_name()}), }, }); }; From 4d15dc0f82f0b73f7ba719deebb902896fa3befc Mon Sep 17 00:00:00 2001 From: Virgile Date: Tue, 10 Dec 2024 12:54:19 +0100 Subject: [PATCH 2/3] push localization string types --- src/types/i18n.d.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/types/i18n.d.ts b/src/types/i18n.d.ts index d623c30a802..fd05b543791 100644 --- a/src/types/i18n.d.ts +++ b/src/types/i18n.d.ts @@ -1065,9 +1065,9 @@ declare module 'I18n/en-US.json' { 'modalConversationOptionsToggleServiceMessage': `Could not change services state.`; 'modalConversationRemoveAction': `Remove`; 'modalConversationRemoveCloseBtn': `Close window \'Remove\'`; - 'modalConversationRemoveGroupAction': `Remove`; - 'modalConversationRemoveGroupHeadline': `Remove group conversation?`; - 'modalConversationRemoveGroupMessage': `This will delete the group on this device. There is no option to restore the content.`; + 'modalConversationRemoveGroupAction': `Delete for me`; + 'modalConversationRemoveGroupHeadline': `Delete {conversation} group for me?`; + 'modalConversationRemoveGroupMessage': `You won’t be able to access the group and its content. There is no option to restore it.`; 'modalConversationRemoveGuestsHeadline': `Disable guest access?`; 'modalConversationRemoveGuestsMessage': `Current guests will be removed from the conversation. New guests will not be allowed.`; 'modalConversationRemoveGuestsOrServicesAction': `Disable`; @@ -1512,7 +1512,7 @@ declare module 'I18n/en-US.json' { 'teamCreationSuccessListItem1': `Invite your first team members, and start working together`; 'teamCreationSuccessListItem2': `Customize your team settings`; 'teamCreationSuccessListTitle': `Go to Team Management to:`; - 'teamCreationSuccessSubTitle': `You’re now the owner of the team ({teamName}).`; + 'teamCreationSuccessSubTitle': `You’re now the owner of the team {teamName}.`; 'teamCreationSuccessTitle': `Congratulations {name}!`; 'teamCreationTitle': `Create your team`; 'teamName.headline': `Name your team`; @@ -1607,18 +1607,18 @@ declare module 'I18n/en-US.json' { 'videoCallOverlayMicrophone': `Microphone`; 'videoCallOverlayOpenFullScreen': `Open the call in full screen`; 'videoCallOverlayOpenPopupWindow': `Open in a new window`; - 'videoCallOverlayParticipantsRaisedHandListLabel': `Hand raised ({count})`; 'videoCallOverlayParticipantsListLabel': `Participants ({count})`; - 'videoCallParticipantRaisedTheirHandUp': `{name} has raised their hand up`; - 'videoCallParticipantRaisedSortByTime': `Person waiting the longest is on the top of the list.`; - 'videoCallParticipantRaisedHandRaiseDuration': `Hand raised for {duration}`; - 'videoCallParticipantRaisedSelfHandUp': `You have raised your hand up`; + 'videoCallOverlayParticipantsRaisedHandListLabel': `Raised hands ({count})`; 'videoCallOverlayShareScreen': `Share Screen`; 'videoCallOverlayShowParticipantsList': `Show participants list`; 'videoCallOverlayViewModeAll': `Show all participants`; 'videoCallOverlayViewModeLabel': `View mode`; 'videoCallOverlayViewModeSpeakers': `Show active speakers only`; 'videoCallParticipantConnecting': `Connecting...`; + 'videoCallParticipantRaisedHandRaiseDuration': `Hand raised for {duration}`; + 'videoCallParticipantRaisedSelfHandUp': `You have raised your hand up`; + 'videoCallParticipantRaisedSortByTime': `Top in the list raised their hand first.`; + 'videoCallParticipantRaisedTheirHandUp': `{name} has raised their hand up`; 'videoCallPaused': `Video paused`; 'videoCallScreenShareEndConfirm': `End screen share`; 'videoCallScreenShareEndConfirmDescription': `If you minimize the window, your screen share will end.`; From ed406ac3256afe64017b1629e295137369f246cd Mon Sep 17 00:00:00 2001 From: Virgile Date: Tue, 10 Dec 2024 13:06:05 +0100 Subject: [PATCH 3/3] capitalize Me --- src/i18n/en-US.json | 2 +- src/types/i18n.d.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json index ed69a3480c5..49728de7441 100644 --- a/src/i18n/en-US.json +++ b/src/i18n/en-US.json @@ -1061,7 +1061,7 @@ "modalConversationOptionsToggleServiceMessage": "Could not change services state.", "modalConversationRemoveAction": "Remove", "modalConversationRemoveCloseBtn": "Close window 'Remove'", - "modalConversationRemoveGroupAction": "Delete for me", + "modalConversationRemoveGroupAction": "Delete for Me", "modalConversationRemoveGroupHeadline": "Delete {conversation} group for me?", "modalConversationRemoveGroupMessage": "You won’t be able to access the group and its content. There is no option to restore it.", "modalConversationRemoveGuestsHeadline": "Disable guest access?", diff --git a/src/types/i18n.d.ts b/src/types/i18n.d.ts index fd05b543791..fc1304e9e4b 100644 --- a/src/types/i18n.d.ts +++ b/src/types/i18n.d.ts @@ -1065,7 +1065,7 @@ declare module 'I18n/en-US.json' { 'modalConversationOptionsToggleServiceMessage': `Could not change services state.`; 'modalConversationRemoveAction': `Remove`; 'modalConversationRemoveCloseBtn': `Close window \'Remove\'`; - 'modalConversationRemoveGroupAction': `Delete for me`; + 'modalConversationRemoveGroupAction': `Delete for Me`; 'modalConversationRemoveGroupHeadline': `Delete {conversation} group for me?`; 'modalConversationRemoveGroupMessage': `You won’t be able to access the group and its content. There is no option to restore it.`; 'modalConversationRemoveGuestsHeadline': `Disable guest access?`;