diff --git a/bookwyrm/templates/feed/layout.html b/bookwyrm/templates/feed/layout.html index 1a2fb33c6..b70ed99ea 100644 --- a/bookwyrm/templates/feed/layout.html +++ b/bookwyrm/templates/feed/layout.html @@ -1,6 +1,5 @@ {% extends 'layout.html' %} {% load i18n %} -{% load utilities %} {% block title %}{% trans "Updates" %}{% endblock %} diff --git a/bookwyrm/templates/moved.html b/bookwyrm/templates/moved.html index 1ad837f18..545fc3d87 100644 --- a/bookwyrm/templates/moved.html +++ b/bookwyrm/templates/moved.html @@ -23,14 +23,14 @@

- {% id_to_username request.user.moved_to as username %} - {% blocktrans %} - You have moved your account to {{ username }} - {% endblocktrans %} + {% id_to_username request.user.moved_to as username %} + {% blocktrans trimmed with moved_to=user.moved_to %} + You have moved your account to {{ username }} + {% endblocktrans %} +

+

+ {% trans "You can undo the move to restore full functionality, but some followers may have already unfollowed this account." %}

- {% blocktrans %} -

You can undo the move to restore full functionality, but some followers may have already unfollowed this account.

- {% endblocktrans %}
@@ -49,4 +49,4 @@
- \ No newline at end of file + diff --git a/bookwyrm/templates/notifications/items/move_user.html b/bookwyrm/templates/notifications/items/move_user.html index c3587057e..b94d96dc4 100644 --- a/bookwyrm/templates/notifications/items/move_user.html +++ b/bookwyrm/templates/notifications/items/move_user.html @@ -15,14 +15,14 @@ {% block description %} {% if related_user_moved_to %} {% id_to_username request.user.moved_to as username %} - {% blocktrans %} + {% blocktrans trimmed %} {{ related_user }} has moved to {{ username }} {% endblocktrans %}
{% include 'snippets/move_user_buttons.html' with group=notification.related_group %}
{% else %} - {% blocktrans %} + {% blocktrans trimmed %} {{ related_user }} has undone their move {% endblocktrans %} {% endif %}