From 8fdc61c72602e0e9530b81626ae11afb350e48db Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 15 Feb 2018 10:45:54 -0500 Subject: [PATCH] Fix failed status messages in message detail view. --- .../ViewControllers/Utils/MessageRecipientStatusUtils.swift | 6 ++++-- Signal/translations/en.lproj/Localizable.strings | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift b/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift index a48e2f1e5..b955b4678 100644 --- a/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift +++ b/Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift @@ -123,8 +123,9 @@ class MessageRecipientStatusUtils: NSObject { } if outgoingMessage.messageState == .unsent { - let statusMessage = NSLocalizedString("MESSAGE_STATUS_FAILED", comment:"message footer for failed messages") - return (status:.failed, shortStatusMessage:statusMessage, longStatusMessage:statusMessage) + let shortStatusMessage = NSLocalizedString("MESSAGE_STATUS_FAILED_SHORT", comment:"status message for failed messages") + let longStatusMessage = NSLocalizedString("MESSAGE_STATUS_FAILED", comment:"message footer for failed messages") + return (status:.failed, shortStatusMessage:shortStatusMessage, longStatusMessage:longStatusMessage) } else if outgoingMessage.messageState == .sentToService || outgoingMessage.wasSent(toRecipient:recipientId) { let statusMessage = @@ -153,6 +154,7 @@ class MessageRecipientStatusUtils: NSObject { switch outgoingMessage.messageState { case .unsent: + // Use the "long" version of this message here. return NSLocalizedString("MESSAGE_STATUS_FAILED", comment:"message footer for failed messages") case .attemptingOut: if outgoingMessage.hasAttachments() { diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 179977f4b..0f6aa32fe 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -991,6 +991,9 @@ /* message footer for failed messages */ "MESSAGE_STATUS_FAILED" = "Sending failed. Tap for info."; +/* status message for failed messages */ +"MESSAGE_STATUS_FAILED_SHORT" = "Failed"; + /* message footer for read messages */ "MESSAGE_STATUS_READ" = "Read";