From 4ee4cd0c4e4a6668f867d8ad9fdf0ea07e9a9843 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 17 Sep 2021 16:00:01 -0300 Subject: [PATCH] Tweak the label for quoted photos. --- .../ConversationView/Cells/OWSQuotedMessageView.m | 2 +- .../ConversationView/Cells/QuotedMessageView.swift | 6 +++--- Signal/translations/en.lproj/Localizable.strings | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m index 0c062d4e27..d1e5905245 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m @@ -510,7 +510,7 @@ const CGFloat kRemotelySourcedContentRowSpacing = 3; @"QUOTED_REPLY_TYPE_VIDEO", @"Indicates this message is a quoted reply to a video file."); } else if ([MIMETypeUtil isImage:contentType]) { return NSLocalizedString( - @"QUOTED_REPLY_TYPE_IMAGE", @"Indicates this message is a quoted reply to an image file."); + @"QUOTED_REPLY_TYPE_PHOTO", @"Indicates this message is a quoted reply to a photo file."); } return nil; } diff --git a/Signal/src/ViewControllers/ConversationView/Cells/QuotedMessageView.swift b/Signal/src/ViewControllers/ConversationView/Cells/QuotedMessageView.swift index 1429d18678..78733eacd1 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/QuotedMessageView.swift +++ b/Signal/src/ViewControllers/ConversationView/Cells/QuotedMessageView.swift @@ -289,9 +289,6 @@ public class QuotedMessageView: ManualStackViewWithLayer { } else if MIMETypeUtil.isVideo(contentType) { return NSLocalizedString("QUOTED_REPLY_TYPE_VIDEO", comment: "Indicates this message is a quoted reply to a video file.") - } else if MIMETypeUtil.isImage(contentType) { - return NSLocalizedString("QUOTED_REPLY_TYPE_IMAGE", - comment: "Indicates this message is a quoted reply to an image file.") } else if MIMETypeUtil.isAnimated(contentType) { if contentType.caseInsensitiveCompare(OWSMimeTypeImageGif) == .orderedSame { return NSLocalizedString("QUOTED_REPLY_TYPE_GIF", @@ -300,6 +297,9 @@ public class QuotedMessageView: ManualStackViewWithLayer { return NSLocalizedString("QUOTED_REPLY_TYPE_IMAGE", comment: "Indicates this message is a quoted reply to an image file.") } + } else if MIMETypeUtil.isImage(contentType) { + return NSLocalizedString("QUOTED_REPLY_TYPE_PHOTO", + comment: "Indicates this message is a quoted reply to a photo file.") } return nil } diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 48ff2b0e8f..c6eb278482 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -4465,6 +4465,9 @@ /* Indicates this message is a quoted reply to an image file. */ "QUOTED_REPLY_TYPE_IMAGE" = "Image"; +/* Indicates this message is a quoted reply to a photo file. */ +"QUOTED_REPLY_TYPE_PHOTO" = "Photo"; + /* Indicates this message is a quoted reply to a video file. */ "QUOTED_REPLY_TYPE_VIDEO" = "Video";