IntenseFinance/simplex-chat
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ms private -> direct

Browse Source
This commit is contained in:
spaced4ndy 2023-09-11 18:45:36 +04:00
parent cf60183e74
commit 8efa023327
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/ios/Shared/Views/Chat/ChatView.swift
View File

@ -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")
}

2
apps/ios/Shared/Views/Chat/ComposeMessage/ContextDirectMemberView.swift
View File

@ -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")

14
apps/ios/SimpleXChat/ChatTypes.swift
View File

@ -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
}
}

2
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
View File

@ -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