From 7fb16fa84a05dd69494779049d794c012e2f2405 Mon Sep 17 00:00:00 2001 From: qiaomin Date: Thu, 26 Jan 2017 22:27:07 +0800 Subject: [PATCH] Use 'trimmed' for blocktrans in html page 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 --- disaster_recovery/actions/templates/actions/_action.html | 4 ++-- .../actions/templates/actions/_advanced.html | 6 +++--- disaster_recovery/actions/templates/actions/_rules.html | 4 ++-- .../actions/templates/actions/_snapshot.html | 8 ++++---- disaster_recovery/jobs/templates/jobs/_info.html | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/disaster_recovery/actions/templates/actions/_action.html b/disaster_recovery/actions/templates/actions/_action.html index 775cc97..2c7b184 100644 --- a/disaster_recovery/actions/templates/actions/_action.html +++ b/disaster_recovery/actions/templates/actions/_action.html @@ -2,9 +2,9 @@ {% block help_message %} -

{% blocktrans %}Action{% endblocktrans %}

+

{% blocktrans trimmed %}Action{% endblocktrans %}

-

{% blocktrans %}An action is the simplest execution within a job, it could be a backup or a restore +

{% 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 %}

diff --git a/disaster_recovery/actions/templates/actions/_advanced.html b/disaster_recovery/actions/templates/actions/_advanced.html index f70bc4e..3c761ea 100644 --- a/disaster_recovery/actions/templates/actions/_advanced.html +++ b/disaster_recovery/actions/templates/actions/_advanced.html @@ -2,10 +2,10 @@ {% block help_message %} -

{% blocktrans %}Advanced configuration{% endblocktrans %}

+

{% blocktrans trimmed %}Advanced configuration{% endblocktrans %}

-

{% blocktrans %}Define extra information for the action executed by the client.{% endblocktrans %}

+

{% blocktrans trimmed %}Define extra information for the action executed by the client.{% endblocktrans %}

{% endblock %} - \ No newline at end of file + diff --git a/disaster_recovery/actions/templates/actions/_rules.html b/disaster_recovery/actions/templates/actions/_rules.html index 5999642..f896c84 100644 --- a/disaster_recovery/actions/templates/actions/_rules.html +++ b/disaster_recovery/actions/templates/actions/_rules.html @@ -2,9 +2,9 @@ {% block help_message %} -

{% blocktrans %}Rules{% endblocktrans %}

+

{% blocktrans trimmed %}Rules{% endblocktrans %}

-

{% blocktrans %}Define the following action rules: +

{% blocktrans trimmed %}Define the following action rules: