diff --git a/apps/ios/Shared/Views/Chat/ChatView.swift b/apps/ios/Shared/Views/Chat/ChatView.swift index 02dee61f1..e0e0c3614 100644 --- a/apps/ios/Shared/Views/Chat/ChatView.swift +++ b/apps/ios/Shared/Views/Chat/ChatView.swift @@ -446,8 +446,8 @@ struct ChatView: View { VStack(alignment: .leading, spacing: 4) { if ci.content.showMemberName { Group { - if msgScope == .msPrivate { - Text("\(member.displayName) **privately**") + if msgScope == .msDirect { + Text("\(member.displayName) **directly**") } else { Text(member.displayName) } @@ -491,7 +491,7 @@ struct ChatView: View { .appSheet(item: $selectedMember) { member in GroupMemberInfoView(groupInfo: groupInfo, member: directMember, navigation: true) } - Text("**privately** to \(directMember.displayName)") + Text("**directly** to \(directMember.displayName)") } else { Text("to group") } diff --git a/apps/ios/Shared/Views/Chat/ComposeMessage/ContextDirectMemberView.swift b/apps/ios/Shared/Views/Chat/ComposeMessage/ContextDirectMemberView.swift index b92297c45..f523844f0 100644 --- a/apps/ios/Shared/Views/Chat/ComposeMessage/ContextDirectMemberView.swift +++ b/apps/ios/Shared/Views/Chat/ComposeMessage/ContextDirectMemberView.swift @@ -20,7 +20,7 @@ struct ContextDirectMemberView: View { ProfileImage(imageStr: directMember.image) .frame(width: 30, height: 30) .padding(.trailing, 2) - Text("Message will be sent privately to \(directMember.chatViewName)") + Text("Directly to \(directMember.chatViewName)") .lineLimit(1) } else { Text("Message will be sent to all members") diff --git a/apps/ios/SimpleXChat/ChatTypes.swift b/apps/ios/SimpleXChat/ChatTypes.swift index 89d7b22df..cbca88dc4 100644 --- a/apps/ios/SimpleXChat/ChatTypes.swift +++ b/apps/ios/SimpleXChat/ChatTypes.swift @@ -2136,7 +2136,7 @@ public struct ChatItem: Identifiable, Decodable { public var directMember: GroupMember? { switch chatDir { case let .groupSnd(directMember): return directMember - case let .groupRcv(groupMember, .msPrivate): return groupMember + case let .groupRcv(groupMember, .msDirect): return groupMember default: return nil } } @@ -2291,7 +2291,7 @@ public struct ChatItem: Identifiable, Decodable { public enum MessageScope: String, Decodable { case msGroup = "group" - case msPrivate = "private" + case msDirect = "direct" } public enum CIDirection: Decodable { @@ -2655,16 +2655,16 @@ public struct CIQuote: Decodable, ItemContent { } else { return NSLocalizedString("you", comment: "quote sender") } - case .groupSnd(.msPrivate): + case .groupSnd(.msDirect): if let membershipName = membership?.displayName { - return String.localizedStringWithFormat(NSLocalizedString("%@, privately", comment: "quote sender"), membershipName) + return String.localizedStringWithFormat(NSLocalizedString("%@, directly", comment: "quote sender"), membershipName) } else { - return NSLocalizedString("you, privately", comment: "quote sender") + return NSLocalizedString("you, directly", comment: "quote sender") } case let .groupRcv(member, .msGroup): return member.displayName - case let .groupRcv(member, .msPrivate): - return String.localizedStringWithFormat(NSLocalizedString("%@, privately", comment: "quote sender"), member.displayName) + case let .groupRcv(member, .msDirect): + return String.localizedStringWithFormat(NSLocalizedString("%@, directly", comment: "quote sender"), member.displayName) case nil: return nil } } diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt index 429bbd001..d4eda389f 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt @@ -1633,7 +1633,7 @@ data class ChatItem ( @Serializable enum class MessageScope(val messageScope: String) { @SerialName("group") MSGroup("group"), - @SerialName("private") MSPrivate("private"); + @SerialName("private") MSDirect("direct"); } @Serializable