Fix failed status messages in message detail view.

pull/1/head
Matthew Chen 7 years ago
parent b511d60b3b
commit 8fdc61c726

@ -123,8 +123,9 @@ class MessageRecipientStatusUtils: NSObject {
} }
if outgoingMessage.messageState == .unsent { if outgoingMessage.messageState == .unsent {
let statusMessage = NSLocalizedString("MESSAGE_STATUS_FAILED", comment:"message footer for failed messages") let shortStatusMessage = NSLocalizedString("MESSAGE_STATUS_FAILED_SHORT", comment:"status message for failed messages")
return (status:.failed, shortStatusMessage:statusMessage, longStatusMessage:statusMessage) let longStatusMessage = NSLocalizedString("MESSAGE_STATUS_FAILED", comment:"message footer for failed messages")
return (status:.failed, shortStatusMessage:shortStatusMessage, longStatusMessage:longStatusMessage)
} else if outgoingMessage.messageState == .sentToService || } else if outgoingMessage.messageState == .sentToService ||
outgoingMessage.wasSent(toRecipient:recipientId) { outgoingMessage.wasSent(toRecipient:recipientId) {
let statusMessage = let statusMessage =
@ -153,6 +154,7 @@ class MessageRecipientStatusUtils: NSObject {
switch outgoingMessage.messageState { switch outgoingMessage.messageState {
case .unsent: case .unsent:
// Use the "long" version of this message here.
return NSLocalizedString("MESSAGE_STATUS_FAILED", comment:"message footer for failed messages") return NSLocalizedString("MESSAGE_STATUS_FAILED", comment:"message footer for failed messages")
case .attemptingOut: case .attemptingOut:
if outgoingMessage.hasAttachments() { if outgoingMessage.hasAttachments() {

@ -991,6 +991,9 @@
/* message footer for failed messages */ /* message footer for failed messages */
"MESSAGE_STATUS_FAILED" = "Sending failed. Tap for info."; "MESSAGE_STATUS_FAILED" = "Sending failed. Tap for info.";
/* status message for failed messages */
"MESSAGE_STATUS_FAILED_SHORT" = "Failed";
/* message footer for read messages */ /* message footer for read messages */
"MESSAGE_STATUS_READ" = "Read"; "MESSAGE_STATUS_READ" = "Read";

Loading…
Cancel
Save