keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add YOU for disappearing messages info message

Browse Source
pull/941/head
Ryan Zhao 2 years ago
parent e54a37ead0
commit 3efba397ab
23 changed files with 80 additions and 4 deletions
Show Stats Download Patch File Download Diff File

3
Session/Meta/Translations/de.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/en.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/es.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/fa.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ ناپدید‌شدن پیام ها را خاموش کرده است"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ ناپدید‌شدن پیام ها را خاموش کرده است";
"MESSAGE_STATE_READ" = "خوانده شد"; "MESSAGE_STATE_READ" = "خوانده شد";
"MESSAGE_STATE_SENT" = "ارسال شد"; "MESSAGE_STATE_SENT" = "ارسال شد";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/fi.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/fr.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/hi.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/hr.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/id-ID.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/it.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/ja.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/nl.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/pl.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/pt_BR.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/ru.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/si.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/sk.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/sv.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/th.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/vi-VN.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

3
Session/Meta/Translations/zh_CN.lproj/Localizable.strings
Unescape Escape View File

@ -595,3 +595,6 @@
"DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages";
"MESSAGE_STATE_READ" = "read"; "MESSAGE_STATE_READ" = "read";
"MESSAGE_STATE_SENT" = "sent"; "MESSAGE_STATE_SENT" = "sent";
"YOU_DISAPPERING_MESSAGES_INFO_ENABLE" = "You have set messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_UPDATE" = "You have changed messages to disappear %@ after they have been %@";
"YOU_DISAPPERING_MESSAGES_INFO_DISABLE" = "You have turned off disappearing messages";

18
SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
Unescape Escape View File

@ -99,13 +99,23 @@ public extension DisappearingMessagesConfiguration {
var previewText: String { var previewText: String {
guard let senderName: String = senderName else { guard let senderName: String = senderName else {
// TODO: "YOU"
// Changed by this device or via synced transcript // Changed by this device or via synced transcript
guard isEnabled, durationSeconds > 0 else { return "YOU_DISABLED_DISAPPEARING_MESSAGES_CONFIGURATION".localized() } guard isEnabled, durationSeconds > 0 else {
return "YOU_DISAPPERING_MESSAGES_INFO_DISABLE".localized()
}
guard isPreviousOff == true else {
return String( return String(
format: "YOU_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION".localized(), format: "YOU_DISAPPERING_MESSAGES_INFO_UPDATE".localized(),
floor(durationSeconds).formatted(format: .long) floor(durationSeconds).formatted(format: .long),
(type == .disappearAfterRead ? "MESSAGE_STATE_READ".localized() : "MESSAGE_STATE_SENT".localized())
)
}
return String(
format: "YOU_DISAPPERING_MESSAGES_INFO_ENABLE".localized(),
floor(durationSeconds).formatted(format: .long),
(type == .disappearAfterRead ? "MESSAGE_STATE_READ".localized() : "MESSAGE_STATE_SENT".localized())
) )
} }

Write Preview
Loading…
Cancel
Save