diff options
| author | Nick Timkovich <npt@uchicago.edu> | 2017-08-04 12:56:19 -0500 |
|---|---|---|
| committer | Akihiro Motoki <amotoki@gmail.com> | 2017-11-14 12:06:17 +0000 |
| commit | edbf88fa796b946430d7461580edfceb5cc5ca80 (patch) | |
| tree | c96262ed1bf4045f77247490d9cc1003f13bab4f /horizon | |
| parent | d5900c33c2c531cc1ebdd3c3feb14a3ce819caf6 (diff) | |
| download | horizon-edbf88fa796b946430d7461580edfceb5cc5ca80.tar.gz | |
Use specified phrases in lieu of 'Used' for limit summary
Some resources, namely floating IPs, are limited based on those
allocated, rather than in actual use. The "Allocated" string is present
in the code but not used in the template. This effectively changes "Used
X of Y" to "Allocated X of Y" for floating IPs.
Change-Id: I7919b883a47d66b1e870862363d07e0f90bdbe7b
Closes-Bug: #1708733
Diffstat (limited to 'horizon')
| -rw-r--r-- | horizon/templates/horizon/common/_limit_summary.html | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/horizon/templates/horizon/common/_limit_summary.html b/horizon/templates/horizon/common/_limit_summary.html index b58ba8b4c..12c441d3a 100644 --- a/horizon/templates/horizon/common/_limit_summary.html +++ b/horizon/templates/horizon/common/_limit_summary.html @@ -13,21 +13,21 @@ <div class="quota_subtitle"> {% if quota.max|quotainf != '-1' %} {% if quota.type == "totalRAMUsed" %} - {% blocktrans trimmed with used=quota.used|mb_float_format available=quota.max|quotainf|mb_float_format %} - Used <span> {{ used }} </span>of<span> {{ available }} </span> + {% blocktrans trimmed with usedphrase=quota.text used=quota.used|mb_float_format available=quota.max|quotainf|mb_float_format %} + {{ usedphrase }} <span> {{ used }} </span>of<span> {{ available }} </span> {% endblocktrans %} {% elif quota.type == "totalGigabytesUsed" %} - {% blocktrans trimmed with used=quota.used|diskgbformat available=quota.max|quotainf|diskgbformat %} - Used <span> {{ used }} </span>of<span> {{ available }} </span> + {% blocktrans trimmed with usedphrase=quota.text used=quota.used|diskgbformat available=quota.max|quotainf|diskgbformat %} + {{ usedphrase }} <span> {{ used }} </span>of<span> {{ available }} </span> {% endblocktrans %} {% else %} - {% blocktrans trimmed with used=quota.used|intcomma available=quota.max|quotainf|intcomma %} - Used <span> {{ used }} </span>of<span> {{ available }} </span> + {% blocktrans trimmed with usedphrase=quota.text used=quota.used|intcomma available=quota.max|quotainf|intcomma %} + {{ usedphrase }} <span> {{ used }} </span>of<span> {{ available }} </span> {% endblocktrans %} {% endif %} {% else %} - {% blocktrans trimmed with used=quota.used|intcomma %} - Used <span> {{ used }} </span>(No Limit) + {% blocktrans trimmed with usedphrase=quota.text used=quota.used|intcomma %} + {{ usedphrase }} <span> {{ used }} </span>(No Limit) {% endblocktrans %} {% endif %} </div> |