From 1c84b18d192766a26b4375d4f7a2cf152d991e74 Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <motoki@da.jp.nec.com>
Date: Fri, 8 Aug 2014 03:18:25 +0900
Subject: [PATCH] Make some new strings translator friendly

_usage_summary.html:
blocktrans contains non-simple HTML tags and the range
of blocktrans seems natural. This commit split blocktrans
into the start and end part of the period.

templates/images/properties/_edit.html:
The sensence and the value are concatenated in the code
and translators cannot control the word order.

Change-Id: I3021d67dcb20968b785a8a98ed639a128e3412f2
Closes-Bug: #1354125
---
 horizon/templates/horizon/common/_usage_summary.html         | 5 +++--
 .../admin/images/templates/images/properties/_edit.html      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/horizon/templates/horizon/common/_usage_summary.html b/horizon/templates/horizon/common/_usage_summary.html
index 0dfe9e218f..ac0cb8ae5b 100644
--- a/horizon/templates/horizon/common/_usage_summary.html
+++ b/horizon/templates/horizon/common/_usage_summary.html
@@ -6,10 +6,11 @@
   <form action="?" method="get" id="date_form" class="form-inline">
     <h3>{% trans "Select a period of time to query its usage" %}: </h3>
     <div class="datepicker form-group">
-      {% blocktrans with start=form.start end=form.end %}
-      <label>From:</label> {{ start }}
+      {% blocktrans with start=form.start %}
+      <label>From:</label> {{ start }}{% endblocktrans %}
     </div>
     <div class="datepicker form-group">
+      {% blocktrans with end=form.end %}
       <label>To:</label>{{ end }}{% endblocktrans %}
     </div>
     <button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>
diff --git a/openstack_dashboard/dashboards/admin/images/templates/images/properties/_edit.html b/openstack_dashboard/dashboards/admin/images/templates/images/properties/_edit.html
index 38fad425f7..7f172c2b34 100644
--- a/openstack_dashboard/dashboards/admin/images/templates/images/properties/_edit.html
+++ b/openstack_dashboard/dashboards/admin/images/templates/images/properties/_edit.html
@@ -17,7 +17,7 @@
 </div>
 <div class="right">
     <h3>{% trans "Description" %}:</h3>
-    <p>{% trans 'Update the custom property value for' %} &quot;{{ key }}&quot;</p>
+    <p>{% blocktrans with key=key %}Update the custom property value for &quot;{{ key }}&quot;{% endblocktrans %}</p>
 </div>
 {% endblock %}