Small changes to get blocktrans to work as expected in move code

bookwyrm-social · Nov 2, 2023 · 2137737 · 2137737
1 parent 621cfa7
commit 2137737
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git 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
@@ -23,14 +23,14 @@
 
           <div class="notification is-warning">
             <p>
-            {% id_to_username request.user.moved_to  as username %}
-            {% blocktrans %}
-            <strong>You have moved your account</strong> to <a href="{{user.moved_to}}">{{ username }}</a>
-            {% endblocktrans %}
+                {% id_to_username request.user.moved_to  as username %}
+                {% blocktrans trimmed with moved_to=user.moved_to %}
+                    <strong>You have moved your account</strong> to <a href="{{ moved_to }}">{{ username }}</a>
+                {% endblocktrans %}
+            </p>
+            <p class="mt-2">
+                {% trans "You can undo the move to restore full functionality, but some followers may have already unfollowed this account." %}
             </p>
-            {% blocktrans %}
-            <p class="mt-2">You can undo the move to restore full functionality, but some followers may have already unfollowed this account.</p>
-            {% endblocktrans %}
           </div>
         </div>
         <div class="columns is-justify-content-center">
@@ -49,4 +49,4 @@
             </div>
         </div>
       </div>
-</div>
+</div>
diff --git 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 <a href="{{ related_user_moved_to }}">{{ username }}</a>
         {% endblocktrans %}
         <div class="row shrink my-2">
             {% include 'snippets/move_user_buttons.html' with group=notification.related_group %}
         </div>
     {% else %}
-        {% blocktrans %}
+        {% blocktrans trimmed %}
         {{ related_user }} has undone their move
         {% endblocktrans %}
     {% endif %}