diff options
| author | Pavel Vomacka <pvomacka@redhat.com> | 2016-06-27 17:35:31 +0200 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2016-06-30 14:18:47 +0200 |
| commit | a3c7f845e019f79c2cefde0526790dec4f118b56 (patch) | |
| tree | 1b56219999dfebc0d47275f81a90cc5f54470b66 | |
| parent | 3b79ce005c43c6cb270175dc987eed3ba19e0f53 (diff) | |
| download | freeipa-a3c7f845e019f79c2cefde0526790dec4f118b56.tar.gz freeipa-a3c7f845e019f79c2cefde0526790dec4f118b56.tar.xz freeipa-a3c7f845e019f79c2cefde0526790dec4f118b56.zip | |
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
Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
| -rw-r--r-- | install/ui/test/data/ipa_init.json | 4 | ||||
| -rw-r--r-- | 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 32a6f1c56..dbbce26d9 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -283,7 +283,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": "<ol> <li>Create a certificate database or use an existing one. To create a new database:<br/> <code># certutil -N -d <database path></code> </li> <li>Create a CSR with subject <em>CN=<${cn_name}>,O=<realm></em>, for example:<br/> <code># certutil -R -d <database path> -a -g <key size> -s 'CN=${cn},O=${realm}'${san}</code> </li> <li> Copy and paste the CSR (from <em>-----BEGIN NEW CERTIFICATE REQUEST-----</em> to <em>-----END NEW CERTIFICATE REQUEST-----</em>) into the text area below: </li> </ol>", "request_message_san": " -8 '${cn}'", @@ -291,7 +291,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 5d17d6ecc..8048b2295 100644 --- a/ipaserver/plugins/internal.py +++ b/ipaserver/plugins/internal.py @@ -426,7 +426,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": _("<ol> <li>Create a certificate database or use an existing one. To create a new database:<br/> <code># certutil -N -d <database path></code> </li> <li>Create a CSR with subject <em>CN=<${cn_name}>,O=<realm></em>, for example:<br/> <code># certutil -R -d <database path> -a -g <key size> -s 'CN=${cn},O=${realm}'${san}</code> </li> <li> Copy and paste the CSR (from <em>-----BEGIN NEW CERTIFICATE REQUEST-----</em> to <em>-----END NEW CERTIFICATE REQUEST-----</em>) into the text area below: </li> </ol>"), "request_message_san": _(" -8 '${cn}'"), @@ -434,7 +434,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 pull-down list."), "revoked": _("Certificate Revoked"), "revoked_status": _("REVOKED"), "serial_number": _("Serial Number"), |