diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2010-12-02 16:31:42 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2010-12-02 16:31:42 -0500 |
| commit | a41e69fba360d7cfc83e8592528562e06573533b (patch) | |
| tree | a6083668289531b51ceb36e101b7b08b2389e531 /ipalib/plugins/migration.py | |
| parent | 6c393e53b01222ba7629ce86384d0adb34f7f275 (diff) | |
| download | freeipa-a41e69fba360d7cfc83e8592528562e06573533b.tar.gz freeipa-a41e69fba360d7cfc83e8592528562e06573533b.tar.xz freeipa-a41e69fba360d7cfc83e8592528562e06573533b.zip | |
Add labels for passwords, fix output of exceptions, fix passwd output.
Passwords didn't have internationalizable labels.
Exceptions that occured during required input weren't printed as unicode
so weren't being translated properly.
Don't use output_for_cli() directly in the passwd plugin, use output.Output.
ticket 352
Diffstat (limited to 'ipalib/plugins/migration.py')
| -rw-r--r-- | ipalib/plugins/migration.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ipalib/plugins/migration.py b/ipalib/plugins/migration.py index 6dc993423..9f311911d 100644 --- a/ipalib/plugins/migration.py +++ b/ipalib/plugins/migration.py @@ -124,7 +124,7 @@ def _pre_migrate_group(ldap, pkey, dn, entry_attrs, failed, config, ctx): def validate_ldapuri(ugettext, ldapuri): m = re.match('^ldaps?://[-\w\.]+(:\d+)?$', ldapuri) if not m: - err_msg = 'Invalid LDAP URI.' + err_msg = _('Invalid LDAP URI.') raise errors.ValidationError(name='ldap_uri', error=err_msg) @@ -171,6 +171,7 @@ class migrate_ds(Command): ), Password('bindpw', cli_name='password', + label=_('Password'), doc=_('bind password'), ), ) |