From 6657919d872d47dfa26e7b56142b676fb34dac96 Mon Sep 17 00:00:00 2001 From: qiaomin Date: Tue, 10 Jan 2017 15:30:41 +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: I835167eeec4f8596cec9c906548b3fa557ed1374 Closes-Bug: #1655249 --- .../templates/database_backups/_backup_details_help.html | 4 ++-- .../templates/database_clusters/_reset_password.html | 4 ++-- .../templates/databases/_launch_advanced_help.html | 2 +- .../databases/templates/databases/_launch_details_help.html | 4 ++-- .../templates/databases/_launch_initialize_help.html | 6 +++--- .../databases/templates/databases/_launch_network_help.html | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/trove_dashboard/content/database_backups/templates/database_backups/_backup_details_help.html b/trove_dashboard/content/database_backups/templates/database_backups/_backup_details_help.html index 21cf270..163ef75 100644 --- a/trove_dashboard/content/database_backups/templates/database_backups/_backup_details_help.html +++ b/trove_dashboard/content/database_backups/templates/database_backups/_backup_details_help.html @@ -1,4 +1,4 @@ {% load i18n %} -

{% blocktrans %}Specify the details for the database backup.{% endblocktrans %}

-

{% blocktrans %}You can perform an incremental backup by specifying a parent backup. However, not all databases support incremental backups in which case this operation will result in an error.{% endblocktrans %}

+

{% blocktrans trimmed %}Specify the details for the database backup.{% endblocktrans %}

+

{% blocktrans trimmed %}You can perform an incremental backup by specifying a parent backup. However, not all databases support incremental backups in which case this operation will result in an error.{% endblocktrans %}

diff --git a/trove_dashboard/content/database_clusters/templates/database_clusters/_reset_password.html b/trove_dashboard/content/database_clusters/templates/database_clusters/_reset_password.html index 1d91755..a95023a 100644 --- a/trove_dashboard/content/database_clusters/templates/database_clusters/_reset_password.html +++ b/trove_dashboard/content/database_clusters/templates/database_clusters/_reset_password.html @@ -14,11 +14,11 @@
-

{% blocktrans %}Specify the new root password for vertica cluster.{% endblocktrans %}

+

{% blocktrans trimmed %}Specify the new root password for vertica cluster.{% endblocktrans %}

{% endblock %} {% block modal-footer %} {% trans "Cancel" %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/trove_dashboard/content/databases/templates/databases/_launch_advanced_help.html b/trove_dashboard/content/databases/templates/databases/_launch_advanced_help.html index 89de324..46915d2 100644 --- a/trove_dashboard/content/databases/templates/databases/_launch_advanced_help.html +++ b/trove_dashboard/content/databases/templates/databases/_launch_advanced_help.html @@ -1,3 +1,3 @@ {% load i18n %} -

{% blocktrans %}Optionally choose to create this database using a previous backup, or as a replica of another database instance.{% endblocktrans %}

+

{% blocktrans trimmed %}Optionally choose to create this database using a previous backup, or as a replica of another database instance.{% endblocktrans %}

diff --git a/trove_dashboard/content/databases/templates/databases/_launch_details_help.html b/trove_dashboard/content/databases/templates/databases/_launch_details_help.html index aba6b7a..37aeb33 100644 --- a/trove_dashboard/content/databases/templates/databases/_launch_details_help.html +++ b/trove_dashboard/content/databases/templates/databases/_launch_details_help.html @@ -1,4 +1,4 @@ {% load i18n %} -

{% blocktrans %}Specify the details for launching an instance.{% endblocktrans %}

-

{% blocktrans %}Please note: The value specified in the Volume Size field should be greater than 0, however, some configurations do not support specifying volume size. If specifying the volume size results in an error stating volume support is not enabled, enter 0.{% endblocktrans %}

+

{% blocktrans trimmed %}Specify the details for launching an instance.{% endblocktrans %}

+

{% blocktrans trimmed %}Please note: The value specified in the Volume Size field should be greater than 0, however, some configurations do not support specifying volume size. If specifying the volume size results in an error stating volume support is not enabled, enter 0.{% endblocktrans %}

diff --git a/trove_dashboard/content/databases/templates/databases/_launch_initialize_help.html b/trove_dashboard/content/databases/templates/databases/_launch_initialize_help.html index 1d4f107..408b62c 100644 --- a/trove_dashboard/content/databases/templates/databases/_launch_initialize_help.html +++ b/trove_dashboard/content/databases/templates/databases/_launch_initialize_help.html @@ -5,14 +5,14 @@ 
database1, database2, database3

{% trans "Initial Admin User" %}

-

{% blocktrans %}Create an optional initial user. +

{% blocktrans trimmed %}Create an optional initial user. This user will have access to all databases you create.{% endblocktrans %}

\ No newline at end of file + diff --git a/trove_dashboard/content/databases/templates/databases/_launch_network_help.html b/trove_dashboard/content/databases/templates/databases/_launch_network_help.html index d7d8bda..18a9aac 100644 --- a/trove_dashboard/content/databases/templates/databases/_launch_network_help.html +++ b/trove_dashboard/content/databases/templates/databases/_launch_network_help.html @@ -1,7 +1,7 @@ {% load i18n %}

- {% blocktrans %} + {% blocktrans trimmed %} Move networks from 'Available Networks' to 'Selected Networks' by clicking the button, or dragging and dropping. You can change the NIC order by dragging and dropping as well.