From e2e5e6fed9b5d44c5d02374ab73449fab6de5e47 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 26 Nov 2020 16:37:13 -0500 Subject: [PATCH] i18n(mail): improve generic error message for signed/encrypted messages Fixes #5204 --- UI/MailPartViewers/UIxMailPartEncryptedViewer.m | 6 +++--- UI/MailPartViewers/UIxMailPartSignedViewer.m | 6 +++--- UI/MailerUI/English.lproj/Localizable.strings | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/UI/MailPartViewers/UIxMailPartEncryptedViewer.m b/UI/MailPartViewers/UIxMailPartEncryptedViewer.m index d95feaced..01e8c7fda 100644 --- a/UI/MailPartViewers/UIxMailPartEncryptedViewer.m +++ b/UI/MailPartViewers/UIxMailPartEncryptedViewer.m @@ -175,15 +175,15 @@ ERR_load_crypto_strings(); SSL_load_error_strings(); sslError = ERR_reason_error_string(err); - validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"No error information available"]] retain]; + validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"Digital signature is not valid"]] retain]; #elif OPENSSL_VERSION_NUMBER < 0x10100000L const char* sslError; ERR_load_crypto_strings(); SSL_load_error_strings(); sslError = ERR_reason_error_string(err); - validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"No error information available"]] retain]; + validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"Digital signature is not valid"]] retain]; #else - validationMessage = [[self labelForKey: @"No error information available"] retain]; + validationMessage = [[self labelForKey: @"Digital signature is not valid"] retain]; #endif /* HAVE_GNUTLS */ BUF_MEM *bptr; //DEL diff --git a/UI/MailPartViewers/UIxMailPartSignedViewer.m b/UI/MailPartViewers/UIxMailPartSignedViewer.m index 9422e186c..8269c2609 100644 --- a/UI/MailPartViewers/UIxMailPartSignedViewer.m +++ b/UI/MailPartViewers/UIxMailPartSignedViewer.m @@ -173,15 +173,15 @@ ERR_load_crypto_strings(); SSL_load_error_strings(); sslError = ERR_reason_error_string(err); - validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"No error information available"]] retain]; + validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"Digital signature is not valid"]] retain]; #elif OPENSSL_VERSION_NUMBER < 0x10100000L const char* sslError; ERR_load_crypto_strings(); SSL_load_error_strings(); sslError = ERR_reason_error_string(err); - validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"No error information available"]] retain]; + validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"Digital signature is not valid"]] retain]; #else - validationMessage = [[self labelForKey: @"No error information available"] retain]; + validationMessage = [[self labelForKey: @"Digital signature is not valid"] retain]; #endif /* HAVE_GNUTLS */ } } diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings index 8785ac9ab..2ce267cdb 100644 --- a/UI/MailerUI/English.lproj/Localizable.strings +++ b/UI/MailerUI/English.lproj/Localizable.strings @@ -276,7 +276,7 @@ "Message is signed" = "Message is signed"; /* Unknown error while validating message signature */ -"No error information available" = "No error information available"; +"Digital signature is not valid" = "Digital signature is not valid"; "This Folder" = "This Folder";