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

Merge branch 'charlesmchen/failedStatusMessage'

Browse Source
This commit is contained in:
Matthew Chen 2018-02-15 13:44:38 -05:00
commit efbcdb98fb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Signal/src/ViewControllers/Utils/MessageRecipientStatusUtils.swift
View File

@ -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() {

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

@ -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";