From fdfbf2974440d5604f13f09b3ac92daa1635c88b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 20:22:42 -0700
Subject: [PATCH] i18n for "page x of y"

---
 bookwyrm/templates/snippets/page_text.html   |  7 +++++++
 bookwyrm/templates/snippets/readthrough.html | 16 +++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 bookwyrm/templates/snippets/page_text.html

diff --git a/bookwyrm/templates/snippets/page_text.html b/bookwyrm/templates/snippets/page_text.html
new file mode 100644
index 00000000..dc7a6a33
--- /dev/null
+++ b/bookwyrm/templates/snippets/page_text.html
@@ -0,0 +1,7 @@
+{% load humanize %}
+{% load i18n %}
+{% if total_pages %}
+{% blocktrans with page=page|intcomma total_pages=total_pages|intcomma %}page {{ page }} of {{ total_pages }}{% endblocktrans %}
+{% else %}
+{% blocktrans with page=page|intcomma %}page {{ page }}{% endblocktrans %}
+{% endif %}
diff --git a/bookwyrm/templates/snippets/readthrough.html b/bookwyrm/templates/snippets/readthrough.html
index 3e694f61..76611862 100644
--- a/bookwyrm/templates/snippets/readthrough.html
+++ b/bookwyrm/templates/snippets/readthrough.html
@@ -9,8 +9,18 @@
                 </dl>
                 <ul>
                     {% if readthrough.finish_date or readthrough.progress %}
-                    <li>{% if readthrough.finish_date %} {{ readthrough.finish_date | localtime | naturalday }}: {% trans "finished" %} {% else %}{% if readthrough.progress_mode == 'PG' %}on page {{ readthrough.progress }}{% if book.pages %} of {{ book.pages }}{% endif %}
-                        {% else %}{{ readthrough.progress }}%{% endif %}{% endif %}
+                    <li>
+                        {% if readthrough.finish_date %}
+                        {{ readthrough.finish_date | localtime | naturalday }}: {% trans "finished" %}
+                        {% else %}
+
+                        {% if readthrough.progress_mode == 'PG' %}
+                        {% include 'snippets/page_text.html' with page=readthrough.progress total_pages=book.pages %}
+                        {% else %}
+                        {{ readthrough.progress }}%
+                        {% endif %}
+                        {% endif %}
+
                         {% if readthrough.progress %}
                         {% trans "Show all updates" as button_text %}
                         {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="updates" controls_uid=readthrough.id class="is-small" %}
@@ -21,7 +31,7 @@
                                     {% csrf_token %}
                                     {{ progress_update.created_date | naturalday }}:
                                     {% if progress_update.mode == 'PG' %}
-                                    page {{ progress_update.progress }} of {{ book.pages }}
+                                    {% include 'snippets/page_text.html' with page=progress_update.progress total_pages=book.pages %}
                                     {% else %}
                                     {{ progress_update.progress }}%
                                     {% endif %}