openstack
/
horizon
Code Issues Proposed changes

i18n: The same use of args with ugettext_lazy 

Different use of args in ungettext_lazy causes
error on import job from translation infrastructure
to horizon repository.

The use of variables in singular and plural strings
needs to be same. This commit also adjusts the string
with ugettext_lazy() as other strings are dealt with.

Change-Id: I9a836178b2d615504950545654242c0a4c196723
Closes-Bug: #1630507
This commit is contained in:
Ian Y. Choi 2016-10-15 23:14:52 +09:00 committed by Rob Cresswell
parent ce7dc70c7f
commit 0409080e7b
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openstack_dashboard/dashboards/project/instances/workflows/create_instance.py
View File

@ -26,7 +26,6 @@ import six
from django.template.defaultfilters import filesizeformat # noqa
from django.utils.text import normalize_newlines # noqa
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy
from django.views.decorators.debug import sensitive_variables # noqa
from horizon import exceptions
@ -211,15 +210,11 @@ class SetInstanceDetailsAction(workflows.Action):
usages = quotas.tenant_quota_usages(self.request)
available_count = usages['instances']['available']
if available_count < count:
error_message = ungettext_lazy(
'The requested instance cannot be launched as you only '
'have %(avail)i of your quota available. ',
'The requested %(req)i instances cannot be launched as you '
'only have %(avail)i of your quota available.',
count)
params = {'req': count,
'avail': available_count}
raise forms.ValidationError(error_message % params)
msg = (_('The requested instance(s) cannot be launched '
'as your quota will be exceeded: Available: '
'%(avail)s, Requested: %(req)s.')
% {'avail': available_count, 'req': count})
raise forms.ValidationError(msg)
source_type = cleaned_data.get('source_type')
if source_type in ('volume_image_id', 'volume_snapshot_id'):