[Freeipa-devel] [PATCH 0545] cert.py: split doctring to multiple ugettext strings
Make life of translators easier, there was recent change in cert.py
docstring, so they have to translate the whole docstring again, so I'm
splitting it to multiple parts.
Patch attached
From c2b71ea436cef0901493a742d15fa762f37677ed Mon Sep 17 00:00:00 2001
From: Martin Basti
Date: Wed, 29 Jun 2016 17:49:47 +0200
Subject: [PATCH] cert.py split module docstring to multiple ugetext string
It is hard to translate whole dosctring again and again aftear each
minor change. This split will make life for translators easier. (Just note: dosctring was
changed and that is the reason why I'm sending this, because translators
must translate it again anyway)
---
ipaserver/plugins/cert.py | 76 +++
1 file changed, 38 insertions(+), 38 deletions(-)
diff --git a/ipaserver/plugins/cert.py b/ipaserver/plugins/cert.py
index 888621fc5af634b95addc9c0ade58c76ce42edfe..a7e31a5c4c4504752ffd963b5a772ac6cfb7c302 100644
--- a/ipaserver/plugins/cert.py
+++ b/ipaserver/plugins/cert.py
@@ -56,89 +56,89 @@ if six.PY3:
__doc__ = _("""
IPA certificate operations
-
+""") + _("""
Implements a set of commands for managing server SSL certificates.
-
+""") + _("""
Certificate requests exist in the form of a Certificate Signing Request (CSR)
in PEM format.
-
+""") + _("""
The dogtag CA uses just the CN value of the CSR and forces the rest of the
subject to values configured in the server.
-
+""") + _("""
A certificate is stored with a service principal and a service principal
needs a host.
-
+""") + _("""
In order to request a certificate:
-
+""") + _("""
* The host must exist
* The service must exist (or you use the --add option to automatically add it)
-
+""") + _("""
SEARCHING:
-
+""") + _("""
Certificates may be searched on by certificate subject, serial number,
revocation reason, validity dates and the issued date.
-
+""") + _("""
When searching on dates the _from date does a >= search and the _to date
does a <= search. When combined these are done as an AND.
-
+""") + _("""
Dates are treated as GMT to match the dates in the certificates.
-
+""") + _("""
The date format is -mm-dd.
-
+""") + _("""
EXAMPLES:
-
+""") + _("""
Request a new certificate and add the principal:
ipa cert-request --add --principal=HTTP/lion.example.com example.csr
-
+""") + _("""
Retrieve an existing certificate:
ipa cert-show 1032
-
+""") + _("""
Revoke a certificate (see RFC 5280 for reason details):
ipa cert-revoke --revocation-reason=6 1032
-
+""") + _("""
Remove a certificate from revocation hold status:
ipa cert-remove-hold 1032
-
+""") + _("""
Check the status of a signing request:
ipa cert-status 10
-
+""") + _("""
Search for certificates by hostname:
ipa cert-find --subject=ipaserver.example.com
-
+""") + _("""
Search for revoked certificates by reason:
ipa cert-find --revocation-reason=5
-
+""") + _("""
Search for certificates based on issuance date
ipa cert-find --issuedon-from=2013-02-01 --issuedon-to=2013-02-07
-
+""") + _("""
Search for certificates owned by a specific user:
ipa cert-find --user=user
-
+""") + _("""
Examine a certificate:
ipa cert-find --file=cert.pem --all
-
+""") + _("""
Verify that a certificate is owner by a specific user:
ipa cert-find --file=cert.pem --user=user
-
+""") + _("""
IPA currently immediately issues (or declines) all certificate requests so
the status of a request is not normally useful. This is for future use
or the case where a CA does not immediately issue a certificate.
-
+""") + _("""
The following revocation reasons are supported:
-
-* 0 - unspecified
-* 1 - keyCompromise
-* 2 - cACompromise
-* 3 - affiliationChanged
-* 4 - superseded
-* 5 - cessationOfOperation
-* 6 - certificateHold
-* 8 - removeFromCRL
-* 9 - privilegeWithdrawn
-* 10 - aACompromise
-
+""") + (
+_("* 0 - unspecified") +
+_("* 1 - keyCompromise") +
+_("* 2 - cACompromise") +
+_("* 3 - affiliationChanged") +
+_("* 4 - superseded") +
+_("* 5 - cessationOfOperation") +
+_("* 6 - certificateHold") +
+_("* 8 - removeFromCRL") +
+_("* 9 - privilegeWithdrawn") +
+_("* 10 - aACompromise")
+) + _("""
Note that reason code 7 is not used. See RFC 5280 for more details:
-
+""") + _("""
http://www.ietf.org/rfc/rfc5280.txt
""")
--
2.5.5
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
Re: [Freeipa-devel] [PATCH 0545] cert.py: split doctring to multiple ugettext strings
On 06/30/2016 09:18 AM, Martin Basti wrote: Make life of translators easier, there was recent change in cert.py docstring, so they have to translate the whole docstring again, so I'm splitting it to multiple parts. Patch attached I'm not sure whether the "See RFC 5280 for more details" should be split from the link. Also, you need to add "\n" at the end of each reason string (you're not using multiline strings there). -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
Re: [Freeipa-devel] [PATCH 0545] cert.py: split doctring to multiple ugettext strings
On 30.06.2016 10:13, Stanislav Laznicka wrote:
On 06/30/2016 09:18 AM, Martin Basti wrote:
Make life of translators easier, there was recent change in cert.py
docstring, so they have to translate the whole docstring again, so
I'm splitting it to multiple parts.
Patch attached
I'm not sure whether the "See RFC 5280 for more details" should be
split from the link.
It doesn't matter
Also, you need to add "\n" at the end of each reason string (you're
not using multiline strings there).
Fixed, patch attached
From 40b5c73a1528fedeacc0a38bab0417c9f91966a5 Mon Sep 17 00:00:00 2001
From: Martin Basti
Date: Wed, 29 Jun 2016 17:49:47 +0200
Subject: [PATCH] cert.py split module docstring to multiple ugetext string
It is hard to translate whole dosctring again and again aftear each
minor change. This split will make life for translators easier. (Just note: dosctring was
changed and that is the reason why I'm sending this, because translators
must translate it again anyway)
---
ipaserver/plugins/cert.py | 74 +++
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/ipaserver/plugins/cert.py b/ipaserver/plugins/cert.py
index 888621fc5af634b95addc9c0ade58c76ce42edfe..63351c54c134f2bd58e8eb18bb0dc3bc6a5734b3 100644
--- a/ipaserver/plugins/cert.py
+++ b/ipaserver/plugins/cert.py
@@ -56,89 +56,89 @@ if six.PY3:
__doc__ = _("""
IPA certificate operations
-
+""") + _("""
Implements a set of commands for managing server SSL certificates.
-
+""") + _("""
Certificate requests exist in the form of a Certificate Signing Request (CSR)
in PEM format.
-
+""") + _("""
The dogtag CA uses just the CN value of the CSR and forces the rest of the
subject to values configured in the server.
-
+""") + _("""
A certificate is stored with a service principal and a service principal
needs a host.
-
+""") + _("""
In order to request a certificate:
-
+""") + _("""
* The host must exist
* The service must exist (or you use the --add option to automatically add it)
-
+""") + _("""
SEARCHING:
-
+""") + _("""
Certificates may be searched on by certificate subject, serial number,
revocation reason, validity dates and the issued date.
-
+""") + _("""
When searching on dates the _from date does a >= search and the _to date
does a <= search. When combined these are done as an AND.
-
+""") + _("""
Dates are treated as GMT to match the dates in the certificates.
-
+""") + _("""
The date format is -mm-dd.
-
+""") + _("""
EXAMPLES:
-
+""") + _("""
Request a new certificate and add the principal:
ipa cert-request --add --principal=HTTP/lion.example.com example.csr
-
+""") + _("""
Retrieve an existing certificate:
ipa cert-show 1032
-
+""") + _("""
Revoke a certificate (see RFC 5280 for reason details):
ipa cert-revoke --revocation-reason=6 1032
-
+""") + _("""
Remove a certificate from revocation hold status:
ipa cert-remove-hold 1032
-
+""") + _("""
Check the status of a signing request:
ipa cert-status 10
-
+""") + _("""
Search for certificates by hostname:
ipa cert-find --subject=ipaserver.example.com
-
+""") + _("""
Search for revoked certificates by reason:
ipa cert-find --revocation-reason=5
-
+""") + _("""
Search for certificates based on issuance date
ipa cert-find --issuedon-from=2013-02-01 --issuedon-to=2013-02-07
-
+""") + _("""
Search for certificates owned by a specific user:
ipa cert-find --user=user
-
+""") + _("""
Examine a certificate:
ipa cert-find --file=cert.pem --all
-
+""") + _("""
Verify that a certificate is owner by a specific user:
ipa cert-find --file=cert.pem --user=user
-
+""") + _("""
IPA currently immediately issues (or declines) all certificate requests so
the status of a request is not normally useful. This is for future use
or the case where a CA does not immediately issue a certificate.
-
+""") + _("""
The following revocation reasons are supported:
-* 0 - unspecified
-* 1 - keyCompromise
-* 2 - cACompromise
-* 3 - affiliationChanged
-* 4 - superseded
-* 5 - cessationOfOperation
-* 6 - certificateHold
-* 8 - removeFromCRL
-* 9 - privilegeWithdrawn
-* 10 - aACompromise
-
+""") + _("""* 0 - unspecified
+""") + _("""* 1 - keyCompromise
+""") + _("""* 2 - cACompromise
+""") + _("""* 3 - affiliationChanged
+""") + _("""* 4 - superseded
+""") + _("""* 5 - cessationOfOperation
+""") + _("""* 6 - certificateHold
+""") + _("""* 8 - removeFromCRL
+""") + _("""* 9 - privilegeWithdrawn
+""") + _("""* 10 - aACompromise
+""") + _("""
Note that reason code 7 is not used. See RFC 5280 for more details:
-
+""") + _("""
http://www.ietf.org/rfc/rfc5280.txt
""")
--
2.5.5
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
Re: [Freeipa-devel] [PATCH 0545] cert.py: split doctring to multiple ugettext strings
On 06/30/2016 01:08 PM, Martin Basti wrote: On 30.06.2016 10:13, Stanislav Laznicka wrote: On 06/30/2016 09:18 AM, Martin Basti wrote: Make life of translators easier, there was recent change in cert.py docstring, so they have to translate the whole docstring again, so I'm splitting it to multiple parts. Patch attached I'm not sure whether the "See RFC 5280 for more details" should be split from the link. It doesn't matter Also, you need to add "\n" at the end of each reason string (you're not using multiline strings there). Fixed, patch attached Looks good to me, ACK. -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
Re: [Freeipa-devel] [PATCH 0545] cert.py: split doctring to multiple ugettext strings
On 30.06.2016 13:20, Stanislav Laznicka wrote: On 06/30/2016 01:08 PM, Martin Basti wrote: On 30.06.2016 10:13, Stanislav Laznicka wrote: On 06/30/2016 09:18 AM, Martin Basti wrote: Make life of translators easier, there was recent change in cert.py docstring, so they have to translate the whole docstring again, so I'm splitting it to multiple parts. Patch attached I'm not sure whether the "See RFC 5280 for more details" should be split from the link. It doesn't matter Also, you need to add "\n" at the end of each reason string (you're not using multiline strings there). Fixed, patch attached Looks good to me, ACK. Pushed to master: fed9d9aaa73604f6e100acbe2d3c192f4e4676e8 -- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
