fix a bunch of strings

Session/Shared/FullConversationCell.swift

@@ -600,12 +600,15 @@ public final class FullConversationCell: UITableViewCell, SwipeActionOptimisticC
         
         if
             (cellViewModel.threadVariant == .legacyGroup || cellViewModel.threadVariant == .group || cellViewModel.threadVariant == .community) &&
-            (cellViewModel.interactionVariant?.isGroupControlMessage == false)
+            (cellViewModel.interactionVariant?.isInfoMessage == false)
         {
             let authorName: String = cellViewModel.authorName(for: cellViewModel.threadVariant)
             
             result.append(NSAttributedString(
-                string: "\(authorName): ", // stringlint:disable
+                string: "messageSnippetGroup"
+                    .put(key: "author", value: authorName)
+                    .put(key: "message_snippet", value: "")
+                    .localized(),
                 attributes: [ .foregroundColor: textColor ]
             ))
         }
@@ -652,11 +655,18 @@ public final class FullConversationCell: UITableViewCell, SwipeActionOptimisticC
         textColor: UIColor
     ) -> NSAttributedString {
         guard !content.isEmpty, content != "noteToSelf".localized() else {
+            if let authorName: String = authorName, !authorName.isEmpty {
+                return NSMutableAttributedString(
+                    string: "messageSnippetGroup"
+                        .put(key: "author", value: authorName)
+                        .put(key: "message_snippet", value: content)
+                        .localized(),
+                    attributes: [ .foregroundColor: textColor ]
+                )
+            }
+            
             return NSMutableAttributedString(
-                string: (authorName != nil && authorName?.isEmpty != true ?
-                    "\(authorName ?? ""): \(content)" : // stringlint:disable
-                    content
-                ),
+                string: content,
                 attributes: [ .foregroundColor: textColor ]
             )
         }
@@ -732,7 +742,10 @@ public final class FullConversationCell: UITableViewCell, SwipeActionOptimisticC
                 guard !authorName.isEmpty else { return nil }
                 
                 let authorPrefix: NSAttributedString = NSAttributedString(
-                    string: "\(authorName): ", // stringlint:disable
+                    string: "messageSnippetGroup"
+                        .put(key: "author", value: authorName)
+                        .put(key: "message_snippet", value: "")
+                        .localized(),
                     attributes: [ .foregroundColor: textColor ]
                 )
                 

SessionMessagingKit/Database/Models/Attachment.swift

@@ -271,11 +271,15 @@ extension Attachment: CustomStringConvertible {
                 descriptionInfo.sourceFilename == nil ||
                 (descriptionInfo.sourceFilename?.count ?? 0) == 0
             {
-                return "🎙️ \("messageVoice".localized())"
+                return "messageVoiceSnippet"
+                    .put(key: "emoji", value: "🎙️")
+                    .localized()
             }
         }
         
-        return "\(emoji(for: descriptionInfo.contentType)) \("attachment".localized())"
+        return "attachmentsNotification"
+            .put(key: "emoji", value: emoji(for: descriptionInfo.contentType))
+            .localized()
     }
     
     public static func emoji(for contentType: String) -> String {
@@ -776,10 +780,7 @@ extension Attachment {
     
     public var documentFileName: String {
         if let sourceFilename: String = sourceFilename { return sourceFilename }
-        if isImage { return "image".localized() + " " + "file".localized() }
-        if isAudio { return "audio".localized() + " " + "file".localized() }
-        if isVideo { return "video".localized() + " " + "file".localized() }
-        return "file".localized()
+        return shortDescription
     }
     
     public var shortDescription: String {

SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift

@@ -146,7 +146,12 @@ public extension DisappearingMessagesConfiguration {
         var previewText: String {
             guard let senderName: String = senderName else {
                 guard isEnabled, durationSeconds > 0 else {
-                    return "disappearingMessagesTurnedOffYou".localized()
+                    switch threadVariant {
+                        case .legacyGroup, .group:
+                            return "disappearingMessagesTurnedOffYou".localized() // TODO: replace with "disappearingMessagesTurnedOffYouGroup".localized()
+                        default:
+                            return "disappearingMessagesTurnedOffYou".localized()
+                    }
                 }
                 
                 return "disappearingMessagesSetYou"
@@ -156,9 +161,16 @@ public extension DisappearingMessagesConfiguration {
             }
             
             guard isEnabled, durationSeconds > 0 else {
-                return "disappearingMessagesTurnedOff"
-                    .put(key: "name", value: senderName)
-                    .localized()
+                switch threadVariant {
+                    case .legacyGroup, .group:
+                        return "disappearingMessagesTurnedOffGroup"
+                            .put(key: "name", value: senderName)
+                            .localized()
+                    default:
+                        return "disappearingMessagesTurnedOff"
+                            .put(key: "name", value: senderName)
+                            .localized()
+                }
             }
             
             return "disappearingMessagesSet"

SessionMessagingKit/Database/Models/Interaction.swift

@@ -986,28 +986,15 @@ public extension Interaction {
                     for: attachmentDescriptionInfo,
                     count: attachmentCount
                 )
-                
-                if
-                    let attachmentDescription: String = attachmentDescription,
-                    let body: String = body,
-                    !attachmentDescription.isEmpty,
-                    !body.isEmpty
-                {
-                    if Singleton.hasAppContext && Singleton.appContext.isRTL {
-                        return "\(body): \(attachmentDescription)"
-                    }
-                    
-                    return "\(attachmentDescription): \(body)"
+            
+                if let attachmentDescription: String = attachmentDescription, !attachmentDescription.isEmpty {
+                    return attachmentDescription
                 }
                 
                 if let body: String = body, !body.isEmpty {
                     return body
                 }
                 
-                if let attachmentDescription: String = attachmentDescription, !attachmentDescription.isEmpty {
-                    return attachmentDescription
-                }
-                
                 if isOpenGroupInvitation {
                     return "communityInvitation".localized()
                 }