GNOME Bugzilla – Bug 347782
evolution shows gpg/pgp encrypted error message as s/mime
Last modified: 2013-09-13 00:57:50 UTC
Forwarded from: https://launchpad.net/distros/ubuntu/+source/evolution/+bug/52804 When I opened a gpg/pgp encrypted message and clicked cancel when it asked for my passphrase, evolution showed the error message "Could not parse S/MIME message \n User canceled operation." in red where the message usually would be. This should say "Could not parse PGP message..." or similar.
Confirming.
i still wonder where this message is exactly located... it obviously is not translated, which would be another bug. once upon a time it was in mail/em-format-html.c according to http://mail.gnome.org/archives/gnome-i18n/2005-August/msg00209.html
I found it in mail/em-format.c, at revision 3368 (current head). And indeed it is not being marked for translation. Since I am unsure on what to do here -- is it to be changed or not? I am refraining from sending a patch. It seems, to me, that changing the string would also be the moment to i18n it, so this bug might do both. The string occurs in two places, both not marked for translation, in emf_inlinepgp_encrypted and in emf_multipart_encrypted. Both deal with GPG/PGP.
careful with emf_multipart_encrypted() as it also handles S/MIME there
yes, I noticed it. Nevertheless, at this point it is dealing with GPG only: (...) ex = camel_exception_new(); context = camel_gpg_context_new(emf->session); opart = camel_mime_part_new(); valid = camel_cipher_decrypt(context, part, opart, ex); if (valid == NULL) { em_format_format_error(emf, stream, ex->desc?("Could not parse S/MIME message"):_("Could not parse S/MIME message: Unknown error")); if (ex->desc) em_format_format_error(emf, stream, ex->desc); em_format_part_as(emf, stream, part, "multipart/mixed"); (...) Anyways, I do not know what is actually expected to be done, as I noted above, to risk a patch here.... sorry.
just add an _ before the ("Could not parse S/MIME message") looks like someone simply typoed
Created attachment 91323 [details] [review] bug 347782 -- changed error messages to correctly refer to GPG Proposed patch attached. This will add 2 new i18n strings (previously untranslated) and replace 2 existing ones. Patched against revision 33628 of mail/em-format.c
instead of "GPG/PGP", I'd probably say "PGP/MIME" for the multipart callback and for the inline callback, I'd probably just say PGP
Created attachment 91326 [details] [review] revised patch revised patch per Jeffrey's comments.
awesome, thanks. looks good to me now... I'm not sure if evo is string frozen or not atm tho, will let the current mail maintainers commit
Fejj, we still have a few weeks before the freeze, so no probs :) Committed to head.