From f92d39fe8e2104807aef4ce25f32c93a41e3c181 Mon Sep 17 00:00:00 2001 From: Oliver Wiese <oliver.wiese@fu-berlin.de> Date: Wed, 15 Apr 2020 12:39:33 +0200 Subject: [PATCH] fix localization bug --- enzevalos_iphone/SwiftUI/Read/ReadViewCoordinator.swift | 1 + .../SwiftUI/Read/Tabbed Views/SecurityBriefingView.swift | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/enzevalos_iphone/SwiftUI/Read/ReadViewCoordinator.swift b/enzevalos_iphone/SwiftUI/Read/ReadViewCoordinator.swift index c51807cc..5a79de55 100644 --- a/enzevalos_iphone/SwiftUI/Read/ReadViewCoordinator.swift +++ b/enzevalos_iphone/SwiftUI/Read/ReadViewCoordinator.swift @@ -155,6 +155,7 @@ class ReadViewCoordinator { func askSenderToConfirm <M: DisplayMail>(mail: M) { let to = [mail.sender.findAddress(temp: false)] + print(mail.sender.findAddress(temp: false).mailAddress) let body = NSLocalizedString("didYouSendThis", comment: "Did you sent this mail?") + "\n"+preparePreviousMailBody(mail: mail) pushComposeView(to: to, cc: [], bcc: [], subject: mail.subject, body: body, responseType: .Reply) } diff --git a/enzevalos_iphone/SwiftUI/Read/Tabbed Views/SecurityBriefingView.swift b/enzevalos_iphone/SwiftUI/Read/Tabbed Views/SecurityBriefingView.swift index 4cd807bd..0e136d1f 100644 --- a/enzevalos_iphone/SwiftUI/Read/Tabbed Views/SecurityBriefingView.swift +++ b/enzevalos_iphone/SwiftUI/Read/Tabbed Views/SecurityBriefingView.swift @@ -95,8 +95,6 @@ struct SecurityBriefingView<M: DisplayMail>: View { Text(self.mail.buttonActions[index].title) .frame(maxWidth: .infinity, minHeight: 50, maxHeight: 50) .addBorder(self.mail.buttonActions[index].color, width: 1, cornerRadius: 30) - // .foregroundColor(.white) - //.background(RoundedCorners(color: self.mail.buttonActions[index].color, radius: 30)) .padding(.vertical, 10) .padding(.horizontal, 20) }) @@ -239,7 +237,7 @@ struct DialogButtonLabel: View { } var body: some View { - Text(data.titleKey) + Text(data.title) .frame(maxWidth: .infinity, minHeight: 20, maxHeight: 20) .padding(10) .addBorder(color, width: 1, cornerRadius: 30) -- GitLab