From 90e76dd52c9035d1ffbe343adee352404bede90c Mon Sep 17 00:00:00 2001
From: Oliver Wiese <oliver.wiese@fu-berlin.de>
Date: Mon, 1 Apr 2019 12:56:59 +0200
Subject: [PATCH] update localization of key import remove duplicated done
button
---
enzevalos_iphone/InboxViewController.swift | 2 +-
enzevalos_iphone/ReadViewController.swift | 10 +++++-----
enzevalos_iphone/de.lproj/Localizable.strings | 5 +++++
enzevalos_iphone/en.lproj/Localizable.strings | 5 +++++
4 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/enzevalos_iphone/InboxViewController.swift b/enzevalos_iphone/InboxViewController.swift
index e9501bfe..e1887216 100644
--- a/enzevalos_iphone/InboxViewController.swift
+++ b/enzevalos_iphone/InboxViewController.swift
@@ -204,7 +204,7 @@ class InboxViewController: UITableViewController, InboxCellDelegator {
} else if segue.identifier == "yourTraySegue" {
if let DestinationNavigationController = segue.destination as? UINavigationController {
if let DestinationViewController = DestinationNavigationController.topViewController as? ContactViewController {
- DestinationViewController.navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(dismissView))
+ //DestinationViewController.navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(dismissView))
let records = folder.records.filter({
$0.isUser
})
diff --git a/enzevalos_iphone/ReadViewController.swift b/enzevalos_iphone/ReadViewController.swift
index ec45e9e5..cb4977ad 100644
--- a/enzevalos_iphone/ReadViewController.swift
+++ b/enzevalos_iphone/ReadViewController.swift
@@ -645,16 +645,16 @@ class ReadViewController: UITableViewController {
private func importSecretKeyDialog(first: Bool) {
Logger.log(importPrivateKeyPopupOpen: mail)
- var message = NSLocalizedString("Please, enter the password to import the new secret.", comment: "NewSecretKeyMessage")
+ var message = NSLocalizedString("Read.Import.Secret.Body", comment: "NewSecretKeyMessage")
if !first {
- message = NSLocalizedString("Wrong password! Please, enter the password to import the new secret again.", comment: "NewSecretKeyMessage")
+ message = NSLocalizedString("Read.Import.Secret.Body.Wrong", comment: "NewSecretKeyMessage")
}
- let alert = UIAlertController(title: NSLocalizedString("New secret", comment: "NewSecretKeyTitle"), message: message, preferredStyle: UIAlertController.Style.alert)
- alert.addAction(UIAlertAction(title: NSLocalizedString("No import", comment: "NoSecretKeyImport"), style: UIAlertAction.Style.destructive, handler: { (_: UIAlertAction) -> Void in
+ let alert = UIAlertController(title: NSLocalizedString("Read.Import.Secret.Title", comment: "NewSecretKeyTitle"), message: message, preferredStyle: UIAlertController.Style.alert)
+ alert.addAction(UIAlertAction(title: NSLocalizedString("Read.Import.Secret.No", comment: "NoSecretKeyImport"), style: UIAlertAction.Style.destructive, handler: { (_: UIAlertAction) -> Void in
Logger.log(importPrivateKeyPopupClose: self.mail, doImport: false)
}))
- alert.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: "Import secret Key"), style: UIAlertAction.Style.default, handler: importSecretKey))
+ alert.addAction(UIAlertAction(title: NSLocalizedString("Read.Import.Secret.Ok", comment: "Import secret Key"), style: UIAlertAction.Style.default, handler: importSecretKey))
alert.addTextField(configurationHandler: newSecretkeyPassword(textField:))
self.present(alert, animated: true, completion: nil)
}
diff --git a/enzevalos_iphone/de.lproj/Localizable.strings b/enzevalos_iphone/de.lproj/Localizable.strings
index 7fc14af9..b70e777a 100644
--- a/enzevalos_iphone/de.lproj/Localizable.strings
+++ b/enzevalos_iphone/de.lproj/Localizable.strings
@@ -265,3 +265,8 @@
"MailServerError.Crypto.Body" = "Es konnte keine Verbindung zum Server hergestellt werden.\n Die Konfiguration der Transportverschlüsselung ist falsch. Bitte überprüfe diese, sowie den Port der Serverkonfiguration. Mehr Informationen finden sich dazu auch auf der Webseite des Providers.";
"MailServerError.OAUTH.Body" = "Es konnte keine Verbindung zum Server hergestellt werden.\n Google stellt einen sicheren Zugang zu deinem Postfach bereit. Bitte nutze dazu den spezifischen Login für Google.";
"MailServerError.Default.Body" = "Es konnte keine Verbindung zum Server hergestellt werden.\n Bitte überprüfe das Password, den Accountname und die Serverkonfiguration (IMAP/SMTP). Die Serverkonfiguration kann mit der Serverkonfiguration auf der Provider-Webseite verglichen werden. In manchen Fällen muss der Zugriff mittels IMAP/SMTP in den Accounteinstellungen erst freigeschaltet werden.";
+"Read.Import.Secret.Title" = "Neues Geheimnis";
+"Read.Import.Secret.Body" = "Bitte gib das Passwort um das neue Geheimnis zu importieren ein.";
+"Read.Import.Secret.No" = "Kein Import";
+"Read.Import.Secret.Ok" = "Ok";
+"Read.Import.Secret.Body.Wrong" = "Falsches Passwort! Bitte gib das Passwort um das neue Geheimnis zu importieren erneut ein.";
diff --git a/enzevalos_iphone/en.lproj/Localizable.strings b/enzevalos_iphone/en.lproj/Localizable.strings
index b554bdfd..ea7d4046 100644
--- a/enzevalos_iphone/en.lproj/Localizable.strings
+++ b/enzevalos_iphone/en.lproj/Localizable.strings
@@ -235,3 +235,8 @@
"MailServerError.Crypto.Body" = "Couldn't connect to server.\n The transport encryption configuration is wrong. Please, check the transport encryption and port configuration. You can find more information on your provider's website.";
"MailServerError.OAUTH.Body" = "Couldn't connect to server.\n Google provides a more secure access to your mail account. Please, use the specific google login.";
"MailServerError.Default.Body" = "Couldn't connect to server.\n Please, check your account name, password and server configuration. You can also compare the server configuration with the configuration listed on the website of your provider. In some cases, you have to activate the IMAP/SMTP connection in your account settings.";
+"Read.Import.Secret.Title" = "New secret";
+"Read.Import.Secret.Body" = "Please, enter the password to import the new secret.";
+"Read.Import.Secret.No" = "No import";
+"Read.Import.Secret.Ok" = "Ok";
+"Read.Import.Secret.Body.Wrong" = "Wrong password! Please, enter the password to import the new secret again.";
--
GitLab