Merge branch 'charlesmchen/unlinkDeviceName' into release/2.34.0

pull/1/head
Matthew Chen 6 years ago
commit 4f0c26d5c7

@ -386,7 +386,7 @@ int const OWSLinkedDevicesTableViewControllerSectionAddDevice = 1;
{ {
NSString *confirmationTitleFormat NSString *confirmationTitleFormat
= NSLocalizedString(@"UNLINK_CONFIRMATION_ALERT_TITLE", @"Alert title for confirming device deletion"); = NSLocalizedString(@"UNLINK_CONFIRMATION_ALERT_TITLE", @"Alert title for confirming device deletion");
NSString *confirmationTitle = [NSString stringWithFormat:confirmationTitleFormat, device.name]; NSString *confirmationTitle = [NSString stringWithFormat:confirmationTitleFormat, device.displayName];
NSString *confirmationMessage NSString *confirmationMessage
= NSLocalizedString(@"UNLINK_CONFIRMATION_ALERT_BODY", @"Alert message to confirm unlinking a device"); = NSLocalizedString(@"UNLINK_CONFIRMATION_ALERT_BODY", @"Alert message to confirm unlinking a device");
UIAlertController *alertController = [UIAlertController alertControllerWithTitle:confirmationTitle UIAlertController *alertController = [UIAlertController alertControllerWithTitle:confirmationTitle

Loading…
Cancel
Save