openstack/horizon
Code Issues Proposed changes

Remove concatenation in csv file

Browse Source 
The download CSV summary file from both the Admin and Project
overview pages includes concatenation in its contents.
The : needs to be included as part of the label so translators
have control of spacing. Note that the commas are part of the
CSV file format and should not be translated.

Change-Id: I13137fda9b3e93edf97a7539044e791d04017ea7
Closes-Bug: 1444135
This commit is contained in:
Doug Fish
2015-04-14 15:52:44 -05:00
committed by Lin Hua Cheng
parent f8ae162768
commit 472bf67896
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
openstack_dashboard/dashboards/admin/overview/templates/overview/usage.csv
View File

@@ -1,7 +1,7 @@
{% load i18n %}{% trans "Usage Report For Period" %}:,{{ usage.start|date:"Y-m-d" }},{{ usage.end|date:"Y-m-d" }}
{% trans "Active Instances" %}:,{{ usage.summary.instances }}
{% trans "Total VCPU Usage (Hours)" %}:,{{ usage.summary.vcpu_hours|floatformat:2 }}
{% trans "Total Active RAM (MB)" %}:,{{ usage.summary.memory_mb }}
{% trans "Total Memory Usage (Hours)" %}:,{{ usage.summary.memory_mb_hours|floatformat:2 }}
{% trans "Total Disk Size (GB)" %}:,{{ usage.summary.local_gb }}
{% trans "Total Disk Usage (Hours)" %}:,{{ usage.summary.disk_gb_hours|floatformat:2 }}
{% load i18n %}{% trans "Usage Report For Period:" %},{{ usage.start|date:"Y-m-d" }},{{ usage.end|date:"Y-m-d" }}
{% trans "Active Instances:" %},{{ usage.summary.instances }}
{% trans "Total VCPU Usage (Hours):" %},{{ usage.summary.vcpu_hours|floatformat:2 }}
{% trans "Total Active RAM (MB):" %},{{ usage.summary.memory_mb }}
{% trans "Total Memory Usage (Hours):" %},{{ usage.summary.memory_mb_hours|floatformat:2 }}
{% trans "Total Disk Size (GB):" %},{{ usage.summary.local_gb }}
{% trans "Total Disk Usage (Hours):" %},{{ usage.summary.disk_gb_hours|floatformat:2 }}
Can't render this file because it contains an unexpected character in line 1 and column 25.

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

@@ -1,8 +1,8 @@
{% load i18n %}{% trans "Usage Report For Period" %}:,{{ usage.start|date:"Y-m-d" }},{{ usage.end|date:"Y-m-d" }}
{% trans "Project ID" %}:,{{ usage.project_id }}
{% trans "Active Instances" %}:,{{ usage.summary.instances }}
{% trans "Total VCPU Usage (Hours)" %}:,{{ usage.summary.vcpu_hours|floatformat:2 }}
{% trans "Total Active RAM (MB)" %}:,{{ usage.summary.memory_mb }}
{% trans "Total Memory Usage (Hours)" %}:,{{ usage.summary.memory_mb_hours|floatformat:2 }}
{% trans "Total Disk Size (GB)" %}:,{{ usage.summary.local_gb }}
{% trans "Total Disk Usage (Hours)" %}:,{{ usage.summary.disk_gb_hours|floatformat:2 }}
{% load i18n %}{% trans "Usage Report For Period:" %},{{ usage.start|date:"Y-m-d" }},{{ usage.end|date:"Y-m-d" }}
{% trans "Project ID:" %},{{ usage.project_id }}
{% trans "Active Instances:" %},{{ usage.summary.instances }}
{% trans "Total VCPU Usage (Hours):" %},{{ usage.summary.vcpu_hours|floatformat:2 }}
{% trans "Total Active RAM (MB):" %},{{ usage.summary.memory_mb }}
{% trans "Total Memory Usage (Hours):" %},{{ usage.summary.memory_mb_hours|floatformat:2 }}
{% trans "Total Disk Size (GB):" %},{{ usage.summary.local_gb }}
{% trans "Total Disk Usage (Hours):" %},{{ usage.summary.disk_gb_hours|floatformat:2 }}
Can't render this file because it contains an unexpected character in line 1 and column 25.