novaburst/funquail
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix #806: Use proper site name/domain in emails

Browse source
This commit is contained in:
Eliot Berriot 2019-04-23 11:14:58 +02:00
commit 39485c8e02
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
6 changed files with 48 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
api/funkwhale_api/templates/account/email/email_confirmation_message.txt
View file

@ -1,8 +1,8 @@
{% load account %}{% user_display user as user_display %}{% load i18n %}{% autoescape off %}{% blocktrans with site_name=current_site.name site_domain=current_site.domain %}Hello from {{ site_name }}!
{% load account %}{% user_display user as user_display %}{% load i18n %}{% autoescape off %}{% blocktrans with site_name=funkwhale_site_name site_domain=funkwhale_site_domain %}Hello from {{ site_name }}!
You're receiving this e-mail because user {{ user_display }} at {{ site_domain }} has given yours as an e-mail address to connect their account.
To confirm this is correct, go to {{ funkwhale_url }}/auth/email/confirm?key={{ key }}
{% endblocktrans %}{% endautoescape %}
{% blocktrans with site_name=current_site.name site_domain=current_site.domain %}Thank you from {{ site_name }}!
{% blocktrans with site_name=funkwhale_site_name site_domain=funkwhale_site_domain %}Thank you from {{ site_name }}!
{{ site_domain }}{% endblocktrans %}

4
api/funkwhale_api/templates/registration/password_reset_email.html
View file

@ -1,5 +1,5 @@
{% load i18n %}{% autoescape off %}
{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}
{% blocktrans with site_name=funkwhale_site_name %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}
{% trans "Please go to the following page and choose a new password:" %}
{{ funkwhale_url }}/auth/password/reset/confirm?uid={{ uid }}&token={{ token }}
@ -7,6 +7,6 @@
{% trans "Thanks for using our site!" %}
{% blocktrans %}The {{ site_name }} team{% endblocktrans %}
{% blocktrans with site_name=funkwhale_site_name %}The {{ site_name }} team{% endblocktrans %}
{% endautoescape %}