Merge branch 'main' into i18n-second-pass

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 %}
 

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 %}
 

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 %}

bookwyrm/templates/user/shelf.html

@@ -5,11 +5,11 @@
 {% 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 %}

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">

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 %}