Merge branch 'upstream' into tab-keyboard-accessibility

bookwyrm/templates/feed/feed_layout.html

@@ -1,13 +1,14 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% load bookwyrm_tags %}
 {% block content %}
 
 <div class="columns">
     {% if user.is_authenticated %}
     <div class="column is-one-third">
-        <h2 class="title is-5">Your books</h2>
+        <h2 class="title is-5">{% trans "Your books" %}</h2>
         {% if not suggested_books %}
-        <p>There are no books here right now! Try searching for a book to get started</p>
+        <p>{% trans "There are no books here right now! Try searching for a book to get started" %}</p>
         {% else %}
         <seven-minute-tabs>
             <div class="tabs is-small">
@@ -66,7 +67,7 @@
         {% if goal %}
         <section class="section">
             <div class="block">
-                <h3 class="title is-4">{{ goal.year }} Reading Goal</h3>
+                <h3 class="title is-4">{% blocktrans with yar=goal.year %}{{ year }} Reading Goal{% endblocktrans %}</h3>
                 {% include 'snippets/goal_progress.html' with goal=goal %}
             </div>
         </section>