Merge branch 'main' into i18n-second-pass

2021-02-28 17:22:25 -08:00
parent fc5a180f0f b2779cc6bf
commit bd44bf0980
61 changed files with 422 additions and 346 deletions
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@ -1,8 +1,10 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
-{% block content %}

+{% block title %}{% trans "Updates" %}{% endblock %}
+
+{% block content %}
 <div class="columns">
    {% if user.is_authenticated %}
    <div class="column is-one-third">