diff --git a/Signal/src/util/DateUtil.h b/Signal/src/util/DateUtil.h index 768a5c67f..2deebe48d 100644 --- a/Signal/src/util/DateUtil.h +++ b/Signal/src/util/DateUtil.h @@ -5,7 +5,6 @@ @interface DateUtil : NSObject + (NSDateFormatter *)dateFormatter; -//+ (NSDateFormatter *)weekdayFormatter; + (NSDateFormatter *)timeFormatter; + (BOOL)dateIsOlderThanOneDay:(NSDate *)date; + (BOOL)dateIsOlderThanOneWeek:(NSDate *)date; diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 01a506f1d..f05cb7016 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -833,18 +833,12 @@ message status for message delivered to their recipient. */ "MESSAGE_STATUS_DELIVERED" = "Delivered"; -/* message status for messages delivered to the recipient. Embeds: {{the date and time the message was delivered}}. */ -"MESSAGE_STATUS_DELIVERED_WITH_TIMESTAMP_FORMAT" = "Delivered %@"; - /* message footer for failed messages */ "MESSAGE_STATUS_FAILED" = "Sending failed. Tap for info."; /* message footer for read messages */ "MESSAGE_STATUS_READ" = "Read"; -/* message status for messages read by the recipient. Embeds: {{the date and time the message was read}}. */ -"MESSAGE_STATUS_READ_WITH_TIMESTAMP_FORMAT" = "Read %@"; - /* message status while message is sending. */ "MESSAGE_STATUS_SENDING" = "Sending...";