Merge "Correct the create volume snapshot description and used of quota"
This commit is contained in:
commit
2b0147fad9
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
<h3>{% trans "Description:" %}</h3>
|
<h3>{% trans "Description:" %}</h3>
|
||||||
|
|
||||||
<p>{% blocktrans %}Volumes are block devices that can be attached to instances.{% endblocktrans %}</p>
|
<p>{% block title %}{% trans "Volumes are block devices that can be attached to instances." %}{% endblock %}</p>
|
||||||
|
|
||||||
<div id="id_show_volume_type_desc_div">
|
<div id="id_show_volume_type_desc_div">
|
||||||
<h3>{% trans "Volume Type Description:" %}</h3>
|
<h3>{% trans "Volume Type Description:" %}</h3>
|
||||||
@ -39,7 +39,9 @@
|
|||||||
<strong>{% block type_title %}{% trans "Number of Volumes" %}{% endblock %}</strong>
|
<strong>{% block type_title %}{% trans "Number of Volumes" %}{% endblock %}</strong>
|
||||||
</div>
|
</div>
|
||||||
<span class="pull-right">
|
<span class="pull-right">
|
||||||
|
{% block used_of_quota %}
|
||||||
{% blocktrans with used=usages.volumesUsed|intcomma quota=usages.maxTotalVolumes|intcomma|quotainf %}{{ used }} of {{ quota }} Used{% endblocktrans %}
|
{% blocktrans with used=usages.volumesUsed|intcomma quota=usages.maxTotalVolumes|intcomma|quotainf %}{{ used }} of {{ quota }} Used{% endblocktrans %}
|
||||||
|
{% endblock %}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -21,12 +21,8 @@
|
|||||||
{% trans "Number of Snapshots" %}
|
{% trans "Number of Snapshots" %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block used %}
|
{% block used_of_quota %}
|
||||||
{{ usages.snapshotsUsed|intcomma }}
|
{% blocktrans with used=usages.snapshotsUsed|intcomma quota=usages.maxTotalSnapshots|intcomma|quotainf %}{{ used }} of {{ quota }} Used{% endblocktrans %}
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block total %}
|
|
||||||
{{ usages.maxTotalSnapshots|intcomma|quota }}
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block type_id %}
|
{% block type_id %}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user