Merge "fix gettext calls to work on uninterpolated strings"

This commit is contained in:
Jenkins 2013-08-10 05:43:02 +00:00 committed by Gerrit Code Review
commit fe659b231a
2 changed files with 4 additions and 4 deletions

View File

@ -154,8 +154,8 @@ class CreateImageForm(forms.SelfHandlingForm):
try:
image = api.glance.image_create(request, **meta)
messages.success(request,
_('Your image %s has been queued for creation.' %
data['name']))
_('Your image %s has been queued for creation.') %
data['name'])
return image
except:
exceptions.handle(request, _('Unable to create new image.'))

View File

@ -558,8 +558,8 @@ class DeletePMAssociationAction(workflows.Action):
request, *args, **kwargs)
def populate_monitor_id_choices(self, request, context):
self.fields['monitor_id'].label = _("Select a health monitor of %s" %
context['pool_name'])
self.fields['monitor_id'].label = (_("Select a health monitor of %s") %
context['pool_name'])
monitor_id_choices = [('', _("Select a Monitor"))]
try: