From 3efba397ab31d6799e1cac991fff7ab337a2f78b Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Thu, 3 Nov 2022 17:07:53 +1100 Subject: [PATCH] add YOU for disappearing messages info message --- .../Translations/de.lproj/Localizable.strings | 3 +++ .../Translations/en.lproj/Localizable.strings | 3 +++ .../Translations/es.lproj/Localizable.strings | 3 +++ .../Translations/fa.lproj/Localizable.strings | 3 +++ .../Translations/fi.lproj/Localizable.strings | 3 +++ .../Translations/fr.lproj/Localizable.strings | 3 +++ .../Translations/hi.lproj/Localizable.strings | 3 +++ .../Translations/hr.lproj/Localizable.strings | 3 +++ .../id-ID.lproj/Localizable.strings | 3 +++ .../Translations/it.lproj/Localizable.strings | 3 +++ .../Translations/ja.lproj/Localizable.strings | 3 +++ .../Translations/nl.lproj/Localizable.strings | 3 +++ .../Translations/pl.lproj/Localizable.strings | 3 +++ .../pt_BR.lproj/Localizable.strings | 3 +++ .../Translations/ru.lproj/Localizable.strings | 3 +++ .../Translations/si.lproj/Localizable.strings | 3 +++ .../Translations/sk.lproj/Localizable.strings | 3 +++ .../Translations/sv.lproj/Localizable.strings | 3 +++ .../Translations/th.lproj/Localizable.strings | 3 +++ .../vi-VN.lproj/Localizable.strings | 3 +++ .../zh-Hant.lproj/Localizable.strings | 3 +++ .../zh_CN.lproj/Localizable.strings | 3 +++ .../DisappearingMessageConfiguration.swift | 18 ++++++++++++++---- 23 files changed, 80 insertions(+), 4 deletions(-) diff --git a/Session/Meta/Translations/de.lproj/Localizable.strings b/Session/Meta/Translations/de.lproj/Localizable.strings index 5ff4862c5..03a01a1c7 100644 --- a/Session/Meta/Translations/de.lproj/Localizable.strings +++ b/Session/Meta/Translations/de.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings index e836974ff..9c11eddec 100644 --- a/Session/Meta/Translations/en.lproj/Localizable.strings +++ b/Session/Meta/Translations/en.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/es.lproj/Localizable.strings b/Session/Meta/Translations/es.lproj/Localizable.strings index ad1b212c5..3619cde1a 100644 --- a/Session/Meta/Translations/es.lproj/Localizable.strings +++ b/Session/Meta/Translations/es.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/fa.lproj/Localizable.strings b/Session/Meta/Translations/fa.lproj/Localizable.strings index ca164c422..25c1869a5 100644 --- a/Session/Meta/Translations/fa.lproj/Localizable.strings +++ b/Session/Meta/Translations/fa.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ ناپدید‌شدن پیام ها را خاموش کرده است"; "MESSAGE_STATE_READ" = "خوانده شد"; "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"; diff --git a/Session/Meta/Translations/fi.lproj/Localizable.strings b/Session/Meta/Translations/fi.lproj/Localizable.strings index 14eb62d0c..741bbd8e8 100644 --- a/Session/Meta/Translations/fi.lproj/Localizable.strings +++ b/Session/Meta/Translations/fi.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/fr.lproj/Localizable.strings b/Session/Meta/Translations/fr.lproj/Localizable.strings index a6a53a4f0..159feb782 100644 --- a/Session/Meta/Translations/fr.lproj/Localizable.strings +++ b/Session/Meta/Translations/fr.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/hi.lproj/Localizable.strings b/Session/Meta/Translations/hi.lproj/Localizable.strings index 80de9e1ba..1e6eee0ff 100644 --- a/Session/Meta/Translations/hi.lproj/Localizable.strings +++ b/Session/Meta/Translations/hi.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/hr.lproj/Localizable.strings b/Session/Meta/Translations/hr.lproj/Localizable.strings index 35c88abda..d13b0f11f 100644 --- a/Session/Meta/Translations/hr.lproj/Localizable.strings +++ b/Session/Meta/Translations/hr.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/id-ID.lproj/Localizable.strings b/Session/Meta/Translations/id-ID.lproj/Localizable.strings index a4d988cb9..eeba101c4 100644 --- a/Session/Meta/Translations/id-ID.lproj/Localizable.strings +++ b/Session/Meta/Translations/id-ID.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/it.lproj/Localizable.strings b/Session/Meta/Translations/it.lproj/Localizable.strings index 612742459..70ca92445 100644 --- a/Session/Meta/Translations/it.lproj/Localizable.strings +++ b/Session/Meta/Translations/it.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/ja.lproj/Localizable.strings b/Session/Meta/Translations/ja.lproj/Localizable.strings index 36add4524..cf739b52b 100644 --- a/Session/Meta/Translations/ja.lproj/Localizable.strings +++ b/Session/Meta/Translations/ja.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/nl.lproj/Localizable.strings b/Session/Meta/Translations/nl.lproj/Localizable.strings index 472e947ef..33eefbe49 100644 --- a/Session/Meta/Translations/nl.lproj/Localizable.strings +++ b/Session/Meta/Translations/nl.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/pl.lproj/Localizable.strings b/Session/Meta/Translations/pl.lproj/Localizable.strings index 509f784da..77bcda429 100644 --- a/Session/Meta/Translations/pl.lproj/Localizable.strings +++ b/Session/Meta/Translations/pl.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/pt_BR.lproj/Localizable.strings b/Session/Meta/Translations/pt_BR.lproj/Localizable.strings index 0003d0448..a475a43e9 100644 --- a/Session/Meta/Translations/pt_BR.lproj/Localizable.strings +++ b/Session/Meta/Translations/pt_BR.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/ru.lproj/Localizable.strings b/Session/Meta/Translations/ru.lproj/Localizable.strings index a8ef9b9a9..79c7da25a 100644 --- a/Session/Meta/Translations/ru.lproj/Localizable.strings +++ b/Session/Meta/Translations/ru.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/si.lproj/Localizable.strings b/Session/Meta/Translations/si.lproj/Localizable.strings index f30b1de70..19112054a 100644 --- a/Session/Meta/Translations/si.lproj/Localizable.strings +++ b/Session/Meta/Translations/si.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/sk.lproj/Localizable.strings b/Session/Meta/Translations/sk.lproj/Localizable.strings index 5a678b84d..22fcb10db 100644 --- a/Session/Meta/Translations/sk.lproj/Localizable.strings +++ b/Session/Meta/Translations/sk.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/sv.lproj/Localizable.strings b/Session/Meta/Translations/sv.lproj/Localizable.strings index a912e2392..e4a138ec6 100644 --- a/Session/Meta/Translations/sv.lproj/Localizable.strings +++ b/Session/Meta/Translations/sv.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/th.lproj/Localizable.strings b/Session/Meta/Translations/th.lproj/Localizable.strings index 77bc61d50..5284c29e7 100644 --- a/Session/Meta/Translations/th.lproj/Localizable.strings +++ b/Session/Meta/Translations/th.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/vi-VN.lproj/Localizable.strings b/Session/Meta/Translations/vi-VN.lproj/Localizable.strings index bc06b22de..0fe70b457 100644 --- a/Session/Meta/Translations/vi-VN.lproj/Localizable.strings +++ b/Session/Meta/Translations/vi-VN.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings b/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings index 95568eda2..69fb8a348 100644 --- a/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/Session/Meta/Translations/zh_CN.lproj/Localizable.strings b/Session/Meta/Translations/zh_CN.lproj/Localizable.strings index bfa4bc9f5..2b5bdb9fa 100644 --- a/Session/Meta/Translations/zh_CN.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh_CN.lproj/Localizable.strings @@ -595,3 +595,6 @@ "DISAPPERING_MESSAGES_INFO_DISABLE" = "%@ has turned off disappearing messages"; "MESSAGE_STATE_READ" = "read"; "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"; diff --git a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift index d97dfea22..dace66c13 100644 --- a/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift +++ b/SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift @@ -99,13 +99,23 @@ public extension DisappearingMessagesConfiguration { var previewText: String { guard let senderName: String = senderName else { - // TODO: "YOU" // 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( + format: "YOU_DISAPPERING_MESSAGES_INFO_UPDATE".localized(), + floor(durationSeconds).formatted(format: .long), + (type == .disappearAfterRead ? "MESSAGE_STATE_READ".localized() : "MESSAGE_STATE_SENT".localized()) + ) + } return String( - format: "YOU_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION".localized(), - floor(durationSeconds).formatted(format: .long) + format: "YOU_DISAPPERING_MESSAGES_INFO_ENABLE".localized(), + floor(durationSeconds).formatted(format: .long), + (type == .disappearAfterRead ? "MESSAGE_STATE_READ".localized() : "MESSAGE_STATE_SENT".localized()) ) }