mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-25 11:01:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3224 from hughrun/move-fix

Browse source 
Pass correct user id in Move notification
This commit is contained in:
Mouse Reeve 2024-01-17 14:25:28 -08:00 committed by GitHub
commit 61a6ee29d8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/templates/moved.html
View file

@ -23,7 +23,7 @@
<div class="notification is-warning"> <div class="notification is-warning">
<p> <p>
{% id_to_username request.user.moved_to as username %} {% id_to_username request.user.moved_to as username %}
{% blocktrans trimmed with moved_to=user.moved_to %} {% blocktrans trimmed with moved_to=user.moved_to %}
<strong>You have moved your account</strong> to <a href="{{ moved_to }}">{{ username }}</a> <strong>You have moved your account</strong> to <a href="{{ moved_to }}">{{ username }}</a>
{% endblocktrans %} {% endblocktrans %}

2
bookwyrm/templates/notifications/items/move_user.html
View file

@ -14,7 +14,7 @@
{% block description %} {% block description %}
{% if related_user_moved_to %} {% if related_user_moved_to %}
{% id_to_username request.user.moved_to as username %} {% id_to_username related_user_moved_to as username %}
{% blocktrans trimmed %} {% blocktrans trimmed %}
{{ related_user }} has moved to <a href="{{ related_user_moved_to }}">{{ username }}</a> {{ related_user }} has moved to <a href="{{ related_user_moved_to }}">{{ username }}</a>
{% endblocktrans %} {% endblocktrans %}

3
bookwyrm/templatetags/utilities.py
View file

@ -125,7 +125,8 @@ def id_to_username(user_id):
name = parts[-1] name = parts[-1]
value = f"{name}@{domain}" value = f"{name}@{domain}"
return value return value
return "a new user account"
@register.filter(name="get_file_size") @register.filter(name="get_file_size")