Correct i18n issues

* Missing template tags
* Incorrect message formatting

oscar/apps/basket/abstract_models.py

@@ -652,19 +652,17 @@ class AbstractLine(models.Model):
 
         current_price_incl_tax = self.product.stockrecord.price_incl_tax
         if current_price_incl_tax > self.price_incl_tax:
-            msg = (
-                u"The price of '%(product)s' has increased from %(old_price)s "
-                u"to %(new_price)s since you added it to your basket")
-            return _(msg) % {'product': self.product.get_title(),
-                             'old_price': currency(self.price_incl_tax),
-                             'new_price': currency(current_price_incl_tax)}
+            return _(
+                u"The price of '%(product)s' has increased from %(old_price)s to %(new_price)s since you added it to your basket") % {
+                    'product': self.product.get_title(),
+                    'old_price': currency(self.price_incl_tax),
+                    'new_price': currency(current_price_incl_tax)}
         if current_price_incl_tax < self.price_incl_tax:
-            msg = (
-                u"The price of '%(product)s' has decreased from %(old_price)s "
-                u"to %(new_price)s since you added it to your basket")
-            return _(msg) % {'product': self.product.get_title(),
-                             'old_price': currency(self.price_incl_tax),
-                             'new_price': currency(current_price_incl_tax)}
+            return _(
+                u"The price of '%(product)s' has decreased from %(old_price)s to %(new_price)s since you added it to your basket") % {
+                    'product': self.product.get_title(),
+                    'old_price': currency(self.price_incl_tax),
+                    'new_price': currency(current_price_incl_tax)}
 
 
 class AbstractLineAttribute(models.Model):

oscar/apps/dashboard/reports/forms.py

@@ -18,7 +18,7 @@ class ReportForm(forms.Form):
     date_from = forms.DateField(label=_("Date from"))
     date_to = forms.DateField(label=_("Date to"),
                               help_text=_("The report is inclusive of this date"))
-    download = forms.BooleanField(required=False)
+    download = forms.BooleanField(label=_("Download"), required=False)
 
     def clean(self):
         if 'date_from' in self.cleaned_data and 'date_to' in self.cleaned_data and self.cleaned_data['date_from'] > self.cleaned_data['date_to']:

oscar/templates/oscar/dashboard/catalogue/stockalert_list.html

@@ -24,7 +24,7 @@
 {% block dashboard_content %}
 
 <div class="well well-info">
-	<h3 class="app-ico ico_sync icon">Filter</h3>
+	<h3 class="app-ico ico_sync icon">{% trans 'Filter' %}</h3>
     <p>
 	<a class="btn btn-info" href="{% url dashboard:stock-alert-list %}">{% trans "All" %}</a>
 	<a class="btn btn-info" href="{% url dashboard:stock-alert-list %}?status=Open">{% trans "Open" %}</a>

oscar/templates/oscar/dashboard/index.html

@@ -29,7 +29,7 @@
 <div class='row-fluid'>
     <div class="span12">
         <div id="order-graph">
-            <div class='bar-caption'><h1>Latest Orders (Hourly)</h1></div>
+            <div class='bar-caption'><h1>{% trans "Latest Orders (Hourly)" %}</h1></div>
             <div class='bar-y-axis'>
                 <ul>
                 {% for y_value in hourly_report_dict.y_range %}

oscar/templates/oscar/dashboard/orders/statistics.html

@@ -33,7 +33,7 @@
     <form method="get" action="{% url dashboard:order-stats %}" class="form-inline">
         <h3 class="app-ico ico_magnify icon">Filter</h3>
         {% include "partials/form_fields_inline.html" with form=form %}
-		<button type="submit" class="btn btn-primary">Filter result</button>
+		<button type="submit" class="btn btn-primary">{% trans "Filter result" %}</button>
 		<a href="{% url dashboard:order-stats %}" class="btn">{% trans "Reset" %}</a>
     </form>
 </div>

oscar/templates/oscar/dashboard/pages/index.html

@@ -19,10 +19,10 @@
 
 {% block header %}
 <div class="well well-info">
-    <h3>Search</h3>
+    <h3>{% trans "Search" %}</h3>
     <form action="." method="get" class="form-inline">
         {% include "partials/form_fields_inline.html" with form=form %}
-        <input type="submit" value="Search" class="btn btn-primary"/>
+        <input type="submit" value="{% trans "Search" %}" class="btn btn-primary"/>
     </form>
 </div>
 {% endblock header %}
@@ -30,7 +30,7 @@
 {% block dashboard_content %}
 
 <div class="well well-success">
-    <h3>Create new page</h3>
+    <h3>{% trans "Create new page" %}</h3>
     <form action="{% url dashboard:page-create %}" method="get" class="form-inline">
         <input type="submit" value="{% trans "Create" %}" class="btn-primary" />
     </form>

oscar/templates/oscar/dashboard/promotions/pagepromotion_list.html

@@ -27,7 +27,7 @@
 {% block dashboard_content %}
 
 <div class="well well-danger">
-    <h3 class="app-ico ico_view icon">View by page</h3>
+    <h3 class="app-ico ico_view icon">{% trans "View by page" %}</h3>
 	<a href="{% url dashboard:promotion-list %}" class="btn btn-primary">{% trans "View all content blocks" %}</a>
 	<a href="{% url dashboard:promotion-list-by-page %}" class="btn">{% trans "View content blocks by page" %}</a>
 </div>

oscar/templates/oscar/dashboard/reports/index.html

@@ -28,7 +28,7 @@
 <form method="get" action="." class="form-horizontal">
     {% include "partials/form_fields.html" with form=form %}
     <div class="form-actions">
-		<button type="submit" class="btn btn-primary">Generate report</button>
+		<button type="submit" class="btn btn-primary">{% trans "Generate report" %}</button>
     </div>
 </form>
 

oscar/templates/oscar/dashboard/users/index.html

@@ -45,8 +45,8 @@
             <th>{% trans "Email" %}</th>
             <th>{% trans "First name" %}</th>
             <th>{% trans "Last name" %}</th>
-            <th>{% trans "Active" %}</th>
-            <th>{% trans "Staff status" %}</th>
+            <td>{{ user.is_active|yesno:_("True,False") }}</td>
+            <td>{{ user.is_staff|yesno:_("True,False") }}</td>
             <th>{% trans "Date registered" %}</th>
             <th>{% trans "Num Orders" %}</th>
             <th></th>