From c48376854432f43ea5eaafc21c36ef15f5d3f5ec Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Feb 2021 10:00:36 -0800
Subject: [PATCH] Moves titles into templates and adds i18n support

---
 bookwyrm/templates/author.html                      |  3 +++
 bookwyrm/templates/book.html                        |  4 +++-
 bookwyrm/templates/discover/about.html              |  4 ++--
 bookwyrm/templates/discover/landing_layout.html     |  4 +++-
 bookwyrm/templates/edit_author.html                 |  3 +++
 bookwyrm/templates/edit_book.html                   |  3 +++
 bookwyrm/templates/editions.html                    |  3 +++
 bookwyrm/templates/error.html                       |  5 +++--
 bookwyrm/templates/feed/direct_messages.html        |  8 +++++++-
 bookwyrm/templates/feed/feed_layout.html            |  5 +++--
 bookwyrm/templates/feed/status.html                 |  1 +
 bookwyrm/templates/goal.html                        | 10 ++++++++--
 bookwyrm/templates/import.html                      |  3 +++
 bookwyrm/templates/import_status.html               |  3 +++
 bookwyrm/templates/invite.html                      |  3 +++
 bookwyrm/templates/lists/list.html                  |  2 +-
 bookwyrm/templates/lists/list_layout.html           |  4 +++-
 bookwyrm/templates/lists/lists.html                 |  3 +++
 bookwyrm/templates/login.html                       |  4 +++-
 bookwyrm/templates/notfound.html                    |  5 +++--
 bookwyrm/templates/notifications.html               |  3 +++
 bookwyrm/templates/password_reset.html              |  4 +++-
 bookwyrm/templates/password_reset_request.html      |  4 +++-
 bookwyrm/templates/preferences/blocks.html          |  2 ++
 bookwyrm/templates/preferences/change_password.html |  3 +++
 bookwyrm/templates/preferences/edit_user.html       |  3 +++
 bookwyrm/templates/search_results.html              |  3 +++
 bookwyrm/templates/settings/federation.html         |  3 +++
 bookwyrm/templates/settings/site.html               |  5 ++++-
 bookwyrm/templates/tag.html                         |  5 +++--
 bookwyrm/templates/user/followers.html              |  6 +-----
 bookwyrm/templates/user/following.html              |  6 +-----
 bookwyrm/templates/user/lists.html                  |  6 +++---
 bookwyrm/templates/user/shelf.html                  | 12 ++++++++----
 bookwyrm/templates/user/user.html                   |  4 +++-
 bookwyrm/templates/user/user_layout.html            |  2 ++
 bookwyrm/views/authentication.py                    |  1 -
 bookwyrm/views/author.py                            |  3 ---
 bookwyrm/views/block.py                             |  3 +--
 bookwyrm/views/books.py                             |  4 ----
 bookwyrm/views/error.py                             |  6 ++----
 bookwyrm/views/federation.py                        |  5 +----
 bookwyrm/views/feed.py                              |  3 ---
 bookwyrm/views/goal.py                              |  2 --
 bookwyrm/views/import_data.py                       |  2 --
 bookwyrm/views/invite.py                            |  3 ---
 bookwyrm/views/landing.py                           |  6 +-----
 bookwyrm/views/list.py                              |  4 ----
 bookwyrm/views/notifications.py                     |  1 -
 bookwyrm/views/password.py                          | 12 ++----------
 bookwyrm/views/search.py                            |  1 -
 bookwyrm/views/shelf.py                             |  1 -
 bookwyrm/views/site.py                              | 10 ++--------
 bookwyrm/views/tag.py                               |  1 -
 bookwyrm/views/user.py                              |  4 ----
 55 files changed, 121 insertions(+), 102 deletions(-)

diff --git a/bookwyrm/templates/author.html b/bookwyrm/templates/author.html
index 9dd83189..bc1034a8 100644
--- a/bookwyrm/templates/author.html
+++ b/bookwyrm/templates/author.html
@@ -1,6 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
+
+{% block title %}{{ author.name }}{% endblock %}
+
 {% block content %}
 <div class="block">
     <div class="columns is-mobile">
diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index 35ddba37..2280938b 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -2,8 +2,10 @@
 {% load i18n %}
 {% load bookwyrm_tags %}
 {% load humanize %}
-{% block content %}
 
+{% block title %}{{ book.title }}{% endblock %}
+
+{% block content %}
 <div class="block">
     <div class="columns is-mobile">
         <div class="column">
diff --git a/bookwyrm/templates/discover/about.html b/bookwyrm/templates/discover/about.html
index dd0a8129..a6f3a026 100644
--- a/bookwyrm/templates/discover/about.html
+++ b/bookwyrm/templates/discover/about.html
@@ -1,10 +1,10 @@
 {% extends 'discover/landing_layout.html' %}
 {% load i18n %}
-{% block panel %}
 
+{% block panel %}
 <div class="block columns mt-4">
     <nav class="menu column is-one-quarter">
-        <h2 class="menu-label">About {{ site.name }}</h2>
+        <h2 class="menu-label">{% blocktrans with site_name=site.name %}About {{ site_name }}{% endblocktrans %}</h2>
         <ul class="menu-list">
             <li>
                 <a href="#coc">{% trans "Code of Conduct" %}</a>
diff --git a/bookwyrm/templates/discover/landing_layout.html b/bookwyrm/templates/discover/landing_layout.html
index f6b86009..3aa27e39 100644
--- a/bookwyrm/templates/discover/landing_layout.html
+++ b/bookwyrm/templates/discover/landing_layout.html
@@ -1,8 +1,10 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
-{% block content %}
 
+{% block title %}{% trans "Welcome" %}{% endblock %}
+
+{% block content %}
 <header class="block has-text-centered">
     <h1 class="title">{{ site.name }}</h1>
     <h2 class="subtitle">{{ site.instance_tagline }}</h2>
diff --git a/bookwyrm/templates/edit_author.html b/bookwyrm/templates/edit_author.html
index ab59cc2d..0316a66f 100644
--- a/bookwyrm/templates/edit_author.html
+++ b/bookwyrm/templates/edit_author.html
@@ -1,6 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load humanize %}
+
+{% block title %}{% trans "Edit Author" %}: {{ author.name }}{% endblock %}
+
 {% block content %}
 <header class="block">
     <h1 class="title level-left">
diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index 15c7b878..4d215949 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -1,6 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load humanize %}
+
+{% block title %}{% trans "Edit Book" %}{% endblock %}
+
 {% block content %}
 <header class="block">
     <h1 class="title level-left">
diff --git a/bookwyrm/templates/editions.html b/bookwyrm/templates/editions.html
index 7dfabc93..38147a86 100644
--- a/bookwyrm/templates/editions.html
+++ b/bookwyrm/templates/editions.html
@@ -1,6 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
+
+{% block title %}{% blocktrans with book_title=work.title %}Editions of {{ book_title }}{% endblocktrans %}{% endblock %}
+
 {% block content %}
 <div class="block">
     <h1 class="title">{% blocktrans with path=work.local_path work_title=work.title %}Editions of <a href="{{ work_path }}">"{{ work_title }}"</a>{% endblocktrans %}</h1>
diff --git a/bookwyrm/templates/error.html b/bookwyrm/templates/error.html
index 99a9a624..ce448287 100644
--- a/bookwyrm/templates/error.html
+++ b/bookwyrm/templates/error.html
@@ -1,11 +1,12 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% block content %}
 
+{% block title %}{% trans "Oops!" %}{% endblock %}
+
+{% block content %}
 <div class="block">
     <h1 class="title">{% trans "Server Error" %}</h1>
     <p>{% trans "Something went wrong! Sorry about that." %}</p>
 </div>
-
 {% endblock %}
 
diff --git a/bookwyrm/templates/feed/direct_messages.html b/bookwyrm/templates/feed/direct_messages.html
index 12eaeb0b..049a12b8 100644
--- a/bookwyrm/templates/feed/direct_messages.html
+++ b/bookwyrm/templates/feed/direct_messages.html
@@ -3,7 +3,13 @@
 {% block panel %}
 
 <header class="block">
-    <h1 class="title">Direct Messages{% if partner %} with {% include 'snippets/username.html' with user=partner %}{% endif %}</h1>
+    <h1 class="title">
+        {% if partner %}
+        {% blocktrans with username=partner.display_name path=partner.local_path %}Direct Messages with <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}
+        {% else %}
+        {% trans "Direct Messsages" %}
+        {% endif %}
+    </h1>
     {% if partner %}<p class="subtitle"><a href="/direct-messages"><span class="icon icon-arrow-left" aria-hidden="true"></span> {% trans "All messages" %}</a></p>{% endif %}
 </header>
 
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index a419d5be..7c49d9fd 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -1,9 +1,10 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
-{% block title %}Updates{% endblock %}
-{% block content %}
 
+{% block title %}{% trans "Updates" %}{% endblock %}
+
+{% block content %}
 <div class="columns">
     {% if user.is_authenticated %}
     <div class="column is-one-third">
diff --git a/bookwyrm/templates/feed/status.html b/bookwyrm/templates/feed/status.html
index 06d536fc..fc92f855 100644
--- a/bookwyrm/templates/feed/status.html
+++ b/bookwyrm/templates/feed/status.html
@@ -1,5 +1,6 @@
 {% extends 'feed/feed_layout.html' %}
 {% load i18n %}
+
 {% block panel %}
 <header class="block">
     <a href="/#feed" class="button" data-back>
diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html
index 4a16ccb6..2bbe40e0 100644
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@@ -22,7 +22,7 @@
         <section class="card {% if goal %}hidden{% endif %}" id="show-edit-goal">
             <header class="card-header">
                 <h2 class="card-header-title has-background-primary has-text-white" tabindex="0" id="edit-form-header">
-                    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {{ year }} reading goal
+                    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {% blocktrans %}{{ year }} reading goal{% endblocktrans %}
                 </h2>
             </header>
             <section class="card-content content">
@@ -45,7 +45,13 @@
 
 {% if goal.books %}
 <section class="content">
-    <h2>{% if goal.user == request.user %}Your{% else %}{{ goal.user.display_name }}'s{% endif %} {{ year }} Books</h2>
+    <h2>
+        {% if goal.user == request.user %}
+        {% blocktrans %}Your {{ year }} Books{% endblocktrans %}
+        {% else %}
+        {% blocktrans with username=goal.user.display_name %}{{ username }}'s {{ year }} Books{% endblocktrans %}
+        {% endif %}
+    </h2>
     <div class="columns is-multiline">
         {% for book in goal.books %}
         <div class="column is-narrow">
diff --git a/bookwyrm/templates/import.html b/bookwyrm/templates/import.html
index ea62ac55..6b6febb1 100644
--- a/bookwyrm/templates/import.html
+++ b/bookwyrm/templates/import.html
@@ -1,6 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load humanize %}
+
+{% block title %}{% trans "Import Books" %}{% endblock %}
+
 {% block content %}
 <div class="block">
     <h1 class="title">{% trans "Import Books" %}</h1>
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index d609a227..b28187b0 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -2,6 +2,9 @@
 {% load i18n %}
 {% load bookwyrm_tags %}
 {% load humanize %}
+
+{% block title %}{% trans "Import Status" %}{% endblock %}
+
 {% block content %}
 <div class="block">
     <h1 class="title">{% trans "Import Status" %}</h1>
diff --git a/bookwyrm/templates/invite.html b/bookwyrm/templates/invite.html
index 2ee15972..22a3a32c 100644
--- a/bookwyrm/templates/invite.html
+++ b/bookwyrm/templates/invite.html
@@ -1,5 +1,8 @@
 {% extends 'layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Create an Account" %}{% endblock %}
+
 {% block content %}
 
 <div class="columns">
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 42d99d8a..ddfaad0a 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -1,8 +1,8 @@
 {% extends 'lists/list_layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
-{% block panel %}
 
+{% block panel %}
 {% if request.user == list.user and pending_count %}
 <div class="block content">
     <p>
diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html
index 8e2e36e6..e48364f4 100644
--- a/bookwyrm/templates/lists/list_layout.html
+++ b/bookwyrm/templates/lists/list_layout.html
@@ -1,8 +1,10 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
-{% block content %}
 
+{% block title %}{{ list.name }}{% endblock %}
+
+{% block content %}
 <header class="columns content is-mobile">
     <div class="column">
         <h1 class="title">{{ list.name }} <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=list %}</span></h1>
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index 07032676..a21b7c64 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -1,5 +1,8 @@
 {% extends 'layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Lists" %}{% endblock %}
+
 {% block content %}
 
 <header class="block">
diff --git a/bookwyrm/templates/login.html b/bookwyrm/templates/login.html
index 1429f412..063b4b6d 100644
--- a/bookwyrm/templates/login.html
+++ b/bookwyrm/templates/login.html
@@ -1,7 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% block content %}
 
+{% block title %}{% trans "Login" %}{% endblock %}
+
+{% block content %}
 <div class="columns">
     <div class="column">
         <div class="box">
diff --git a/bookwyrm/templates/notfound.html b/bookwyrm/templates/notfound.html
index bb419cad..f6e765d4 100644
--- a/bookwyrm/templates/notfound.html
+++ b/bookwyrm/templates/notfound.html
@@ -1,10 +1,11 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% block content %}
 
+{% block title %}{% trans "Not Found" %}{% endblock %}
+
+{% block content %}
 <div class="block">
     <h1 class="title">{% trans "Not Found" %}</h1>
     <p>{% trans "The page your requested doesn't seem to exist!" %}</p>
 </div>
-
 {% endblock %}
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index ea9f24b8..b6074a4a 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -2,6 +2,9 @@
 {% load i18n %}
 {% load humanize %}
 {% load bookwyrm_tags %}
+
+{% block title %}{% trans "Notifications" %}{% endblock %}
+
 {% block content %}
 <div class="block">
     <h1 class="title">{% trans "Notifications" %}</h1>
diff --git a/bookwyrm/templates/password_reset.html b/bookwyrm/templates/password_reset.html
index 656e2dff..57add722 100644
--- a/bookwyrm/templates/password_reset.html
+++ b/bookwyrm/templates/password_reset.html
@@ -1,7 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% block content %}
 
+{% block title %}{% trans "Reset Password" %}{% endblock %}
+
+{% block content %}
 <div class="columns">
     <div class="column">
         <div class="block">
diff --git a/bookwyrm/templates/password_reset_request.html b/bookwyrm/templates/password_reset_request.html
index 87dc8e65..97191afa 100644
--- a/bookwyrm/templates/password_reset_request.html
+++ b/bookwyrm/templates/password_reset_request.html
@@ -1,7 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% block content %}
 
+{% block title %}{% trans "Reset Password" %}{% endblock %}
+
+{% block content %}
 <div class="columns is-centered">
     <div class="column is-half">
         <div class="block">
diff --git a/bookwyrm/templates/preferences/blocks.html b/bookwyrm/templates/preferences/blocks.html
index e26a5229..9cba06bf 100644
--- a/bookwyrm/templates/preferences/blocks.html
+++ b/bookwyrm/templates/preferences/blocks.html
@@ -1,6 +1,8 @@
 {% extends 'preferences/preferences_layout.html' %}
 {% load i18n %}
 
+{% block title %}{% trans "Blocked Users" %}{{ author.name }}{% endblock %}
+
 {% block header %}
 {% trans "Blocked Users" %}
 {% endblock %}
diff --git a/bookwyrm/templates/preferences/change_password.html b/bookwyrm/templates/preferences/change_password.html
index 46707946..cbd94305 100644
--- a/bookwyrm/templates/preferences/change_password.html
+++ b/bookwyrm/templates/preferences/change_password.html
@@ -1,5 +1,8 @@
 {% extends 'preferences/preferences_layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Change Password" %}{% endblock %}
+
 {% block header %}
 {% trans "Change Password" %}
 {% endblock %}
diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html
index d5b76c07..b643f4ce 100644
--- a/bookwyrm/templates/preferences/edit_user.html
+++ b/bookwyrm/templates/preferences/edit_user.html
@@ -1,5 +1,8 @@
 {% extends 'preferences/preferences_layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Edit Profile" %}{% endblock %}
+
 {% block header %}
 {% trans "Edit Profile" %}
 {% endblock %}
diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
index 30c88f3d..66133bf5 100644
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@@ -1,5 +1,8 @@
 {% extends 'layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Search Results" %}{% endblock %}
+
 {% block content %}
 {% with book_results|first as local_results %}
 <div class="block">
diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html
index 174b8c14..aa965a36 100644
--- a/bookwyrm/templates/settings/federation.html
+++ b/bookwyrm/templates/settings/federation.html
@@ -1,5 +1,8 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Federated Servers" %}{% endblock %}
+
 {% block header %}{% trans "Federated Servers" %}{% endblock %}
 
 {% block panel %}
diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html
index 2716ea3d..2e43bb74 100644
--- a/bookwyrm/templates/settings/site.html
+++ b/bookwyrm/templates/settings/site.html
@@ -1,6 +1,9 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
-{% block header %}{% trans "Site Configuration" %}{% endblock %}
+
+{% block title %}{% trans "Site Settings" %}{% endblock %}
+
+{% block header %}{% trans "Site Settings" %}{% endblock %}
 
 {% block panel %}
 
diff --git a/bookwyrm/templates/tag.html b/bookwyrm/templates/tag.html
index f30b7395..b6fa6778 100644
--- a/bookwyrm/templates/tag.html
+++ b/bookwyrm/templates/tag.html
@@ -1,13 +1,14 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
-{% block content %}
 
+{% block title %}{{ tag.name }}{% endblock %}
+
+{% block content %}
 <div class="block">
     <h1 class="title">{% blocktrans %}Books tagged "{{ tag.name }}"{% endblocktrans %}</h1>
     {% include 'snippets/book_tiles.html' with books=books.all %}
 </div>
-
 {% endblock %}
 
 
diff --git a/bookwyrm/templates/user/followers.html b/bookwyrm/templates/user/followers.html
index 16ec7d4f..302bb8a3 100644
--- a/bookwyrm/templates/user/followers.html
+++ b/bookwyrm/templates/user/followers.html
@@ -4,11 +4,7 @@
 
 {% block header %}
 <h1 class="title">
-    {% if is_self %}Your
-    {% else %}
-    {% include 'snippets/username.html' with user=user possessive=True %}
-    {% endif %}
-    followers
+    {% trans "User Profile" %}
 </h1>
 {% endblock %}
 
diff --git a/bookwyrm/templates/user/following.html b/bookwyrm/templates/user/following.html
index 13af4417..c565cd16 100644
--- a/bookwyrm/templates/user/following.html
+++ b/bookwyrm/templates/user/following.html
@@ -4,11 +4,7 @@
 
 {% block header %}
 <h1 class="title">
-    Users following
-    {% if is_self %}you
-    {% else %}
-    {% include 'snippets/username.html' with user=user %}
-    {% endif %}
+    {% trans "User Profile" %}
 </h1>
 {% endblock %}
 
diff --git a/bookwyrm/templates/user/lists.html b/bookwyrm/templates/user/lists.html
index 6edf4430..9e847a5d 100644
--- a/bookwyrm/templates/user/lists.html
+++ b/bookwyrm/templates/user/lists.html
@@ -5,11 +5,11 @@
 <div class="columns is-mobile">
     <div class="column">
         <h1 class="title">
-            {% if is_self %}Your
+            {% if is_self %}
+            {% trans "Your Lists" %}
             {% else %}
-            {% include 'snippets/username.html' with user=user %}'s
+            {% blocktrans with username=user.display_name %}Lists: {{ username }}{% endblocktrans %}
             {% endif %}
-            Lists
         </h1>
     </div>
     {% if is_self %}
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index e62e2218..ac5cb790 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -1,14 +1,17 @@
 {% extends 'user/user_layout.html' %}
 {% load bookwyrm_tags %}
+{% load i18n %}
+
+{% block title %}{% blocktrans with username=user.display_name %}Shelves: {{ username }}{% endblocktrans %}{% endblock %}
 
 {% block header %}
 <header class="columns">
     <h1 class="title">
-        {% if is_self %}Your
+        {% if is_self %}
+        {% trans "Your Shelves" %}
         {% else %}
-        {% include 'snippets/username.html' with user=user possessive=True %}
+        {% blocktrans with username=user.display_name %}{{ username }}: Shelves{% endblocktrans %}
         {% endif %}
-        shelves
     </h1>
 </header>
 {% endblock %}
@@ -29,7 +32,8 @@
 
     {% if is_self %}
     <div class="column is-narrow">
-        {% include 'snippets/toggle/open_button.html' with text="Create shelf" icon="plus" controls_text="create-shelf-form" focus="create-shelf-form-header" %}
+        {% trans "Create Shelf" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon="plus" controls_text="create-shelf-form" focus="create-shelf-form-header" %}
     </div>
     {% endif %}
 </div>
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index bcab8d84..5dd24cae 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -1,10 +1,12 @@
 {% extends 'user/user_layout.html' %}
 {% load i18n %}
 
+{% block title %}{{ user.name }}{% endblock %}
+
 {% block header %}
 <div class="columns is-mobile">
     <div class="column">
-        <h1 class="title">{% trans "User profile" %}</h1>
+        <h1 class="title">{% trans "User Profile" %}</h1>
     </div>
     {% if is_self %}
     <div class="column is-narrow">
diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/user_layout.html
index c8eea412..bc7fe126 100644
--- a/bookwyrm/templates/user/user_layout.html
+++ b/bookwyrm/templates/user/user_layout.html
@@ -3,6 +3,8 @@
 {% load humanize %}
 {% load bookwyrm_tags %}
 
+{% block title %}{{ user.display_name }}{% endblock %}
+
 {% block content %}
 <header class="block">
     {% block header %}{% endblock %}
diff --git a/bookwyrm/views/authentication.py b/bookwyrm/views/authentication.py
index a74febca..316e7826 100644
--- a/bookwyrm/views/authentication.py
+++ b/bookwyrm/views/authentication.py
@@ -21,7 +21,6 @@ class Login(View):
             return redirect('/')
         # sene user to the login page
         data = {
-            'title': 'Login',
             'login_form': forms.LoginForm(),
             'register_form': forms.RegisterForm(),
         }
diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py
index a1a37cc5..356c95ff 100644
--- a/bookwyrm/views/author.py
+++ b/bookwyrm/views/author.py
@@ -24,7 +24,6 @@ class Author(View):
         books = models.Work.objects.filter(
             Q(authors=author) | Q(editions__authors=author)).distinct()
         data = {
-            'title': author.name,
             'author': author,
             'books': [b.get_default_edition() for b in books],
         }
@@ -41,7 +40,6 @@ class EditAuthor(View):
         ''' info about a book '''
         author = get_object_or_404(models.Author, id=author_id)
         data = {
-            'title': 'Edit Author',
             'author': author,
             'form': forms.AuthorForm(instance=author)
         }
@@ -54,7 +52,6 @@ class EditAuthor(View):
         form = forms.AuthorForm(request.POST, request.FILES, instance=author)
         if not form.is_valid():
             data = {
-                'title': 'Edit Author',
                 'author': author,
                 'form': form
             }
diff --git a/bookwyrm/views/block.py b/bookwyrm/views/block.py
index cb14aae3..90e5033b 100644
--- a/bookwyrm/views/block.py
+++ b/bookwyrm/views/block.py
@@ -15,8 +15,7 @@ class Block(View):
     ''' blocking users '''
     def get(self, request):
         ''' list of blocked users? '''
-        return TemplateResponse(
-            request, 'preferences/blocks.html', {'title': 'Blocked Users'})
+        return TemplateResponse(request, 'preferences/blocks.html')
 
     def post(self, request, user_id):
         ''' block a user '''
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index e05c4726..1eb62d6d 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -82,7 +82,6 @@ class Book(View):
             )
 
         data = {
-            'title': book.title,
             'book': book,
             'reviews': reviews_page,
             'review_count': reviews.count(),
@@ -113,7 +112,6 @@ class EditBook(View):
         if not book.description:
             book.description = book.parent_work.description
         data = {
-            'title': 'Edit Book',
             'book': book,
             'form': forms.EditionForm(instance=book)
         }
@@ -126,7 +124,6 @@ class EditBook(View):
         form = forms.EditionForm(request.POST, request.FILES, instance=book)
         if not form.is_valid():
             data = {
-                'title': 'Edit Book',
                 'book': book,
                 'form': form
             }
@@ -146,7 +143,6 @@ class Editions(View):
             return ActivitypubResponse(work.to_edition_list(**request.GET))
 
         data = {
-            'title': 'Editions of %s' % work.title,
             'editions': work.editions.order_by('-edition_rank').all(),
             'work': work,
         }
diff --git a/bookwyrm/views/error.py b/bookwyrm/views/error.py
index 9eabe29f..82999d6e 100644
--- a/bookwyrm/views/error.py
+++ b/bookwyrm/views/error.py
@@ -3,11 +3,9 @@ from django.template.response import TemplateResponse
 
 def server_error_page(request):
     ''' 500 errors '''
-    return TemplateResponse(
-        request, 'error.html', {'title': 'Oops!'}, status=500)
+    return TemplateResponse(request, 'error.html', status=500)
 
 
 def not_found_page(request, _):
     ''' 404s '''
-    return TemplateResponse(
-        request, 'notfound.html', {'title': 'Not found'}, status=404)
+    return TemplateResponse(request, 'notfound.html', status=404)
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index 0bd14dab..62ae076c 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -17,8 +17,5 @@ class Federation(View):
     def get(self, request):
         ''' edit form '''
         servers = models.FederatedServer.objects.all()
-        data = {
-            'title': 'Federated Servers',
-            'servers': servers
-        }
+        data = {'servers': servers}
         return TemplateResponse(request, 'settings/federation.html', data)
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 3a2805b4..5300c762 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -38,7 +38,6 @@ class Feed(View):
         paginated = Paginator(activities, PAGE_LENGTH)
 
         data = {**feed_page_data(request.user), **{
-            'title': 'Updates Feed',
             'user': request.user,
             'activities': paginated.page(page),
             'tab': tab,
@@ -75,7 +74,6 @@ class DirectMessage(View):
         paginated = Paginator(activities, PAGE_LENGTH)
         activity_page = paginated.page(page)
         data = {**feed_page_data(request.user), **{
-            'title': 'Direct Messages',
             'user': request.user,
             'partner': user,
             'activities': activity_page,
@@ -108,7 +106,6 @@ class Status(View):
                 status.to_activity(pure=not is_bookwyrm_request(request)))
 
         data = {**feed_page_data(request.user), **{
-            'title': 'Status by %s' % user.username,
             'status': status,
         }}
         return TemplateResponse(request, 'feed/status.html', data)
diff --git a/bookwyrm/views/goal.py b/bookwyrm/views/goal.py
index 97f13913..7da9e434 100644
--- a/bookwyrm/views/goal.py
+++ b/bookwyrm/views/goal.py
@@ -30,7 +30,6 @@ class Goal(View):
             return HttpResponseNotFound()
 
         data = {
-            'title': '%s\'s %d Reading' % (user.display_name, year),
             'goal_form': forms.GoalForm(instance=goal),
             'goal': goal,
             'user': user,
@@ -53,7 +52,6 @@ class Goal(View):
         form = forms.GoalForm(request.POST, instance=goal)
         if not form.is_valid():
             data = {
-                'title': '%s\'s %d Reading' % (request.user.display_name, year),
                 'goal_form': form,
                 'goal': goal,
                 'year': year,
diff --git a/bookwyrm/views/import_data.py b/bookwyrm/views/import_data.py
index 675cae3d..cf33163a 100644
--- a/bookwyrm/views/import_data.py
+++ b/bookwyrm/views/import_data.py
@@ -19,7 +19,6 @@ class Import(View):
     def get(self, request):
         ''' load import page '''
         return TemplateResponse(request, 'import.html', {
-            'title': 'Import Books',
             'import_form': forms.ImportForm(),
             'jobs': models.ImportJob.
                     objects.filter(user=request.user).order_by('-created_date'),
@@ -71,7 +70,6 @@ class ImportStatus(View):
         failed_items = [i for i in items if i.fail_reason]
         items = [i for i in items if not i.fail_reason]
         return TemplateResponse(request, 'import_status.html', {
-            'title': 'Import Status',
             'job': job,
             'items': items,
             'failed_items': failed_items,
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index 6b3611fc..750a5c2b 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -30,7 +30,6 @@ class ManageInvites(View):
         ).order_by('-created_date'), PAGE_LENGTH)
 
         data = {
-            'title': 'Invitations',
             'invites': paginated.page(page),
             'form': forms.CreateInviteForm(),
         }
@@ -50,7 +49,6 @@ class ManageInvites(View):
             user=request.user
         ).order_by('-created_date'), PAGE_LENGTH)
         data = {
-            'title': 'Invitations',
             'invites': paginated.page(1),
             'form': form
         }
@@ -66,7 +64,6 @@ class Invite(View):
         invite = get_object_or_404(models.SiteInvite, code=code)
 
         data = {
-            'title': 'Join',
             'register_form': forms.RegisterForm(),
             'invite': invite,
             'valid': invite.valid() if invite else True,
diff --git a/bookwyrm/views/landing.py b/bookwyrm/views/landing.py
index 2774e742..94b27b8f 100644
--- a/bookwyrm/views/landing.py
+++ b/bookwyrm/views/landing.py
@@ -12,10 +12,7 @@ class About(View):
     ''' create invites '''
     def get(self, request):
         ''' more information about the instance '''
-        data = {
-            'title': 'About',
-        }
-        return TemplateResponse(request, 'discover/about.html', data)
+        return TemplateResponse(request, 'discover/about.html')
 
 class Home(View):
     ''' discover page or home feed depending on auth '''
@@ -43,7 +40,6 @@ class Discover(View):
         ).order_by('-review__published_date__max')[:6]
 
         data = {
-            'title': 'Discover',
             'register_form': forms.RegisterForm(),
             'books': list(set(books)),
         }
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index e7b70a28..b1741b11 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -40,7 +40,6 @@ class Lists(View):
 
         paginated = Paginator(lists, 12)
         data = {
-            'title': 'Lists',
             'lists': paginated.page(page),
             'list_form': forms.ListForm(),
             'path': '/list',
@@ -72,7 +71,6 @@ class UserLists(View):
         paginated = Paginator(lists, 12)
 
         data = {
-            'title': '%s: Lists' % user.name,
             'user': user,
             'is_self': request.user.id == user.id,
             'lists': paginated.page(page),
@@ -114,7 +112,6 @@ class List(View):
 
 
         data = {
-            'title': '%s | Lists' % book_list.name,
             'list': book_list,
             'items': book_list.listitem_set.filter(approved=True),
             'pending_count': book_list.listitem_set.filter(
@@ -149,7 +146,6 @@ class Curate(View):
             return HttpResponseNotFound()
 
         data = {
-            'title': 'Curate "%s" | Lists' % book_list.name,
             'list': book_list,
             'pending': book_list.listitem_set.filter(approved=False),
             'list_form': forms.ListForm(instance=book_list),
diff --git a/bookwyrm/views/notifications.py b/bookwyrm/views/notifications.py
index 7d6a3149..684154e4 100644
--- a/bookwyrm/views/notifications.py
+++ b/bookwyrm/views/notifications.py
@@ -16,7 +16,6 @@ class Notifications(View):
                 .order_by('-created_date')
         unread = [n.id for n in notifications.filter(read=False)]
         data = {
-            'title': 'Notifications',
             'notifications': notifications,
             'unread': unread,
         }
diff --git a/bookwyrm/views/password.py b/bookwyrm/views/password.py
index 6602a270..792da2d7 100644
--- a/bookwyrm/views/password.py
+++ b/bookwyrm/views/password.py
@@ -19,7 +19,6 @@ class PasswordResetRequest(View):
         return TemplateResponse(
             request,
             'password_reset_request.html',
-            {'title': 'Reset Password'}
         )
 
     def post(self, request):
@@ -53,11 +52,7 @@ class PasswordReset(View):
         except models.PasswordReset.DoesNotExist:
             raise PermissionDenied
 
-        return TemplateResponse(
-            request,
-            'password_reset.html',
-            {'title': 'Reset Password', 'code': reset_code.code}
-        )
+        return TemplateResponse(request, 'password_reset.html')
 
     def post(self, request, code):
         ''' allow a user to change their password through an emailed token '''
@@ -90,10 +85,7 @@ class ChangePassword(View):
     ''' change password as logged in user '''
     def get(self, request):
         ''' change password page '''
-        data = {
-            'title': 'Change Password',
-            'user': request.user,
-        }
+        data = {'user': request.user}
         return TemplateResponse(
             request, 'preferences/change_password.html', data)
 
diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index 8acb2836..b44c49f8 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -58,7 +58,6 @@ class Search(View):
         book_results = connector_manager.search(
             query, min_confidence=min_confidence)
         data = {
-            'title': 'Search Results',
             'book_results': book_results,
             'user_results': user_results,
             'list_results': list_results,
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 70d3d1de..867c7d91 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -53,7 +53,6 @@ class Shelf(View):
         ).order_by('-updated_date').all()
 
         data = {
-            'title': '%s\'s %s shelf' % (user.display_name, shelf.name),
             'user': user,
             'is_self': is_self,
             'shelves': shelves.all(),
diff --git a/bookwyrm/views/site.py b/bookwyrm/views/site.py
index 0a5e270b..e60354a3 100644
--- a/bookwyrm/views/site.py
+++ b/bookwyrm/views/site.py
@@ -19,10 +19,7 @@ class Site(View):
     def get(self, request):
         ''' edit form '''
         site = models.SiteSettings.objects.get()
-        data = {
-            'title': 'Site Settings',
-            'site_form': forms.SiteForm(instance=site)
-        }
+        data = {'site_form': forms.SiteForm(instance=site)}
         return TemplateResponse(request, 'settings/site.html', data)
 
     def post(self, request):
@@ -30,10 +27,7 @@ class Site(View):
         site = models.SiteSettings.objects.get()
         form = forms.SiteForm(request.POST, instance=site)
         if not form.is_valid():
-            data = {
-                'title': 'Site Settings',
-                'site_form': form
-            }
+            data = {'site_form': form}
             return TemplateResponse(request, 'settings/site.html', data)
         form.save()
 
diff --git a/bookwyrm/views/tag.py b/bookwyrm/views/tag.py
index 502f5ea5..e106e8dc 100644
--- a/bookwyrm/views/tag.py
+++ b/bookwyrm/views/tag.py
@@ -25,7 +25,6 @@ class Tag(View):
             usertag__tag__identifier=tag_id
         ).distinct()
         data = {
-            'title': tag_obj.name,
             'books': books,
             'tag': tag_obj,
         }
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index a218375f..f3a088c1 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -79,7 +79,6 @@ class User(View):
         if not object_visible_to_user(request.user, goal):
             goal = None
         data = {
-            'title': user.name,
             'user': user,
             'is_self': is_self,
             'shelves': shelf_preview,
@@ -108,7 +107,6 @@ class Followers(View):
                 user.to_followers_activity(**request.GET))
 
         data = {
-            'title': '%s: followers' % user.name,
             'user': user,
             'is_self': request.user.id == user.id,
             'followers': user.followers.all(),
@@ -133,7 +131,6 @@ class Following(View):
                 user.to_following_activity(**request.GET))
 
         data = {
-            'title': '%s: following' % user.name,
             'user': user,
             'is_self': request.user.id == user.id,
             'following': user.following.all(),
@@ -147,7 +144,6 @@ class EditUser(View):
     def get(self, request):
         ''' edit profile page for a user '''
         data = {
-            'title': 'Edit profile',
             'form': forms.EditUserForm(instance=request.user),
             'user': request.user,
         }