From 1b8609d9dc297367ed0d857bc114cef5f6ce2952 Mon Sep 17 00:00:00 2001
From: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date: Tue, 6 Aug 2013 20:21:55 +0900
Subject: [PATCH] Allow translators to control the word order

Closes-Bug #1208807

Change-Id: I2d07a34b3c0479cb6384ef0041f8a6f4c58e1699
---
 horizon/templates/_header.html                       | 2 +-
 horizon/templates/horizon/common/_usage_summary.html | 3 +--
 openstack_dashboard/templates/_header.html           | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/horizon/templates/_header.html b/horizon/templates/_header.html
index 76e9965163..ec4eeb2632 100644
--- a/horizon/templates/_header.html
+++ b/horizon/templates/_header.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load url from future %}
 <div id="user_info" class="pull-right">
-  <span>{% trans "Logged in as" %}: {{ request.user.username }}</span>
+  <span>{% blocktrans with username=request.user.username %}Logged in as: {{ username }}{% endblocktrans %}</span>
   {% if HORIZON_CONFIG.help_url %}
   <a href="{{ HORIZON_CONFIG.help_url }}" target="_new">{% trans "Help" %}</a>
   {% endif %}
diff --git a/horizon/templates/horizon/common/_usage_summary.html b/horizon/templates/horizon/common/_usage_summary.html
index 6b34d3ac1e..139204b047 100644
--- a/horizon/templates/horizon/common/_usage_summary.html
+++ b/horizon/templates/horizon/common/_usage_summary.html
@@ -4,8 +4,7 @@
   <form action="" method="get" id="date_form" class="form-horizontal">
     <h3>{% trans "Select a period of time to query its usage" %}: </h3>
     <div class="datepicker">
-      <span>{% trans "From" %}: {{ form.start }} </span>
-      <span>{% trans "To" %}: {{ form.end }} </span>
+      {% blocktrans with start=form.start end=form.end %}<span>From: {{ start }} </span><span>To: {{ end }} </span>{% endblocktrans %}
       <button class="btn btn-small" type="submit">{% trans "Submit" %}</button>
       <small>{% trans "The date should be in YYYY-mm-dd format." %}</small>
     </div>
diff --git a/openstack_dashboard/templates/_header.html b/openstack_dashboard/templates/_header.html
index a18b6ed0cf..62423d6066 100644
--- a/openstack_dashboard/templates/_header.html
+++ b/openstack_dashboard/templates/_header.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load url from future %}
 <div id="user_info" class="pull-right">
-  <span>{% trans "Logged in as" %}: {{ request.user.username }}</span>
+  <span>{% blocktrans with username=request.user.username %}Logged in as: {{ username }}{% endblocktrans %}</span>
   <a href="{% url 'horizon:settings:user:index' %}">{% trans "Settings" %}</a>
   {% if HORIZON_CONFIG.help_url %}
   <a href="{{ HORIZON_CONFIG.help_url }}" target="_new">{% trans "Help" %}</a>