From 1e6390a405f343a3076e869727e002ffccb9dd8c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 23 Oct 2021 06:59:06 -0700
Subject: [PATCH] Fixes whitespace in translation strings

---
 bookwyrm/templates/groups/suggested_users.html          | 6 +++++-
 bookwyrm/templates/notifications/items/accept.html      | 2 +-
 bookwyrm/templates/notifications/items/fav.html         | 2 +-
 bookwyrm/templates/notifications/items/invite.html      | 2 +-
 bookwyrm/templates/notifications/items/item_layout.html | 7 ++-----
 bookwyrm/templates/notifications/items/join.html        | 2 +-
 bookwyrm/templates/notifications/items/leave.html       | 2 +-
 bookwyrm/templates/notifications/items/remove.html      | 8 ++++----
 bookwyrm/templates/notifications/items/update.html      | 6 +++---
 9 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/bookwyrm/templates/groups/suggested_users.html b/bookwyrm/templates/groups/suggested_users.html
index 951e7bf0..64498eb8 100644
--- a/bookwyrm/templates/groups/suggested_users.html
+++ b/bookwyrm/templates/groups/suggested_users.html
@@ -36,7 +36,11 @@
         {% endfor %}
     </div>
     {% else %}
-    <p>No potential members found for "{{ user_query }}"</p>
+    <p>
+        {% blocktrans trimmed %}
+        No potential members found for "{{ user_query }}"
+        {% endblocktrans %}
+    </p>
     <br/>
 
 {% endif %}
diff --git a/bookwyrm/templates/notifications/items/accept.html b/bookwyrm/templates/notifications/items/accept.html
index 19acab15..045e2326 100644
--- a/bookwyrm/templates/notifications/items/accept.html
+++ b/bookwyrm/templates/notifications/items/accept.html
@@ -13,7 +13,7 @@
 
 {% block description %}
 
-    {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+    {% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
     accepted your invitation to join group "<a href="{{ group_path }}">{{ group_name }}</a>"
     {% endblocktrans %}
 
diff --git a/bookwyrm/templates/notifications/items/fav.html b/bookwyrm/templates/notifications/items/fav.html
index afc18d73..fbb865e4 100644
--- a/bookwyrm/templates/notifications/items/fav.html
+++ b/bookwyrm/templates/notifications/items/fav.html
@@ -24,7 +24,7 @@
     {% elif related_status.status_type == 'Comment' %}
     {% blocktrans trimmed %}
 
-    liked your <a href="{{ related_path }}">comment on<em>{{ book_title }}</em></a>
+    liked your <a href="{{ related_path }}">comment on <em>{{ book_title }}</em></a>
 
     {% endblocktrans %}
     {% elif related_status.status_type == 'Quotation' %}
diff --git a/bookwyrm/templates/notifications/items/invite.html b/bookwyrm/templates/notifications/items/invite.html
index ddfa3b34..de3b89e4 100644
--- a/bookwyrm/templates/notifications/items/invite.html
+++ b/bookwyrm/templates/notifications/items/invite.html
@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block description %}
-{% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %} 
+{% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
 invited you to join the group <a href="{{ group_path }}">{{ group_name }}</a>
 {% endblocktrans %}
 <div class="row shrink">
diff --git a/bookwyrm/templates/notifications/items/item_layout.html b/bookwyrm/templates/notifications/items/item_layout.html
index 382978d4..8db68daf 100644
--- a/bookwyrm/templates/notifications/items/item_layout.html
+++ b/bookwyrm/templates/notifications/items/item_layout.html
@@ -1,4 +1,3 @@
-{% load humanize %}
 {% load bookwyrm_tags %}
 {% related_status notification as related_status %}
 <div class="notification is-clickable {% if notification.id in unread %} is-primary{% endif %}" data-href="{% block primary_link %}{% endblock %}">
@@ -10,10 +9,8 @@
             <div class="block">
                 <p>
                     {% if notification.related_user %}
-                        <a href="{{ notification.related_user.local_path }}">
-                            {% include 'snippets/avatar.html' with user=notification.related_user %}
-                            {{ notification.related_user.display_name }}
-                        </a>
+                        <a href="{{ notification.related_user.local_path }}">{% include 'snippets/avatar.html' with user=notification.related_user %}
+                            {{ notification.related_user.display_name }}</a>
                     {% endif %}
                     {% block description %}{% endblock %}
                 </p>
diff --git a/bookwyrm/templates/notifications/items/join.html b/bookwyrm/templates/notifications/items/join.html
index 93b35642..c10def45 100644
--- a/bookwyrm/templates/notifications/items/join.html
+++ b/bookwyrm/templates/notifications/items/join.html
@@ -13,7 +13,7 @@
 
 {% block description %}
 
-{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+{% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
 has joined your group "<a href="{{ group_path }}">{{ group_name }}</a>"
 {% endblocktrans %}
 
diff --git a/bookwyrm/templates/notifications/items/leave.html b/bookwyrm/templates/notifications/items/leave.html
index 9c7a71b6..422a31de 100644
--- a/bookwyrm/templates/notifications/items/leave.html
+++ b/bookwyrm/templates/notifications/items/leave.html
@@ -13,7 +13,7 @@
 
 {% block description %}
 
-    {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+    {% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
     has left your group "<a href="{{ group_path }}">{{ group_name }}</a>"
     {% endblocktrans %}
 
diff --git a/bookwyrm/templates/notifications/items/remove.html b/bookwyrm/templates/notifications/items/remove.html
index 7ee38b4a..18a0cf17 100644
--- a/bookwyrm/templates/notifications/items/remove.html
+++ b/bookwyrm/templates/notifications/items/remove.html
@@ -14,13 +14,13 @@
 {% block description %}
 {% if notification.related_user %}
 
-{% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %} 
-has been removed from your group "<a href="{{ group_path }}">{{ group_name }}</a>"
-{% endblocktrans %}
+    {% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+    has been removed from your group "<a href="{{ group_path }}">{{ group_name }}</a>"
+    {% endblocktrans %}
 
 {% else %}
 
-    {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+    {% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
     You have been removed from the "<a href="{{ group_path }}">{{ group_name }}</a> group"
     {% endblocktrans %}
 
diff --git a/bookwyrm/templates/notifications/items/update.html b/bookwyrm/templates/notifications/items/update.html
index f963fd3a..be796b78 100644
--- a/bookwyrm/templates/notifications/items/update.html
+++ b/bookwyrm/templates/notifications/items/update.html
@@ -13,15 +13,15 @@
 
 {% block description %}
     {% if notification.notification_type == 'GROUP_PRIVACY' %}
-        {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+        {% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
         has changed the privacy level for <a href="{{ group_path }}">{{ group_name }}</a>
         {% endblocktrans %}
     {% elif notification.notification_type == 'GROUP_NAME' %}
-        {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+        {% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
         has changed the name of <a href="{{ group_path }}">{{ group_name }}</a>
         {% endblocktrans %}
     {% else %}
-        {% blocktrans with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
+        {% blocktrans trimmed with group_name=notification.related_group.name group_path=notification.related_group.local_path %}
         has changed the description of <a href="{{ group_path }}">{{ group_name }}</a>
         {% endblocktrans %}
     {% endif %}