diff --git a/bookwyrm/templates/notifications/items/boost.html b/bookwyrm/templates/notifications/items/boost.html index d297de6f8..a1a0a24fb 100644 --- a/bookwyrm/templates/notifications/items/boost.html +++ b/bookwyrm/templates/notifications/items/boost.html @@ -34,7 +34,7 @@ {% else %} {% blocktrans trimmed %} - {{ related_user }} and {{ other_user_count }} others boosted your review of {{ book_title }} + {{ related_user }} and {{ other_user_display_count }} others boosted your review of {{ book_title }} {% endblocktrans %} {% endif %} @@ -57,7 +57,7 @@ {% else %} {% blocktrans trimmed %} - {{ related_user }} and {{ other_user_count }} others boosted your comment on {{ book_title }} + {{ related_user }} and {{ other_user_display_count }} others boosted your comment on {{ book_title }} {% endblocktrans %} {% endif %} @@ -80,7 +80,7 @@ {% else %} {% blocktrans trimmed %} - {{ related_user }} and {{ other_user_count }} others boosted your quote from {{ book_title }} + {{ related_user }} and {{ other_user_display_count }} others boosted your quote from {{ book_title }} {% endblocktrans %} {% endif %} @@ -103,7 +103,7 @@ {% else %} {% blocktrans trimmed %} - {{ related_user }} and {{ other_user_count }} others boosted your status + {{ related_user }} and {{ other_user_display_count }} others boosted your status {% endblocktrans %} {% endif %} diff --git a/bookwyrm/templates/notifications/items/fav.html b/bookwyrm/templates/notifications/items/fav.html index 98b1387b8..0bface201 100644 --- a/bookwyrm/templates/notifications/items/fav.html +++ b/bookwyrm/templates/notifications/items/fav.html @@ -34,7 +34,7 @@ {% else %} {% blocktrans trimmed %} - {{ related_user }} and {{ other_user_count }} others liked your review of {{ book_title }} + {{ related_user }} and {{ other_user_display_count }} others liked your review of {{ book_title }} {% endblocktrans %} {% endif %} @@ -57,7 +57,7 @@ {% else %} {% blocktrans trimmed %} - {{ related_user }} and {{ other_user_count }} others liked your comment on {{ book_title }} + {{ related_user }} and {{ other_user_display_count }} others liked your comment on {{ book_title }} {% endblocktrans %} {% endif %} @@ -80,7 +80,7 @@ {% else %} {% blocktrans trimmed %} - {{ related_user }} and {{ other_user_count }} others liked your quote from {{ book_title }} + {{ related_user }} and {{ other_user_display_count }} others liked your quote from {{ book_title }} {% endblocktrans %} {% endif %} @@ -103,7 +103,7 @@ {% else %} {% blocktrans trimmed %} - {{ related_user }} and {{ other_user_count }} others liked your status + {{ related_user }} and {{ other_user_display_count }} others liked your status {% endblocktrans %} {% endif %} diff --git a/bookwyrm/templates/notifications/items/follow.html b/bookwyrm/templates/notifications/items/follow.html index 3518e7b1b..96b3eddf1 100644 --- a/bookwyrm/templates/notifications/items/follow.html +++ b/bookwyrm/templates/notifications/items/follow.html @@ -12,6 +12,21 @@ {% endblock %} {% block description %} - {% trans "followed you" %} - {% include 'snippets/follow_button.html' with user=notification.related_user %} + +{% if related_user_count == 1 %} + {% blocktrans trimmed %} + {{ related_user }} followed you + {% endblocktrans %} +{% elif related_user_count == 2 %} + {% blocktrans trimmed %} + {{ related_user }} and + {{ second_user }} followed you + {% endblocktrans %} +{% else %} + {% blocktrans trimmed %} + {{ related_user }}, + {{ second_user }}, and {{ other_user_display_count }} users followed you + {% endblocktrans %} +{% endif %} + {% endblock %} diff --git a/bookwyrm/templates/notifications/items/layout.html b/bookwyrm/templates/notifications/items/layout.html index f874f0791..5b1d76ac7 100644 --- a/bookwyrm/templates/notifications/items/layout.html +++ b/bookwyrm/templates/notifications/items/layout.html @@ -3,6 +3,7 @@ {% related_status notification as related_status %} {% with related_users=notification.related_users.all %} +{% with related_user_count=notification.related_users.count %}
- {% if notification.related_users.count == 1 %} + {% if related_user_count == 1 %} {% with user=related_users.first %} {% spaceless %} @@ -41,13 +42,15 @@ {% with related_user_link=related_users.first.local_path %} {% with second_user=related_users.all.1.display_name %} {% with second_user_link=related_users.all.1.local_path %} - {% with other_user_count=notification.related_users.count|add:"-1"|intcomma %} + {% with other_user_count=related_user_count|add:"-1" %} + {% with other_user_display_count=other_user_count|intcomma %} {% block description %}{% endblock %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} + {% endwith %}