fix error message to be i18n translator friendly

This error message was producing a warning from xgettext
because there were multiple substations in the string.
In some languages it may be necessary to reorder the
substitutions for a proper translation, this is only
possible if the substitutions use named values.
This commit is contained in:
John Dennis
2010-01-28 12:57:00 -05:00
committed by Rob Crittenden
parent 4f010cfda6
commit 487e1cadc8

View File

@@ -99,7 +99,8 @@ class ra(rabase.rabase):
if str(base).lower() != str(new_request).lower(): if str(base).lower() != str(new_request).lower():
subject_base='CN=%s, %s' % (hostname, subject_base) subject_base='CN=%s, %s' % (hostname, subject_base)
new_request.reverse() new_request.reverse()
raise errors.CertificateOperationError(error=_('Request subject \'%s\' does not match the form \'%s\'' % (", ".join(new_request), subject_base))) raise errors.CertificateOperationError(error=_('Request subject "%(request_subject)s" does not match the form "%(subject_base)s"') % \
{'request_subject' : ', '.join(new_request), 'subject_base' : subject_base})
except errors.CertificateOperationError, e: except errors.CertificateOperationError, e:
raise e raise e
except Exception, e: except Exception, e: