CAcert Code Development list.

[Michael Tänzer <michael.taenzer AT cacert.org>]

Hi folks,

We have a fix for https://bugs.cacert.org/view.php?id=448
"when revoking a certificate, confusing info is given to the user"

The fix was reviewed by Benny Baumann (BenBE) and me (NEOatNHNG) and
tested by Eva Stöwe (Eva) and Marcus Mängel (INOPIAE).

Diff is attached. Please also run the locale makefile so that our
translators see the new strings (if present) on
https://translations.cacert.org and new translations get imported into
the system.

Changed files:
/includes/account.php

-- 
Have a nice day,
Michael Tänzer
diff --git a/includes/account.php b/includes/account.php
index 7c3748d..497bf58 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -972,8 +972,12 @@ function buildSubjectFromSession() {
 					continue;
 				}
 				mysql_query("update `domaincerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'");
-				printf(_("Certificate for '%s' has been revoked.")."<br>\n", $row['CN']);
+				printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'<br/>', htmlspecialchars($row['CN']), htmlspecialchars($row['serial']));
 			}
+
+			// TRANSLATORS: Please don't translate "Certificate Revocation List (CRL)", it's a technical term
+			echo '<br/>'._('All listed certificates will be added to the Certificate Revocation List (CRL) soon.').'<br/>';
+
 		}
 		else
 		{
@@ -1128,8 +1132,11 @@ function buildSubjectFromSession() {
 					continue;
 				}
 				mysql_query("update `emailcerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'");
-				printf(_("Certificate for '%s' has been revoked.")."<br>\n", $row['CN']);
+				printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'<br/>', htmlspecialchars($row['CN']), htmlspecialchars($row['serial']));
 			}
+
+			// TRANSLATORS: Please don't translate "Certificate Revocation List (CRL)", it's a technical term
+			echo '<br/>'._('All listed certificates will be added to the Certificate Revocation List (CRL) soon.').'<br/>';
 		}
 		else
 		{
@@ -1755,8 +1762,11 @@ function buildSubjectFromSession() {
 					continue;
 				}
 				mysql_query("update `orgemailcerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'");
-				printf(_("Certificate for '%s' has been revoked.")."<br>\n", $row['CN']);
+				printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'<br/>', htmlspecialchars($row['CN']), htmlspecialchars($row['serial']));
 			}
+
+			// TRANSLATORS: Please don't translate "Certificate Revocation List (CRL)", it's a technical term
+			echo '<br/>'._('All listed certificates will be added to the Certificate Revocation List (CRL) soon.').'<br/>';
 		}
 		else
 		{
@@ -2111,8 +2121,11 @@ function buildSubjectFromSession() {
 					continue;
 				}
 				mysql_query("update `orgdomaincerts` set `revoked`='1970-01-01 10:00:01' where `id`='$id'");
-				printf(_("Certificate for '%s' has been revoked.")."<br>\n", $row['CN']);
+				printf(_("Certificate for '%s' with the serial no '%s' has been revoked.").'<br/>', htmlspecialchars($row['CN']), htmlspecialchars($row['serial']));
 			}
+
+			// TRANSLATORS: Please don't translate "Certificate Revocation List (CRL)", it's a technical term
+			echo '<br/>'._('All listed certificates will be added to the Certificate Revocation List (CRL) soon.').'<br/>';
 		}
 		else
 		{

Attachment: signature.asc
Description: OpenPGP digital signature