openstack
/
horizon
Code Issues Proposed changes

change spelling Ram to RAM for consistency 

Change-Id: I0d53e674e83457fd7212a5d1da7ca2f31f75d448
Closes-Bug: #1347955
This commit is contained in:
Cindy Lu 2014-07-23 16:36:26 -07:00
parent 8c9b86f130
commit 657db22105
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/dashboards/admin/overview/tests.py
View File

@ -183,7 +183,7 @@ class UsageViewTests(test.BaseAdminViewTests):
res = self.client.get(csv_url)
self.assertTemplateUsed(res, 'admin/overview/usage.csv')
self.assertTrue(isinstance(res.context['usage'], usage.GlobalUsage))
hdr = 'Project Name,VCPUs,Ram (MB),Disk (GB),Usage (Hours)'
hdr = 'Project Name,VCPUs,RAM (MB),Disk (GB),Usage (Hours)'
self.assertContains(res, '%s\r\n' % hdr)
if nova_stu_enabled:

2
openstack_dashboard/dashboards/admin/overview/views.py
View File

@ -30,7 +30,7 @@ from openstack_dashboard import usage
class GlobalUsageCsvRenderer(csvbase.BaseCsvResponse):
columns = [_("Project Name"), _("VCPUs"), _("Ram (MB)"),
columns = [_("Project Name"), _("VCPUs"), _("RAM (MB)"),
_("Disk (GB)"), _("Usage (Hours)")]
def get_row_data(self):

2
openstack_dashboard/dashboards/admin/projects/tests.py
View File

@ -1588,7 +1588,7 @@ class UsageViewTests(test.BaseAdminViewTests):
self.assertTemplateUsed(res, 'project/overview/usage.csv')
self.assertTrue(isinstance(res.context['usage'], usage.ProjectUsage))
hdr = ('Instance Name,VCPUs,Ram (MB),Disk (GB),Usage (Hours),'
hdr = ('Instance Name,VCPUs,RAM (MB),Disk (GB),Usage (Hours),'
'Uptime(Seconds),State')
self.assertContains(res, '%s\r\n' % hdr)

2
openstack_dashboard/dashboards/project/images/images/forms.py
View File

@ -82,7 +82,7 @@ class CreateImageForm(forms.SelfHandlingForm):
' value defaults to 0'
' (no minimum).'),
required=False)
minimum_ram = forms.IntegerField(label=_("Minimum Ram (MB)"),
minimum_ram = forms.IntegerField(label=_("Minimum RAM (MB)"),
help_text=_('The minimum memory size'
' required to boot the'
' image. If unspecified, this'

2
openstack_dashboard/dashboards/project/overview/templates/overview/usage.csv
View File

@ -2,6 +2,6 @@
{% trans "Project ID" %}:,{{ usage.project_id }}
{% trans "Active Instances" %}:,{{ usage.summary.instances }}
{% trans "CPU-HRs Used" %}:,{{ usage.summary.vcpu_hours|floatformat:2 }}
{% trans "Total Active Ram (MB)" %}:,{{ usage.summary.memory_mb }}
{% trans "Total Active RAM (MB)" %}:,{{ usage.summary.memory_mb }}
{% trans "Total Disk Size" %}:,{{ usage.summary.local_gb }}
{% trans "Total Disk Usage" %}:,{{ usage.summary.disk_gb_hours|floatformat:2 }}

Can't render this file because it contains an unexpected character in line 1 and column 25.

2
openstack_dashboard/dashboards/project/overview/views.py
View File

@ -29,7 +29,7 @@ from openstack_dashboard import usage
class ProjectUsageCsvRenderer(csvbase.BaseCsvResponse):
columns = [_("Instance Name"), _("VCPUs"), _("Ram (MB)"),
columns = [_("Instance Name"), _("VCPUs"), _("RAM (MB)"),
_("Disk (GB)"), _("Usage (Hours)"),
_("Uptime(Seconds)"), _("State")]