signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'nt/delete-account'

Browse Source
This commit is contained in:
Nora Trapp 2021-03-09 12:36:42 -08:00
commit 08b72a5a53
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Signal/src/ViewControllers/AppSettings/Account/DeleteAccountConfirmationViewController.swift
View File

@ -21,11 +21,6 @@ class DeleteAccountConfirmationViewController: OWSTableViewController2 {
phoneNumberTextField.returnKeyType = .done
phoneNumberTextField.autocorrectionType = .no
phoneNumberTextField.spellCheckingType = .no
phoneNumberTextField.placeholder = ViewControllerUtils.examplePhoneNumber(
forCountryCode: countryCode,
callingCode: callingCode,
includeExampleLabel: false
)
phoneNumberTextField.delegate = self
phoneNumberTextField.accessibilityIdentifier = "phone_number_textfield"
@ -156,6 +151,12 @@ class DeleteAccountConfirmationViewController: OWSTableViewController2 {
phoneNumberTextField.textColor = Theme.primaryTextColor
phoneNumberTextField.font = OWSTableItem.accessoryLabelFont
phoneNumberTextField.placeholder = ViewControllerUtils.examplePhoneNumber(
forCountryCode: countryCode,
callingCode: callingCode,
includeExampleLabel: false
)
phoneNumberTextField.setCompressionResistanceHorizontalHigh()
phoneNumberTextField.setContentHuggingHorizontalHigh()
@ -324,3 +325,4 @@ extension DeleteAccountConfirmationViewController: UITextFieldDelegate {
return false
}
}

4
Signal/translations/en.lproj/Localizable.strings
View File

@ -1091,7 +1091,7 @@
"DELETE_ACCOUNT_CONFIRMATION_DELETE_FAILED" = "Failed to delete account. Make sure that Wi-Fi or mobile data is turned on, then try again.";
/* Description for the 'delete account' confirmation view. */
"DELETE_ACCOUNT_CONFIRMATION_DESCRIPTION" = "This will delete your account info, profile, and all of your messages. You will also be deleted from all Signal groups.";
"DELETE_ACCOUNT_CONFIRMATION_DESCRIPTION" = "This will delete your account info, profile, and all of your messages.";
/* Indicates the work we are doing while deleting the account */
"DELETE_ACCOUNT_CONFIRMATION_IN_PROGRESS" = "Deleting Account...";
@ -1103,7 +1103,7 @@
"DELETE_ACCOUNT_CONFIRMATION_PHONE_NUMBER_TITLE" = "Phone Number";
/* Section header */
"DELETE_ACCOUNT_CONFIRMATION_SECTION_TITLE" = "Enter Your Phone Number";
"DELETE_ACCOUNT_CONFIRMATION_SECTION_TITLE" = "Confirm Your Signal Number";
/* Title for the 'delete account' confirmation view. */
"DELETE_ACCOUNT_CONFIRMATION_TITLE" = "Delete Account";