mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-22 09:31:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3152 from bookwyrm-social/fixes-typo-in-move-notice

Browse source 
Fixes incorrect translation and display of moved user page
This commit is contained in:
Mouse Reeve 2023-12-12 14:59:00 -08:00 committed by GitHub
commit 000e5e6145
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
bookwyrm/templates/shelf/shelf.html
View file

@ -19,20 +19,7 @@
</h1> </h1>
</header> </header>
{% if user.moved_to %} {% if user.moved_to %}
<div class="container my-6"> {% include "snippets/moved_user_notice.html" with user=user %}
<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>
{% else %} {% else %}
<nav class="breadcrumb subtitle" aria-label="breadcrumbs"> <nav class="breadcrumb subtitle" aria-label="breadcrumbs">
<ul> <ul>

12
bookwyrm/templates/snippets/moved_user_notice.html Normal file
View file

@ -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>

7
bookwyrm/templates/user/layout.html
View file

@ -45,12 +45,7 @@
</div> </div>
<div> <div>
{% if user.moved_to %} {% if user.moved_to %}
<div class="container my-6"> {% include "snippets/moved_user_notice.html" with user=user %}
<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>
{% else %} {% else %}
{% if not is_self and request.user.is_authenticated %} {% if not is_self and request.user.is_authenticated %}
{% include 'snippets/follow_button.html' with user=user %} {% include 'snippets/follow_button.html' with user=user %}