openstack/horizon
Code Issues Proposed changes

Do not include HTML tags in blocktrans

Browse Source 
It is not a good idea to include HTML tags in blocktrans.
This confused translators and potentially leads to translation error.
In this case, there is no need to do so.

This commit moves HTML tags outside of blocktrans.

Change-Id: I6f45f1331de8fd5ca4b33f45b008f913dd325a13
This commit is contained in:
Akihiro Motoki 2017-03-25 14:54:56 +00:00
parent 1a0206d77e
commit 4e471a68a2
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
openstack_dashboard/dashboards/project/instances/templates/instances/_flavors_and_quotas.html
View File

@ -19,9 +19,11 @@
<h4>{% trans "Project Limits" %}</h4>
<div class="quota_title">
<strong class="pull-left">{% trans "Number of Instances" %}</strong>
{% blocktrans trimmed with used=usages.totalInstancesUsed|intcomma quota=usages.maxTotalInstances|intcomma|quotainf %}
<span class="pull-right">{{ used }} of {{ quota }} Used</span>
{% endblocktrans %}
<span class="pull-right">
{% blocktrans trimmed with used=usages.totalInstancesUsed|intcomma quota=usages.maxTotalInstances|intcomma|quotainf %}
{{ used }} of {{ quota }} Used
{% endblocktrans %}
</span>
</div>
{{ minifyspace }}
@ -37,9 +39,11 @@
<div class="quota_title">
<strong class="pull-left">{% trans "Number of VCPUs" %}</strong>
{% blocktrans trimmed with used=usages.totalCoresUsed|intcomma quota=usages.maxTotalCores|intcomma|quotainf %}
<span class="pull-right">{{ used }} of {{ quota }} Used</span>
{% endblocktrans %}
<span class="pull-right">
{% blocktrans trimmed with used=usages.totalCoresUsed|intcomma quota=usages.maxTotalCores|intcomma|quotainf %}
{{ used }} of {{ quota }} Used
{% endblocktrans %}
</span>
</div>
{{ minifyspace }}
@ -55,9 +59,11 @@
<div class="quota_title">
<strong class="pull-left">{% trans "Total RAM" %}</strong>
{% blocktrans trimmed with used=usages.totalRAMUsed|intcomma quota=usages.maxTotalRAMSize|intcomma|quotainf %}
<span class="pull-right">{{ used }} of {{ quota }} MB Used</span>
{% endblocktrans %}
<span class="pull-right">
{% blocktrans trimmed with used=usages.totalRAMUsed|intcomma quota=usages.maxTotalRAMSize|intcomma|quotainf %}
{{ used }} of {{ quota }} MB Used
{% endblocktrans %}
</span>
</div>
{{ minifyspace }}
@ -74,8 +80,11 @@
{% if cinder_enabled %}
<div class="quota_title">
<strong class="pull-left">{% trans "Number of Volumes" %}</strong>
{% blocktrans with used=usages.totalVolumesUsed|intcomma quota=usages.maxTotalVolumes|intcomma|quotainf %}
<span class="pull-right">{{ used }} of {{ quota }} Used</span>{% endblocktrans %}
<span class="pull-right">
{% blocktrans with used=usages.totalVolumesUsed|intcomma quota=usages.maxTotalVolumes|intcomma|quotainf %}
{{ used }} of {{ quota }} Used
{% endblocktrans %}
</span>
</div>
<div id="quota_volume"
class="quota_bar"
@ -88,8 +97,11 @@
<div class="quota_title">
<strong class="pull-left">{% trans "Total Volume Storage" %}</strong>
{% blocktrans with used=usages.gigabytesUsed|intcomma quota=usages.maxTotalVolumeGigabytes|intcomma|quotainf %}
<span class="pull-right">{{ used }} of {{ quota }} GiB Used</span>{% endblocktrans %}
<span class="pull-right">
{% blocktrans with used=usages.gigabytesUsed|intcomma quota=usages.maxTotalVolumeGigabytes|intcomma|quotainf %}
{{ used }} of {{ quota }} GiB Used
{% endblocktrans %}
</span>
</div>
<div id="quota_volume_storage"
class="quota_bar"