summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
authorJohn Dennis <jdennis@redhat.com>2010-03-05 16:11:21 -0500
committerJason Gerard DeRose <jderose@redhat.com>2010-03-08 21:10:36 -0700
commitb75d06e18938015ad6eafe53e15aa2d7a2f92f02 (patch)
tree856e8b5457e91cb1a9bd628ef8ce82c99dc79657 /ipaserver
parentb9df4f7f29a638d3646c5ff1ffc33c00f7d715c6 (diff)
downloadfreeipa-b75d06e18938015ad6eafe53e15aa2d7a2f92f02.tar.gz
freeipa-b75d06e18938015ad6eafe53e15aa2d7a2f92f02.tar.xz
freeipa-b75d06e18938015ad6eafe53e15aa2d7a2f92f02.zip
localize doc strings
A number of doc strings were not localized, wrap them in _(). Some messages were not localized, wrap them in _() Fix a couple of failing tests: The method name in RPC should not be unicode. The doc attribute must use the .msg attribute for comparison. Also clean up imports of _() The import should come from ipalib or ipalib.text, not ugettext from request.
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/plugins/dogtag.py2
-rw-r--r--ipaserver/plugins/join.py9
-rw-r--r--ipaserver/plugins/selfsign.py2
3 files changed, 7 insertions, 6 deletions
diff --git a/ipaserver/plugins/dogtag.py b/ipaserver/plugins/dogtag.py
index 19e232830..4c572da47 100644
--- a/ipaserver/plugins/dogtag.py
+++ b/ipaserver/plugins/dogtag.py
@@ -1201,7 +1201,7 @@ from ipaserver.plugins import rabase
from ipalib.errors import NetworkError, CertificateOperationError
from ipalib.constants import TYPE_ERROR
from ipapython import dogtag
-from ipalib.request import ugettext as _
+from ipalib import _
class ra(rabase.rabase):
"""
diff --git a/ipaserver/plugins/join.py b/ipaserver/plugins/join.py
index fe9f88dd9..e2f72bfaf 100644
--- a/ipaserver/plugins/join.py
+++ b/ipaserver/plugins/join.py
@@ -25,6 +25,7 @@ from ipalib import api, util
from ipalib import Command, Str
from ipalib import errors
import krbV
+from ipalib import _
def get_realm():
"""
@@ -50,7 +51,7 @@ class join(Command):
Str('cn',
validate_host,
cli_name='hostname',
- doc="The hostname to register as",
+ doc=_("The hostname to register as"),
create_default=lambda **kw: unicode(util.get_fqdn()),
autofill=True,
#normalizer=lamda value: value.lower(),
@@ -58,17 +59,17 @@ class join(Command):
)
takes_options= (
Str('realm',
- doc="The IPA realm",
+ doc=_("The IPA realm"),
create_default=lambda **kw: get_realm(),
autofill=True,
),
Str('nshardwareplatform?',
cli_name='platform',
- doc='Hardware platform of the host (e.g. Lenovo T61)',
+ doc=_('Hardware platform of the host (e.g. Lenovo T61)'),
),
Str('nsosversion?',
cli_name='os',
- doc='Operating System and version of the host (e.g. Fedora 9)',
+ doc=_('Operating System and version of the host (e.g. Fedora 9)'),
),
)
diff --git a/ipaserver/plugins/selfsign.py b/ipaserver/plugins/selfsign.py
index 7dbe053a9..67b8efef9 100644
--- a/ipaserver/plugins/selfsign.py
+++ b/ipaserver/plugins/selfsign.py
@@ -46,7 +46,7 @@ from ipaserver.plugins import rabase
from ipaserver.install import certs
import tempfile
from pyasn1 import error
-from ipalib.request import ugettext as _
+from ipalib import _
from pyasn1.codec.der import encoder
from ipalib.plugins.cert import get_csr_hostname