On 06/29/2016 04:40 PM, Petr Vobornik wrote:
On 06/27/2016 05:50 PM, Pavel Vomacka wrote:
Hello,
Please review attached patch which simplifies confirmation messages for
'remove cert hold' and 'restore cert' actions.
I'd change:
You can select a reason from the pull-down list.
To:
Select a reason from the pull-down list.
Changed. Updated patch attached.
--
Pavel^3 Vomacka
From 66ae0b053fd1a7136c11dacaf26f218e5f68af54 Mon Sep 17 00:00:00 2001
From: Pavel Vomacka
Date: Mon, 27 Jun 2016 17:35:31 +0200
Subject: [PATCH] Simplify the confirmation messages
The confirmation of revoke and remove the certificate hold action is simplier
and more consistent with another parts of WebUI.
Part of: https://fedorahosted.org/freeipa/ticket/5381
---
install/ui/test/data/ipa_init.json | 4 ++--
ipaserver/plugins/internal.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 8060d69933cd96f4cb56f8a99b3d371358867cc4..b05504a54a6aca7d5241929dfb7348c648d2ff60 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -280,7 +280,7 @@
"remove_hold": "Remove Hold",
"remove_certificate_hold": "Remove Certificate Hold for ${entity} ${primary_key}",
"remove_certificate_hold_simple": "Remove Certificate Hold",
-"remove_certificate_hold_confirmation": "To confirm your intention to remove the certificate hold, click the \"Remove hold\" button.",
+"remove_certificate_hold_confirmation": "Do you want to remove the certificate hold?",
"remove_from_crl": "Remove from CRL",
"request_message": " Create a certificate database or use an existing one. To create a new database: # certutil -N -d Create a CSR with subject CN=<${cn_name}>,O=, for example: # certutil -R -d -a -g -s 'CN=${cn},O=${realm}'${san} Copy and paste the CSR (from -BEGIN NEW CERTIFICATE REQUEST- to -END NEW CERTIFICATE REQUEST-) into the text area below: ",
"request_message_san": " -8 '${cn}'",
@@ -288,7 +288,7 @@
"revocation_reason": "Revocation reason",
"revoke_certificate": "Revoke Certificate for ${entity} ${primary_key}",
"revoke_certificate_simple": "Revoke Certificate",
-"revoke_confirmation": "To confirm your intention to revoke this certificate, select a reason from the pull-down list, and click the \"Revoke\" button.",
+"revoke_confirmation": "Do you want to revoke this certificate? Select a reason from the pull-down list.",
"revoked": "Certificate Revoked",
"revoked_status": "REVOKED",
"serial_number": "Serial Number",
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 204c153a8a573e2e2057f8b49b3dac714b6bfcd3..514d48cea3a7e05bdf3196290721d57737920c20 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -423,7 +423,7 @@ class i18n_messages(Command):
"remove_hold": _("Remove Hold"),
"remove_certificate_hold": _("Remove Certificate Hold for ${entity} ${primary_key}"),
"remove_certificate_hold_simple": _("Remove Certificate Hold"),
-"remove_certificate_hold_confirmation": _("To confirm your intention to remove the certificate hold, click the \"Remove hold\" button."),
+"remove_certificate_hold_confirmation": _("Do you want to remove the certificate hold?"),
"remove_from_crl": _("Remove from CRL"),
"request_message": _(" Create a certificate database or use an existing one. To create a new database: # certutil -N -d Create a CSR with subject CN=<${cn_name}>,O=, for example: # certutil -R -d -a -g -s 'CN=${cn},O=${realm}'${san} Copy and paste the CSR (from -BEGIN NEW CERTIFICATE REQUEST- to -END NEW CERTIFICATE REQUEST-) into the text area below: "),
"request_message_san": _(" -8 '${cn}'"),
@@ -431,7 +431,7 @@ class i18n_messages(Command):
"revocation_reason": _("Revocation reason"),
"revoke_certificate": _("Revoke Certificate for ${entity} ${primary_key}"),
"revoke_certificate_simple": _("Revoke Certificate"),
-"revoke_confirmation": _("To confirm your intention to revoke this certificate, select a reason from the pull-down list, and click the \"Revoke\" button."),
+"revoke_confirmation": _("Do you want to revoke this certificate? Select a reason from the p