letro/letro-ios
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases 2 Wiki Activity

Update the Deactivate Account strings (and icon) to call it Delete Account. (#5458)

Browse Source 
Use the new strings and icon.

Snapshots have already been updated.
This commit is contained in:
Doug
2026-04-21 15:50:27 +01:00
committed by GitHub
parent 1cf700646f
commit 2284719c52
6 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ElementX/Resources/Localizations/en-US.lproj/Localizable.strings
View File

@@ -76,10 +76,12 @@
"action_create" = "Create";
"action_create_room" = "Create room";
"action_create_space" = "Create space";
"action_deactivate" = "Delete";
"action_deactivate_account" = "Delete account";
"action_deactivate" = "Deactivate";
"action_deactivate_account" = "Deactivate account";
"action_decline" = "Decline";
"action_decline_and_block" = "Decline and block";
"action_delete" = "Delete";
"action_delete_account" = "Delete account";
"action_delete_poll" = "Delete Poll";
"action_deselect_all" = "Deselect all";
"action_disable" = "Disable";

6
ElementX/Resources/Localizations/en.lproj/Localizable.strings
View File

@@ -76,10 +76,12 @@
"action_create" = "Create";
"action_create_room" = "Create room";
"action_create_space" = "Create space";
"action_deactivate" = "Delete";
"action_deactivate_account" = "Delete account";
"action_deactivate" = "Deactivate";
"action_deactivate_account" = "Deactivate account";
"action_decline" = "Decline";
"action_decline_and_block" = "Decline and block";
"action_delete" = "Delete";
"action_delete_account" = "Delete account";
"action_delete_poll" = "Delete Poll";
"action_deselect_all" = "Deselect all";
"action_disable" = "Disable";

8
ElementX/Sources/Generated/Strings.swift
View File

@@ -186,14 +186,18 @@ internal enum L10n {
internal static var actionCreateRoom: String { return L10n.tr("Localizable", "action_create_room") }
/// Create space
internal static var actionCreateSpace: String { return L10n.tr("Localizable", "action_create_space") }
/// Delete
/// Deactivate
internal static var actionDeactivate: String { return L10n.tr("Localizable", "action_deactivate") }
/// Delete account
/// Deactivate account
internal static var actionDeactivateAccount: String { return L10n.tr("Localizable", "action_deactivate_account") }
/// Decline
internal static var actionDecline: String { return L10n.tr("Localizable", "action_decline") }
/// Decline and block
internal static var actionDeclineAndBlock: String { return L10n.tr("Localizable", "action_decline_and_block") }
/// Delete
internal static var actionDelete: String { return L10n.tr("Localizable", "action_delete") }
/// Delete account
internal static var actionDeleteAccount: String { return L10n.tr("Localizable", "action_delete_account") }
/// Delete Poll
internal static var actionDeletePoll: String { return L10n.tr("Localizable", "action_delete_poll") }
/// Deselect all

2
ElementX/Sources/Screens/Settings/DeactivateAccountScreen/DeactivateAccountScreenViewModel.swift
View File

@@ -44,7 +44,7 @@ class DeactivateAccountScreenViewModel: DeactivateAccountScreenViewModelType, De
state.bindings.alertInfo = .init(id: .confirmation,
title: L10n.screenDeactivateAccountTitle,
message: L10n.screenDeactivateAccountConfirmationDialogContent,
primaryButton: .init(title: L10n.actionDeactivate) {
primaryButton: .init(title: L10n.actionDelete) {
Task { await self.deactivateAccount() }
},
secondaryButton: .init(title: L10n.actionCancel, role: .cancel, action: nil))

2
ElementX/Sources/Screens/Settings/DeactivateAccountScreen/View/DeactivateAccountScreen.swift
View File

@@ -20,7 +20,7 @@ struct DeactivateAccountScreen: View {
}
.compoundList()
.safeAreaInset(edge: .bottom) {
Button(L10n.actionDeactivateAccount, role: .destructive) {
Button(L10n.actionDeleteAccount, role: .destructive) {
context.send(viewAction: .deactivate)
}
.buttonStyle(.compound(.primary))

4
ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift
View File

@@ -190,8 +190,8 @@ struct SettingsScreen: View {
.accessibilityIdentifier(A11yIdentifiers.settingsScreen.logout)
if context.viewState.showAccountDeactivation {
ListRow(label: .action(title: L10n.actionDeactivateAccount,
icon: \.warning,
ListRow(label: .action(title: L10n.actionDeleteAccount,
icon: \.delete,
role: .destructive),
kind: .navigationLink {
context.send(viewAction: .deactivateAccount)