From 409d8f6c6142cf4cf24603027da38282795153f7 Mon Sep 17 00:00:00 2001
From: Qian Min Chen <chen.qiaomin@99cloud.net>
Date: Tue, 9 Jan 2018 22:39:18 +0800
Subject: [PATCH] Use 'trimmed' for blocktrans in multi-line strings

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.

Change-Id: I50d5e4ea364a70a42e4309c919f4eb3c3a0ebc37
Closes-Bug: #1742162
---
 .../dns_domains/templates/dns_domains/_create_domain.html   | 6 +++---
 .../dns_domains/templates/dns_domains/_create_record.html   | 2 +-
 .../dns_domains/templates/dns_domains/_update_domain.html   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/designatedashboard/dashboards/project/dns_domains/templates/dns_domains/_create_domain.html b/designatedashboard/dashboards/project/dns_domains/templates/dns_domains/_create_domain.html
index 3aa22ca..00f62ed 100644
--- a/designatedashboard/dashboards/project/dns_domains/templates/dns_domains/_create_domain.html
+++ b/designatedashboard/dashboards/project/dns_domains/templates/dns_domains/_create_domain.html
@@ -16,15 +16,15 @@
 
   <div class="right quota-dynamic">
     <h3>{% trans "Description" %}:</h3>
-    <p>{% blocktrans %}
+    <p>{% blocktrans trimmed %}
       The Name field should contain a full-qualified domain name (with
       trailing period).
     {% endblocktrans %}</p>
-    <p>{% blocktrans %}
+    <p>{% blocktrans trimmed %}
       The Email field should contain a valid email address to be associated
       with the domain.
     {% endblocktrans %}</p>
-    <p>{% blocktrans %}
+    <p>{% blocktrans trimmed %}
       The optional TTL field can be any value between 1 and 2147483647
       seconds.
     {% endblocktrans %}</p>
diff --git a/designatedashboard/dashboards/project/dns_domains/templates/dns_domains/_create_record.html b/designatedashboard/dashboards/project/dns_domains/templates/dns_domains/_create_record.html
index 197443b..0920aa6 100644
--- a/designatedashboard/dashboards/project/dns_domains/templates/dns_domains/_create_record.html
+++ b/designatedashboard/dashboards/project/dns_domains/templates/dns_domains/_create_record.html
@@ -16,7 +16,7 @@
      </fieldset>
    </div>
 
-  {% blocktrans %}
+  {% blocktrans trimmed %}
   <p>
     <strong>TTL</strong>
     The TTL is the time-to-live for the record, in seconds.
diff --git a/designatedashboard/dashboards/project/dns_domains/templates/dns_domains/_update_domain.html b/designatedashboard/dashboards/project/dns_domains/templates/dns_domains/_update_domain.html
index e8f6ba9..dab9b8a 100644
--- a/designatedashboard/dashboards/project/dns_domains/templates/dns_domains/_update_domain.html
+++ b/designatedashboard/dashboards/project/dns_domains/templates/dns_domains/_update_domain.html
@@ -19,11 +19,11 @@
     <p>{% blocktrans %}
       From here you can edit the email address and TTL associated with a domain.
     {% endblocktrans %}</p>
-    <p>{% blocktrans %}
+    <p>{% blocktrans trimmed %}
       The Email field should contain a valid email address to be associated
       with the domain.
     {% endblocktrans %}</p>
-    <p>{% blocktrans %}
+    <p>{% blocktrans trimmed %}
       The optional TTL field can be any value between 1 and 2147483647
       seconds.
     {% endblocktrans %}</p>