Merge branch 'main' into ci

2021-03-20 15:26:51 +01:00
parent 4de30effa5 9b51ed40c8
commit b9a61162d7
292 changed files with 18523 additions and 10503 deletions
--- a/bookwyrm/templates/snippets/progress_update.html
+++ b/bookwyrm/templates/snippets/progress_update.html
@ -27,7 +27,7 @@
            </div>
        </div>
        {% if readthrough.progress_mode == 'PG' and book.pages %}
-        <p class="help">{% blocktrans %}of {{ book.pages }} pages{% endblocktrans %}</p>
+        <p class="help">{% blocktrans with pages=book.pages %}of {{ pages }} pages{% endblocktrans %}</p>
        {% endif %}
    </div>
 </form>