From b81997cb0bc84efbf57d1bde01ec6eeb3e56e886 Mon Sep 17 00:00:00 2001
From: Adriaan Tijsseling <adriaangt@gmail.com>
Date: Mon, 1 Aug 2016 12:32:43 +0200
Subject: [PATCH] Fixing template variables (#2879)

* subtitle is not always defined.

* model_name_plural does not exist. Should be verbose_name_plural.
---
 .../modeladmin/templates/modeladmin/includes/search_form.html | 2 +-
 .../wagtailadmin/templates/wagtailadmin/shared/header.html    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wagtail/contrib/modeladmin/templates/modeladmin/includes/search_form.html b/wagtail/contrib/modeladmin/templates/modeladmin/includes/search_form.html
index 3bb3873239..bc5089782e 100644
--- a/wagtail/contrib/modeladmin/templates/modeladmin/includes/search_form.html
+++ b/wagtail/contrib/modeladmin/templates/modeladmin/includes/search_form.html
@@ -7,7 +7,7 @@
                 <label for="id_q" class="visuallyhidden">{% trans 'Search for' %}</label>
                 <div class="field-content">
                     <div class="input icon-search ">
-                        <input id="id_q" name="{{ search_var }}" value="{{ view.query }}" placeholder="{% blocktrans with view.model_name_plural|lower as name %}Search {{ name }}{% endblocktrans %}" type="text">
+                        <input id="id_q" name="{{ search_var }}" value="{{ view.query }}" placeholder="{% blocktrans with view.verbose_name_plural|lower as name %}Search {{ name }}{% endblocktrans %}" type="text">
                         <span></span>
                     </div>
                 </div>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html
index 3e6aa98b54..3869040ca0 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/header.html
@@ -21,7 +21,7 @@
     <div class="row">
         <div class="left">
             <div class="col">
-                <h1 class="icon icon-{{ icon }}">{{ title }} <span>{{ subtitle }}</span></h1>
+                <h1 class="icon icon-{{ icon }}">{{ title }}{% if subtitle %} <span>{{ subtitle }}</span>{% endif %}</h1>
             </div>
             {% if search_url %}
                 <form class="col search-form" action="{% url search_url %}{% if query_parameters %}?{{ query_parameters }}{% endif %}" method="get">
@@ -38,7 +38,7 @@
             {% usage_count_enabled as uc_enabled %}
             {% if uc_enabled and usage_object %}
                 <div class="usagecount">
-                    <a href="{{ usage_object.usage_url }}">{% blocktrans count useage_count=usage_object.get_usage.count %}Used {{ useage_count  }} time{% plural %}Used {{ useage_count }} times{% endblocktrans %}</a>
+                    <a href="{{ usage_object.usage_url }}">{% blocktrans count useage_count=usage_object.get_usage.count %}Used {{ useage_count }} time{% plural %}Used {{ useage_count }} times{% endblocktrans %}</a>
                 </div>
             {% endif %}
             {% if add_link %}