Merge "Remove I18N strings from test/settings.py"

This commit is contained in:
Jenkins 2014-03-15 13:42:49 +00:00 committed by Gerrit Code Review
commit a769bd08f0
1 changed files with 6 additions and 8 deletions

View File

@ -12,8 +12,6 @@
import os
from django.utils.translation import ugettext_lazy as _
from horizon.test.settings import * # noqa
from horizon.utils import secret_key
@ -206,11 +204,11 @@ POLICY_FILES = {
FLAVOR_EXTRA_KEYS = {
'flavor_keys': [
('quota:read_bytes_sec', _('Quota: Read bytes')),
('quota:write_bytes_sec', _('Quota: Write bytes')),
('quota:cpu_quota', _('Quota: CPU')),
('quota:cpu_period', _('Quota: CPU period')),
('quota:inbound_average', _('Quota: Inbound average')),
('quota:outbound_average', _('Quota: Outbound average')),
('quota:read_bytes_sec', 'Quota: Read bytes'),
('quota:write_bytes_sec', 'Quota: Write bytes'),
('quota:cpu_quota', 'Quota: CPU'),
('quota:cpu_period', 'Quota: CPU period'),
('quota:inbound_average', 'Quota: Inbound average'),
('quota:outbound_average', 'Quota: Outbound average'),
]
}