openstack/freezer-web-ui
Code Issues Proposed changes

Use 'trimmed' for blocktrans in html page

Browse Source 
Add trimmed option to blocktrans, blocktrans trimmed
option removes newlines from contents of blocktrans
and replaces any whitespace at the beginning and end of a line into
a single space. This makes translator life easier.
More detail is described in the bug report.

Change-Id: I9a5c3e958260a94d8a44dc3946e25a690f00f30e
Closes-Bug: #1659559
This commit is contained in:
qiaomin
2017-01-26 22:27:07 +08:00
parent df797b87dd
commit 7fb16fa84a
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
disaster_recovery/actions/templates/actions/_action.html
+2 -2
View File
@@ -2,9 +2,9 @@
{% block help_message %}
<h4>{% blocktrans %}Action{% endblocktrans %}</h4>
<h4>{% blocktrans trimmed %}Action{% endblocktrans %}</h4>
<p>{% blocktrans %}An action is the simplest execution within a job, it could be a backup or a restore
<p>{% blocktrans trimmed %}An action is the simplest execution within a job, it could be a backup or a restore
and it contains rules that the action must follow (max retries, interval between executions, etc).{% endblocktrans %}</p>
<p id="restore-warning" class="has-error">
disaster_recovery/actions/templates/actions/_advanced.html
+3 -3
View File
@@ -2,10 +2,10 @@
{% block help_message %}
<h4>{% blocktrans %}Advanced configuration{% endblocktrans %}</h4>
<h4>{% blocktrans trimmed %}Advanced configuration{% endblocktrans %}</h4>
<p>{% blocktrans %}Define extra information for the action executed by the client.{% endblocktrans %}</p>
<p>{% blocktrans trimmed %}Define extra information for the action executed by the client.{% endblocktrans %}</p>
{% endblock %}
<script type='text/javascript' src='{{ STATIC_URL }}freezer/js/freezer.actions.advanced.js'></script>
<script type='text/javascript' src='{{ STATIC_URL }}freezer/js/freezer.actions.advanced.js'></script>
disaster_recovery/actions/templates/actions/_rules.html
+2 -2
View File
@@ -2,9 +2,9 @@
{% block help_message %}
<h4>{% blocktrans %}Rules{% endblocktrans %}</h4>
<h4>{% blocktrans trimmed %}Rules{% endblocktrans %}</h4>
<p>{% blocktrans %}Define the following action rules:
<p>{% blocktrans trimmed %}Define the following action rules:
<ul>
<li>Number of retries</li>
<li>Retries interval</li>
disaster_recovery/actions/templates/actions/_snapshot.html
+4 -4
View File
@@ -2,12 +2,12 @@
{% block help_message %}
<h4>{% blocktrans %}Snapshot{% endblocktrans %}</h4>
<h4>{% blocktrans trimmed %}Snapshot{% endblocktrans %}</h4>
<p>{% blocktrans %}The snapshot technologies currently supported are LVM for Linux and Volume Shadow Copy for Windows.{% endblocktrans %}</p>
<p>{% blocktrans trimmed %}The snapshot technologies currently supported are LVM for Linux and Volume Shadow Copy for Windows.{% endblocktrans %}</p>
<p>{% blocktrans %}For Linux, in order to use snapshot features, the data has to reside on an LVM volume.{% endblocktrans %}</p>
<p>{% blocktrans trimmed %}For Linux, in order to use snapshot features, the data has to reside on an LVM volume.{% endblocktrans %}</p>
{% endblock %}
<script type='text/javascript' src='{{ STATIC_URL }}freezer/js/freezer.actions.snapshot.js'></script>
<script type='text/javascript' src='{{ STATIC_URL }}freezer/js/freezer.actions.snapshot.js'></script>
disaster_recovery/jobs/templates/jobs/_info.html
+4 -4
View File
@@ -1,13 +1,13 @@
{% load i18n horizon humanize %}
{% block help_message %}
<h4>{% blocktrans %}Job{% endblocktrans %}</h4>
<p>{% blocktrans %}Describes actions to be executed by a client.{% endblocktrans %}</p>
<p>{% blocktrans %}Job executions can be executed and scheduled, by providing the following settings.{% endblocktrans %}</p>
<h4>{% blocktrans trimmed %}Job{% endblocktrans %}</h4>
<p>{% blocktrans trimmed %}Describes actions to be executed by a client.{% endblocktrans %}</p>
<p>{% blocktrans trimmed %}Job executions can be executed and scheduled, by providing the following settings.{% endblocktrans %}</p>
<link rel="stylesheet" href="{{ STATIC_URL }}freezer/css/bootstrap-datetimepicker.min.css">
<script type='text/javascript' src='{{ STATIC_URL }}freezer/js/vendor/moment.js'></script>
<script type='text/javascript' src='{{ STATIC_URL }}freezer/js/vendor/bootstrap-datetimepicker.js'></script>
<script type='text/javascript' src='{{ STATIC_URL }}freezer/js/freezer.datetimepicker.js'></script>
{% endblock %}
{% endblock %}