From 8bb5a664c53449290c95aa53c82ec96ddc5bd526 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@mouses-mbp-new.attlocal.net>
Date: Mon, 11 Dec 2023 20:12:14 -0800
Subject: [PATCH] Fixes incorrect translation and display of moved user page

---
 bookwyrm/templates/shelf/shelf.html               | 15 +--------------
 .../templates/snippets/moved_user_notice.html     | 12 ++++++++++++
 bookwyrm/templates/user/layout.html               |  7 +------
 3 files changed, 14 insertions(+), 20 deletions(-)
 create mode 100644 bookwyrm/templates/snippets/moved_user_notice.html

diff --git a/bookwyrm/templates/shelf/shelf.html b/bookwyrm/templates/shelf/shelf.html
index a2410ef95..45a94fed9 100644
--- a/bookwyrm/templates/shelf/shelf.html
+++ b/bookwyrm/templates/shelf/shelf.html
@@ -19,20 +19,7 @@
     </h1>
 </header>
 {% if user.moved_to %}
-<div class="container my-6">
-    <div class="notification is-info has-text-centered">
-        <p>
-            {% trans "You have have moved to" %}
-            <a href="{{user.moved_to}}">{% id_to_username user.moved_to %}</a>
-        </p>
-        <p> {% trans "You can undo this move to restore full functionality, but some followers may have already unfollowed this account." %}</p>
-        <form name="remove-alias" action="{% url 'prefs-unmove' %}" method="post">
-            {% csrf_token %}
-            <input type="hidden" name="remote_id" id="remote_id" value="{{user.moved_to}}">
-            <button type="submit" class="button is-small">{% trans "Undo move" %}</button>
-        </form>
-    </div>
-</div>
+    {% include "snippets/moved_user_notice.html" with user=user %}
 {% else %}
 <nav class="breadcrumb subtitle" aria-label="breadcrumbs">
     <ul>
diff --git a/bookwyrm/templates/snippets/moved_user_notice.html b/bookwyrm/templates/snippets/moved_user_notice.html
new file mode 100644
index 000000000..7bb1e24e6
--- /dev/null
+++ b/bookwyrm/templates/snippets/moved_user_notice.html
@@ -0,0 +1,12 @@
+{% load i18n %}
+{% load utilities %}
+<div class="container my-6">
+    <div class="notification is-info has-text-centered">
+        <p>
+            {% id_to_username user.moved_to as moved_to_name %}
+            {% blocktrans trimmed with user=user|username moved_to_link=user.moved_to %}
+            <em>{{ user }}</em> has moved to <a href="{{ moved_to_link }}">{{ moved_to_name }}</a>
+            {% endblocktrans %}
+        </p>
+    </div>
+</div>
diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html
index 57d25120d..7a5d4063c 100755
--- a/bookwyrm/templates/user/layout.html
+++ b/bookwyrm/templates/user/layout.html
@@ -45,12 +45,7 @@
     </div>
     <div>
     {% if user.moved_to %}
-        <div class="container my-6">
-            <div class="notification is-info has-text-centered">
-                <p><em>{{ user.localname }}</em> {% trans "has moved to" %} <a href="{{user.moved_to}}">{% id_to_username user.moved_to %}</a></p>
-            </div>
-        </div>
-
+        {% include "snippets/moved_user_notice.html" with user=user %}
     {% else %}
         {% if not is_self and request.user.is_authenticated %}
         {% include 'snippets/follow_button.html' with user=user %}