From ee71f5df21886ca3aa128a706f5a1c81c60aa7c9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 5 Jul 2022 12:28:48 -0700
Subject: [PATCH] Updates language on boosts

---
 .../templates/notifications/items/boost.html  | 92 ++++++++++++++++---
 .../templates/notifications/items/fav.html    |  1 -
 2 files changed, 80 insertions(+), 13 deletions(-)

diff --git a/bookwyrm/templates/notifications/items/boost.html b/bookwyrm/templates/notifications/items/boost.html
index 5e3e11513..d297de6f8 100644
--- a/bookwyrm/templates/notifications/items/boost.html
+++ b/bookwyrm/templates/notifications/items/boost.html
@@ -16,29 +16,97 @@
     {% with related_status.local_path as related_path %}
 
     {% if related_status.status_type == 'Review' %}
-    {% blocktrans trimmed %}
+        {% if other_user_count == 0 %}
 
-    boosted your <a href="{{ related_path }}">review of <em>{{ book_title }}</em></a>
+        {% blocktrans trimmed %}
+        <a href="{{ related_user_link }}">{{ related_user }}</a> boosted your <a href="{{ related_path }}">review of <em>{{ book_title }}</em></a>
+        {% endblocktrans %}
 
-    {% endblocktrans %}
+        {% elif other_user_count == 1 %}
+
+        {% blocktrans trimmed %}
+        <a href="{{ related_user_link }}">{{ related_user }}</a>
+        and
+        <a href="{{ second_user_link }}">{{ second_user }}</a>
+        boosted your <a href="{{ related_path }}">review of <em>{{ book_title }}</em></a>
+        {% endblocktrans %}
+
+        {% else %}
+
+        {% blocktrans trimmed %}
+        <a href="{{ related_user_link }}">{{ related_user }}</a> and {{ other_user_count }} others boosted your <a href="{{ related_path }}">review of <em>{{ book_title }}</em></a>
+        {% endblocktrans %}
+
+        {% endif %}
     {% elif related_status.status_type == 'Comment' %}
-    {% blocktrans trimmed %}
+        {% if other_user_count == 0 %}
 
-    boosted your <a href="{{ related_path }}">comment on<em>{{ book_title }}</em></a>
+        {% blocktrans trimmed %}
+        <a href="{{ related_user_link }}">{{ related_user }}</a> boosted your <a href="{{ related_path }}">comment on <em>{{ book_title }}</em></a>
+        {% endblocktrans %}
 
-    {% endblocktrans %}
+        {% elif other_user_count == 1 %}
+
+        {% blocktrans trimmed %}
+        <a href="{{ related_user_link }}">{{ related_user }}</a>
+        and
+        <a href="{{ second_user_link }}">{{ second_user }}</a>
+        boosted your <a href="{{ related_path }}">comment on <em>{{ book_title }}</em></a>
+        {% endblocktrans %}
+
+        {% else %}
+
+        {% blocktrans trimmed %}
+        <a href="{{ related_user_link }}">{{ related_user }}</a> and {{ other_user_count }} others boosted your <a href="{{ related_path }}">comment on <em>{{ book_title }}</em></a>
+        {% endblocktrans %}
+
+        {% endif %}
     {% elif related_status.status_type == 'Quotation' %}
-    {% blocktrans trimmed %}
+        {% if other_user_count == 0 %}
 
-    boosted your <a href="{{ related_path }}">quote from <em>{{ book_title }}</em></a>
+        {% blocktrans trimmed %}
+        <a href="{{ related_user_link }}">{{ related_user }}</a> boosted your <a href="{{ related_path }}">quote from <em>{{ book_title }}</em></a>
+        {% endblocktrans %}
 
-    {% endblocktrans %}
+        {% elif other_user_count == 1 %}
+
+        {% blocktrans trimmed %}
+        <a href="{{ related_user_link }}">{{ related_user }}</a>
+        and
+        <a href="{{ second_user_link }}">{{ second_user }}</a>
+        boosted your <a href="{{ related_path }}">quote from <em>{{ book_title }}</em></a>
+        {% endblocktrans %}
+
+        {% else %}
+
+        {% blocktrans trimmed %}
+        <a href="{{ related_user_link }}">{{ related_user }}</a> and {{ other_user_count }} others boosted your <a href="{{ related_path }}">quote from <em>{{ book_title }}</em></a>
+        {% endblocktrans %}
+
+        {% endif %}
     {% else %}
-    {% blocktrans trimmed %}
+        {% if other_user_count == 0 %}
 
-    boosted your <a href="{{ related_path }}">status</a>
+        {% blocktrans trimmed %}
+        <a href="{{ related_user_link }}">{{ related_user }}</a> boosted your <a href="{{ related_path }}">status</a>
+        {% endblocktrans %}
 
-    {% endblocktrans %}
+        {% elif other_user_count == 1 %}
+
+        {% blocktrans trimmed %}
+        <a href="{{ related_user_link }}">{{ related_user }}</a>
+        and
+        <a href="{{ second_user_link }}">{{ second_user }}</a>
+        boosted your <a href="{{ related_path }}">status</a>
+        {% endblocktrans %}
+
+        {% else %}
+
+        {% blocktrans trimmed %}
+        <a href="{{ related_user_link }}">{{ related_user }}</a> and {{ other_user_count }} others boosted your <a href="{{ related_path }}">status</a>
+        {% endblocktrans %}
+
+        {% endif %}
     {% endif %}
 
     {% endwith %}
diff --git a/bookwyrm/templates/notifications/items/fav.html b/bookwyrm/templates/notifications/items/fav.html
index 4b1e90dd6..98b1387b8 100644
--- a/bookwyrm/templates/notifications/items/fav.html
+++ b/bookwyrm/templates/notifications/items/fav.html
@@ -85,7 +85,6 @@
 
         {% endif %}
     {% else %}
-
         {% if other_user_count == 0 %}
 
         {% blocktrans trimmed %}