diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-12-22 17:31:26 +0000 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-12-22 17:31:26 +0000 |
| commit | dfea8ce877866678a1ee1b66228c3c252bac3086 (patch) | |
| tree | 089b7665573c746277c124a9e8b52406b6ee1652 /nova/crypto.py | |
| parent | 902db577ea19459c9b01ed7b262024b900440573 (diff) | |
| parent | ff1575e782fb08fb3923a09cb1a18d703b33be4a (diff) | |
| download | nova-dfea8ce877866678a1ee1b66228c3c252bac3086.tar.gz nova-dfea8ce877866678a1ee1b66228c3c252bac3086.tar.xz nova-dfea8ce877866678a1ee1b66228c3c252bac3086.zip | |
merged i8n and fixed conflicts
Diffstat (limited to 'nova/crypto.py')
| -rw-r--r-- | nova/crypto.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/nova/crypto.py b/nova/crypto.py index dcc735c05..e4133ac85 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -39,33 +39,33 @@ from nova import flags FLAGS = flags.FLAGS -flags.DEFINE_string('ca_file', 'cacert.pem', 'Filename of root CA') +flags.DEFINE_string('ca_file', 'cacert.pem', _('Filename of root CA')) flags.DEFINE_string('key_file', os.path.join('private', 'cakey.pem'), - 'Filename of private key') + _('Filename of private key')) flags.DEFINE_string('crl_file', 'crl.pem', - 'Filename of root Certificate Revokation List') + _('Filename of root Certificate Revokation List')) flags.DEFINE_string('keys_path', '$state_path/keys', - 'Where we keep our keys') + _('Where we keep our keys')) flags.DEFINE_string('ca_path', '$state_path/CA', - 'Where we keep our root CA') + _('Where we keep our root CA')) flags.DEFINE_boolean('use_project_ca', False, - 'Should we use a CA for each project?') + _('Should we use a CA for each project?')) flags.DEFINE_string('user_cert_subject', '/C=US/ST=California/L=MountainView/O=AnsoLabs/' 'OU=NovaDev/CN=%s-%s-%s', - 'Subject for certificate for users, ' - '%s for project, user, timestamp') + _('Subject for certificate for users, ' + '%s for project, user, timestamp')) flags.DEFINE_string('project_cert_subject', '/C=US/ST=California/L=MountainView/O=AnsoLabs/' 'OU=NovaDev/CN=project-ca-%s-%s', - 'Subject for certificate for projects, ' - '%s for project, timestamp') + _('Subject for certificate for projects, ' + '%s for project, timestamp')) flags.DEFINE_string('vpn_cert_subject', '/C=US/ST=California/L=MountainView/O=AnsoLabs/' 'OU=NovaDev/CN=project-vpn-%s-%s', - 'Subject for certificate for vpns, ' - '%s for project, timestamp') + _('Subject for certificate for vpns, ' + '%s for project, timestamp')) def ca_folder(project_id=None): @@ -251,7 +251,7 @@ def _sign_csr(csr_text, ca_folder): csrfile = open(inbound, "w") csrfile.write(csr_text) csrfile.close() - logging.debug("Flags path: %s", ca_folder) + logging.debug(_("Flags path: %s") % ca_folder) start = os.getcwd() # Change working dir to CA os.chdir(ca_folder) |