From 667725b800f67310c21986be8b926b43fb538b8c Mon Sep 17 00:00:00 2001 From: Doug Date: Fri, 15 Jul 2022 10:36:09 +0100 Subject: [PATCH 1/3] Reword account deactivation button in Settings. --- Riot/Assets/en.lproj/Vector.strings | 2 +- Riot/Generated/Strings.swift | 2 +- Riot/Modules/Settings/SettingsViewController.m | 2 +- changelog.d/6436.change | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 changelog.d/6436.change diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings index a32d1b96f..4a7265825 100644 --- a/Riot/Assets/en.lproj/Vector.strings +++ b/Riot/Assets/en.lproj/Vector.strings @@ -706,7 +706,7 @@ Tap the + to start adding people."; "settings_crypto_export" = "Export keys"; "settings_crypto_blacklist_unverified_devices" = "Encrypt to verified sessions only"; -"settings_deactivate_my_account" = "Deactivate my account"; +"settings_deactivate_my_account" = "Permanently deactivate my account"; "settings_key_backup_info" = "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages."; "settings_key_backup_info_checking" = "Checking…"; diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift index f90273a30..fd273b17a 100644 --- a/Riot/Generated/Strings.swift +++ b/Riot/Generated/Strings.swift @@ -6647,7 +6647,7 @@ public class VectorL10n: NSObject { public static var settingsDeactivateAccount: String { return VectorL10n.tr("Vector", "settings_deactivate_account") } - /// Deactivate my account + /// Permanently deactivate my account public static var settingsDeactivateMyAccount: String { return VectorL10n.tr("Vector", "settings_deactivate_my_account") } diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m index b26daf997..67c346cf3 100644 --- a/Riot/Modules/Settings/SettingsViewController.m +++ b/Riot/Modules/Settings/SettingsViewController.m @@ -617,7 +617,7 @@ ChangePasswordCoordinatorBridgePresenterDelegate> { Section *sectionDeactivate = [Section sectionWithTag:SECTION_TAG_DEACTIVATE_ACCOUNT]; [sectionDeactivate addRowWithTag:0]; - sectionDeactivate.headerTitle = [VectorL10n settingsDeactivateMyAccount]; + sectionDeactivate.headerTitle = [VectorL10n settingsDeactivateAccount]; [tmpSections addObject:sectionDeactivate]; } diff --git a/changelog.d/6436.change b/changelog.d/6436.change new file mode 100644 index 000000000..da80e46b3 --- /dev/null +++ b/changelog.d/6436.change @@ -0,0 +1 @@ +Reword account deactivation button on the Settings screen. From 809b341cb9d026f343ef6c75354c5e4fc2be50e8 Mon Sep 17 00:00:00 2001 From: Doug Date: Fri, 15 Jul 2022 11:19:32 +0100 Subject: [PATCH 2/3] Update string. --- Riot/Assets/en.lproj/Vector.strings | 2 +- Riot/Generated/Strings.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings index 4a7265825..1a5e69c89 100644 --- a/Riot/Assets/en.lproj/Vector.strings +++ b/Riot/Assets/en.lproj/Vector.strings @@ -706,7 +706,7 @@ Tap the + to start adding people."; "settings_crypto_export" = "Export keys"; "settings_crypto_blacklist_unverified_devices" = "Encrypt to verified sessions only"; -"settings_deactivate_my_account" = "Permanently deactivate my account"; +"settings_deactivate_my_account" = "Deactivate account permanently"; "settings_key_backup_info" = "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages."; "settings_key_backup_info_checking" = "Checking…"; diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift index fd273b17a..7237b9a4d 100644 --- a/Riot/Generated/Strings.swift +++ b/Riot/Generated/Strings.swift @@ -6647,7 +6647,7 @@ public class VectorL10n: NSObject { public static var settingsDeactivateAccount: String { return VectorL10n.tr("Vector", "settings_deactivate_account") } - /// Permanently deactivate my account + /// Deactivate account permanently public static var settingsDeactivateMyAccount: String { return VectorL10n.tr("Vector", "settings_deactivate_my_account") } From 1675cd3fc94b90a848153188388b856dfb159fc6 Mon Sep 17 00:00:00 2001 From: Doug Date: Fri, 15 Jul 2022 13:03:16 +0100 Subject: [PATCH 3/3] version++ --- CHANGES.md | 7 +++++++ Config/AppVersion.xcconfig | 4 ++-- changelog.d/6436.change | 1 - 3 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 changelog.d/6436.change diff --git a/CHANGES.md b/CHANGES.md index 01f388d69..d8d1a5abf 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,10 @@ +## Changes in 1.8.23 (2022-07-15) + +🙌 Improvements + +- Reword account deactivation button on the Settings screen. ([#6436](https://github.com/vector-im/element-ios/issues/6436)) + + ## Changes in 1.8.22 (2022-07-13) 🙌 Improvements diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index e1894029b..35bf08ea9 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 1.8.22 -CURRENT_PROJECT_VERSION = 1.8.22 +MARKETING_VERSION = 1.8.23 +CURRENT_PROJECT_VERSION = 1.8.23 diff --git a/changelog.d/6436.change b/changelog.d/6436.change deleted file mode 100644 index da80e46b3..000000000 --- a/changelog.d/6436.change +++ /dev/null @@ -1 +0,0 @@ -Reword account deactivation button on the Settings screen.