From 2602ae42b02c243e4550cda7407eec86009aaa6e Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Wed, 1 Dec 2021 20:07:52 +1100
Subject: [PATCH 1/3] add translation strings

- add logic when default shelves used
- add trans strings in a few spots they were missing
---
 bookwyrm/templates/directory/directory.html      |  4 ++--
 bookwyrm/templates/get_started/book_preview.html |  9 +++++++--
 bookwyrm/templates/search/book.html              |  2 +-
 bookwyrm/templates/shelf/shelf.html              |  5 ++++-
 bookwyrm/templates/snippets/shelf_selector.html  |  9 ++++++++-
 bookwyrm/templates/user/user.html                | 11 ++++++++---
 6 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/templates/directory/directory.html b/bookwyrm/templates/directory/directory.html
index 9753c4c0..c3ddb3c5 100644
--- a/bookwyrm/templates/directory/directory.html
+++ b/bookwyrm/templates/directory/directory.html
@@ -18,7 +18,7 @@
     </p>
     <form name="directory" method="POST" action="{% url 'directory' %}">
         {% csrf_token %}
-        <button class="button is-primary" type="submit">Join Directory</button>
+        <button class="button is-primary" type="submit">{% trans "Join Directory" %}</button>
         <p class="help">
             {% url 'prefs-profile' as path %}
             {% blocktrans with path=path %}You can opt-out at any time in your <a href="{{ path }}">profile settings.</a>{% endblocktrans %}
@@ -28,7 +28,7 @@
     <div class="column is-narrow">
         {% trans "Dismiss message" as button_text %}
         <button type="button" class="delete set-display" data-id="hide_join_directory" data-value="true">
-            <span>Dismiss message</span>
+            <span>{% trans "Dismiss message" %}</span>
         </button>
     </div>
 </div></div>
diff --git a/bookwyrm/templates/get_started/book_preview.html b/bookwyrm/templates/get_started/book_preview.html
index 893e7593..8a20d0d7 100644
--- a/bookwyrm/templates/get_started/book_preview.html
+++ b/bookwyrm/templates/get_started/book_preview.html
@@ -4,9 +4,14 @@
 
     <div class="select is-small mt-1 mb-3">
         <select name="{{ book.id }}" aria-label="{% blocktrans with book_title=book.title %}Have you read {{ book_title }}?{% endblocktrans %}">
-            <option disabled selected value>Add to your books</option>
+            <option disabled selected value>{% trans 'Add to your books' %}</option>
             {% for shelf in user_shelves %}
-            <option value="{{ shelf.id }}">{{ shelf.name }}</option>
+            <option value="{{ shelf.id }}">
+                {% if shelf.identifier == 'to-read' %}{% trans "To Read" %}
+                {% elif shelf.identifier == 'reading' %}{% trans "Currently Reading" %}
+                {% elif shelf.identifier == 'read' %}{% trans "Read" %}
+                {% else %}{{ shelf.name }}{% endif %}
+            </option>
             {% endfor %}
         </select>
     </div>
diff --git a/bookwyrm/templates/search/book.html b/bookwyrm/templates/search/book.html
index 704f055b..66adb8c8 100644
--- a/bookwyrm/templates/search/book.html
+++ b/bookwyrm/templates/search/book.html
@@ -39,7 +39,7 @@
         <header class="columns is-mobile">
             <div class="column">
                 <h3 class="title is-5">
-                    Results from
+                    {% trans 'Results from' %}
                     <a href="{{ result_set.connector.base_url }}" target="_blank">{{ result_set.connector.name|default:result_set.connector.identifier }}</a>
                 </h3>
             </div>
diff --git a/bookwyrm/templates/shelf/shelf.html b/bookwyrm/templates/shelf/shelf.html
index 01d41aa0..0184ab1d 100644
--- a/bookwyrm/templates/shelf/shelf.html
+++ b/bookwyrm/templates/shelf/shelf.html
@@ -80,7 +80,10 @@
     <div class="block columns is-mobile">
         <div class="column">
             <h2 class="title is-3">
-                {{ shelf.name }}
+                {% if shelf.identifier == 'to-read' %}{% trans "To Read" %}
+                {% elif shelf.identifier == 'reading' %}{% trans "Currently Reading" %}
+                {% elif shelf.identifier == 'read' %}{% trans "Read" %}
+                {% else %}{{ shelf.name }}{% endif %}
                 <span class="subtitle">
                     {% include 'snippets/privacy-icons.html' with item=shelf %}
                 </span>
diff --git a/bookwyrm/templates/snippets/shelf_selector.html b/bookwyrm/templates/snippets/shelf_selector.html
index ca5a39f6..2bb5e253 100644
--- a/bookwyrm/templates/snippets/shelf_selector.html
+++ b/bookwyrm/templates/snippets/shelf_selector.html
@@ -13,7 +13,14 @@
         <input type="hidden" name="book" value="{{ book.id }}">
         <input type="hidden" name="change-shelf-from" value="{{ current.identifier }}">
         <input type="hidden" name="shelf" value="{{ shelf.identifier }}">
-        <button class="button is-fullwidth is-small shelf-option is-radiusless is-white" type="submit" {% if shelf.identifier == current.identifier %}disabled{% endif %}><span>{{ shelf.name }}</span></button>
+        <button class="button is-fullwidth is-small shelf-option is-radiusless is-white" type="submit" {% if shelf.identifier == current.identifier %}disabled{% endif %}>
+            <span>
+                {% if shelf.identifier == 'to-read' %}{% trans "To Read" %}
+                {% elif shelf.identifier == 'reading' %}{% trans "Currently Reading" %}
+                {% elif shelf.identifier == 'read' %}{% trans "Read" %}
+                {% else %}{{ shelf.name }}{% endif %}
+            </span>
+        </button>
     </form>
 </li>
 {% endfor %}
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index 36e646aa..9e75cefc 100755
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -29,8 +29,13 @@
     <div class="columns is-mobile scroll-x">
         {% for shelf in shelves %}
         <div class="column is-narrow">
-            <h3>{{ shelf.name }}
-                {% if shelf.size > 3 %}<small>(<a href="{{ shelf.local_path }}">{% blocktrans with size=shelf.size %}View all {{ size }}{% endblocktrans %}</a>)</small>{% endif %}</h3>
+            <h3>
+                {% if shelf.name == 'To Read' %}{% trans "To Read" %}
+                {% elif shelf.name == 'Currently Reading' %}{% trans "Currently Reading" %}
+                {% elif shelf.name == 'Read' %}{% trans "Read" %}
+                {% else %}{{ shelf.name }}{% endif %}
+                {% if shelf.size > 3 %}<small>(<a href="{{ shelf.local_path }}">{% blocktrans with size=shelf.size %}View all {{ size }}{% endblocktrans %}</a>)</small>{% endif %}
+            </h3>
             <div class="is-mobile field is-grouped">
             {% for book in shelf.books %}
             <div class="control">
@@ -49,7 +54,7 @@
 
 {% if goal %}
 <div class="block">
-    <h2 class="title">{% now 'Y' %} Reading Goal</h2>
+    <h2 class="title">{% now 'Y' %} {% trans 'Reading Goal' %}</h2>
     {% include 'snippets/goal_progress.html' with goal=goal %}
 </div>
 {% endif %}

From 8e6619294f1864b83a51457a9475567eace42055 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Wed, 1 Dec 2021 21:02:25 +1100
Subject: [PATCH 2/3] oclc server sure is slow

---
 bookwyrm/utils/isni.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/utils/isni.py b/bookwyrm/utils/isni.py
index a35c3f24..65d20c85 100644
--- a/bookwyrm/utils/isni.py
+++ b/bookwyrm/utils/isni.py
@@ -19,7 +19,7 @@ def request_isni_data(search_index, search_term, max_records=5):
         "recordPacking": "xml",
         "sortKeys": "RLV,pica,0,,",
     }
-    result = requests.get("http://isni.oclc.org/sru/", params=query_params, timeout=10)
+    result = requests.get("http://isni.oclc.org/sru/", params=query_params, timeout=15)
     # the OCLC ISNI server asserts the payload is encoded
     # in latin1, but we know better
     result.encoding = "utf-8"

From 2ec6e566986de5ea4c85cf2ec43e002d58a9d4ac Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Thu, 2 Dec 2021 07:28:35 +1100
Subject: [PATCH 3/3] blocktrans for reading goal

---
 bookwyrm/templates/user/user.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index 9e75cefc..ccc4a44e 100755
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -54,7 +54,8 @@
 
 {% if goal %}
 <div class="block">
-    <h2 class="title">{% now 'Y' %} {% trans 'Reading Goal' %}</h2>
+    {% now 'Y' as current_year%}
+    <h2 class="title">{% blocktrans %}{{ current_year }} Reading Goal{% endblocktrans %}</h2>
     {% include 'snippets/goal_progress.html' with goal=goal %}
 </div>
 {% endif %}