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

replace more localized string

Browse Source
pull/1023/head
Ryan ZHAO 1 year ago
parent 28dbef71c3
commit cdb9282313
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File

4
Session/Conversations/Message Cells/Content Views/SwiftUI/OpenGroupInvitationView_SwiftUI.swift
Unescape Escape View File

@ -68,7 +68,7 @@ struct OpenGroupInvitationView_SwiftUI: View {
.font(.system(size: Values.largeFontSize))
.foregroundColor(themeColor: textColor)
Text("view_open_group_invitation_description".localized())
Text("communityInvitation".localized())
.font(.system(size: Values.smallFontSize))
.foregroundColor(themeColor: textColor)
.padding(.bottom, 2)
@ -86,7 +86,7 @@ struct OpenGroupInvitationView_SwiftUI: View {
struct OpenGroupInvitationView_SwiftUI_Previews: PreviewProvider {
static var previews: some View {
OpenGroupInvitationView_SwiftUI(
name: "Session",
name: "sessionMessenger".localized(),
url: "http://open.getsession.org/session?public_key=a03c383cf63c3c4efe67acc52112a6dd734b3a946b9545f488aaa93da7991238",
textColor: .messageBubble_outgoingText,
isOutgoing: true

4
Session/Conversations/Message Cells/Content Views/SwiftUI/QuoteView_SwiftUI.swift
Unescape Escape View File

@ -54,7 +54,7 @@ struct QuoteView_SwiftUI: View {
return nil
}
private var author: String? {
guard !isCurrentUser else { return "MEDIA_GALLERY_SENDER_NAME_YOU".localized() }
guard !isCurrentUser else { return "onionRoutingPathYou".localized() }
guard quotedText != nil else {
// When we can't find the quoted message we want to hide the author label
return Profile.displayNameNoFallback(
@ -174,7 +174,7 @@ struct QuoteView_SwiftUI: View {
)
.lineLimit(2)
} else {
Text("QUOTED_MESSAGE_NOT_FOUND".localized())
Text("messageErrorOriginal".localized())
.font(.system(size: Values.smallFontSize))
.foregroundColor(themeColor: targetThemeColor)
}

24
Session/Media Viewing & Editing/MessageInfoScreen.swift
Unescape Escape View File

@ -134,7 +134,7 @@ struct MessageInfoScreen: View {
alignment: .leading,
spacing: Values.mediumSpacing
) {
InfoBlock(title: "ATTACHMENT_INFO_FILE_ID".localized() + ":") {
InfoBlock(title: "attachmentsFileId".localized()) {
Text(attachment.serverId ?? "")
.font(.system(size: Values.mediumFontSize))
.foregroundColor(themeColor: .textPrimary)
@ -143,7 +143,7 @@ struct MessageInfoScreen: View {
HStack(
alignment: .center
) {
InfoBlock(title: "ATTACHMENT_INFO_FILE_TYPE".localized() + ":") {
InfoBlock(title: "attachmentsFileType".localized()) {
Text(attachment.contentType)
.font(.system(size: Values.mediumFontSize))
.foregroundColor(themeColor: .textPrimary)
@ -151,7 +151,7 @@ struct MessageInfoScreen: View {
Spacer()
InfoBlock(title: "ATTACHMENT_INFO_FILE_SIZE".localized() + ":") {
InfoBlock(title: "attachmentsFileSize".localized()) {
Text(Format.fileSize(attachment.byteCount))
.font(.system(size: Values.mediumFontSize))
.foregroundColor(themeColor: .textPrimary)
@ -163,10 +163,10 @@ struct MessageInfoScreen: View {
alignment: .center
) {
let resolution: String = {
guard let width = attachment.width, let height = attachment.height else { return "N/A" }
guard let width = attachment.width, let height = attachment.height else { return "attachmentsNa".localized() }
return "\(width)×\(height)"
}()
InfoBlock(title: "ATTACHMENT_INFO_RESOLUTION".localized() + ":") {
InfoBlock(title: "attachmentsResolution".localized()) {
Text(resolution)
.font(.system(size: Values.mediumFontSize))
.foregroundColor(themeColor: .textPrimary)
@ -175,10 +175,10 @@ struct MessageInfoScreen: View {
Spacer()
let duration: String = {
guard let duration = attachment.duration else { return "N/A" }
guard let duration = attachment.duration else { return "attachmentsNa".localized() }
return floor(duration).formatted(format: .videoDuration)
}()
InfoBlock(title: "ATTACHMENT_INFO_DURATION".localized() + ":") {
InfoBlock(title: "attachmentsDuration".localized()) {
Text(duration)
.font(.system(size: Values.mediumFontSize))
.foregroundColor(themeColor: .textPrimary)
@ -208,13 +208,13 @@ struct MessageInfoScreen: View {
alignment: .leading,
spacing: Values.mediumSpacing
) {
InfoBlock(title: "MESSAGE_INFO_SENT".localized() + ":") {
InfoBlock(title: "disappearingMessagesSent".localized() + ":") {
Text(messageViewModel.dateForUI.fromattedForMessageInfo)
.font(.system(size: Values.mediumFontSize))
.foregroundColor(themeColor: .textPrimary)
}
InfoBlock(title: "MESSAGE_INFO_RECEIVED".localized() + ":") {
InfoBlock(title: "received".localized() + ":") {
Text(messageViewModel.receivedDateForUI.fromattedForMessageInfo)
.font(.system(size: Values.mediumFontSize))
.foregroundColor(themeColor: .textPrimary)
@ -222,14 +222,14 @@ struct MessageInfoScreen: View {
if isMessageFailed {
let failureText: String = messageViewModel.mostRecentFailureText ?? "SEND_FAILED_NOTIFICATION_BODY".localized()
InfoBlock(title: "ALERT_ERROR_TITLE".localized() + ":") {
InfoBlock(title: "error".localized() + ":") {
Text(failureText)
.font(.system(size: Values.mediumFontSize))
.foregroundColor(themeColor: .danger)
}
}
InfoBlock(title: "MESSAGE_INFO_FROM".localized() + ":") {
InfoBlock(title: "from".localized() + ":") {
HStack(
spacing: 10
) {
@ -548,7 +548,7 @@ final class MessageInfoViewController: SessionHostingViewController<MessageInfoS
super.viewDidLoad()
let customTitleFontSize = Values.largeFontSize
setNavBarTitle("message_info_title".localized(), customFontSize: customTitleFontSize)
setNavBarTitle("messageInfo".localized(), customFontSize: customTitleFontSize)
}
}

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

@ -766,3 +766,4 @@
"EMOJI_CATEGORY_SMILEYSANDPEOPLE_NAME" = "Smileys & People";
"EMOJI_CATEGORY_SYMBOLS_NAME" = "Symbols";
"EMOJI_CATEGORY_TRAVEL_NAME" = "Travel & Places";
"SEND_FAILED_NOTIFICATION_BODY" = "Your message failed to send.";

2
SessionMessagingKit/Database/Models/Interaction.swift
Unescape Escape View File

@ -1018,7 +1018,7 @@ public extension Interaction {
}
if isOpenGroupInvitation {
return "😎 Open group invitation"
return "communityInvitation".localized()
}
// TODO: We should do better here

Write Preview
Loading…
Cancel
Save