Merge "Use 'trimmed' for blocktrans in html page"

This commit is contained in:
Jenkins 2016-06-17 13:35:13 +00:00 committed by Gerrit Code Review
commit d791127dbd
4 changed files with 5 additions and 5 deletions

View File

@ -111,7 +111,7 @@
{% else %}
<p class="col-xs-12 alert alert-info">
{% if no_apps %}
{% blocktrans %}There are no applications in the catalog. You can import apps from
{% blocktrans trimmed %}There are no applications in the catalog. You can import apps from
<a href="{{ repo_url }}" target="_blank"> {{ repo_url }}</a>.{% endblocktrans %}
<br><br>
{% blocktrans trimmed %}Go to

View File

@ -28,7 +28,7 @@
<div class='description-by_name'>
<h3>{% trans "Description" %}:</h3>
<p><strong>{% trans "Bundle Name" %}: </strong>{% trans "Bundle's full name."%}</p>
<p>{% blocktrans %}The bundle is going to be installed from <a href="{{murano_repo_url}}" target="_blank">{{murano_repo_url}}</a> repository.{% endblocktrans %}</p>
<p>{% blocktrans trimmed %}The bundle is going to be installed from <a href="{{murano_repo_url}}" target="_blank">{{murano_repo_url}}</a> repository.{% endblocktrans %}</p>
</div>
<div class='description-by_url'>
<h3>{% trans "Description" %}:</h3>

View File

@ -46,7 +46,7 @@
<h3>{% trans "Description" %}:</h3>
<p><strong>{% trans "Package Name" %}: </strong>{% trans "Fully qualified package name." %}</p>
<p><strong>{% trans "Package Version" %}: </strong>{% trans "Version of the package (optional)." %}</p>
<p>{% blocktrans %}The package is going to be imported from <a href="{{murano_repo_url}}" target="_blank">{{murano_repo_url}}</a> repository.{% endblocktrans %}</p>
<p>{% blocktrans trimmed %}The package is going to be imported from <a href="{{murano_repo_url}}" target="_blank">{{murano_repo_url}}</a> repository.{% endblocktrans %}</p>
</div>
<div class='description-by_url'>
<h3>{% trans "Description" %}:</h3>

View File

@ -14,7 +14,7 @@
</dd><br>
{% elif key == 'Instances' %}
{% for instance in value %}
<dt>{% blocktrans %}Instance{{forloop.counter}} name{% endblocktrans %}</dt>
<dt>{% blocktrans trimmed %}Instance{{forloop.counter}} name{% endblocktrans %}</dt>
<dd>
<a href=" {% url 'horizon:project:instances:detail' instance.id %}">
{{ instance.name }}
@ -30,7 +30,7 @@
</dd><br>
{% elif key == 'Stacks'%}
{% for stack in value %}
<dt>{% blocktrans %}Heat Orchestration stack{{forloop.counter}} name{% endblocktrans %}</dt>
<dt>{% blocktrans trimmed %}Heat Orchestration stack{{forloop.counter}} name{% endblocktrans %}</dt>
<dd>
<a href=" {% url 'horizon:project:stacks:detail' stack.id %}">
{{ stack.name }}