diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m index 82d2e0983..d815afea6 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m @@ -378,7 +378,6 @@ NS_ASSUME_NONNULL_BEGIN - (CGFloat)dateHeaderHeight { if (self.viewItem.shouldShowDate) { - // Add 5pt spacing above and below the date header. CGFloat textHeight = MAX(self.dateHeaderDateFont.capHeight, self.dateHeaderTimeFont.capHeight); return (CGFloat)ceil(textHeight + self.dateHeaderVSpacing * 2); } else { diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index c7c73a7c5..674cc0466 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1112,9 +1112,6 @@ /* table cell label in conversation settings */ "LIST_GROUP_MEMBERS_ACTION" = "Group Members"; -/* Label for button that loads more messages in conversation view. */ -"load_earlier_messages" = "Load Earlier Messages"; - /* No comment provided by engineer. */ "LOGGING_SECTION" = "Logging"; @@ -1259,12 +1256,12 @@ /* Indicator that separates read from unread messages. */ "MESSAGES_VIEW_UNREAD_INDICATOR" = "New Messages"; -/* Messages that indicates that there are more unseen messages including safety number changes that be revealed by tapping the 'load earlier messages' button. Embeds {{the name of the 'load earlier messages' button}}. */ -"MESSAGES_VIEW_UNREAD_INDICATOR_HAS_MORE_UNSEEN_MESSAGES_AND_SAFETY_NUMBER_CHANGES" = "There are more unread messages (including safety number changes)."; - -/* Messages that indicates that there are more unseen messages that be revealed by tapping the 'load earlier messages' button. Embeds {{the name of the 'load earlier messages' button}} */ +/* Messages that indicates that there are more unseen messages. */ "MESSAGES_VIEW_UNREAD_INDICATOR_HAS_MORE_UNSEEN_MESSAGES" = "There are more unread messages."; +/* Messages that indicates that there are more unseen messages including safety number changes. */ +"MESSAGES_VIEW_UNREAD_INDICATOR_HAS_MORE_UNSEEN_MESSAGES_AND_SAFETY_NUMBER_CHANGES" = "There are more unread messages (including safety number changes)."; + /* notification title */ "MISSED_CALL" = "Missed call";