haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 14:50:29 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1528 from haiwen/update-email

Browse Source 
update send email
This commit is contained in:
xiez
2017-03-30 10:02:42 +08:00
committed by GitHub
parent 2cb2bca2cd 3d87f86036
commit 9736e9599a
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seahub/group/templates/group/add_member_email.html
View File

@@ -8,7 +8,7 @@
<p style="color:#121214;font-size:14px;">{% trans "Hi, " %}</p> <p style="color:#121214;font-size:14px;">{% trans "Hi, " %}</p>
<p style="font-size:14px;color:#434144;"> <p style="font-size:14px;color:#434144;">
{% blocktrans with grp_name=group.group_name %}{{ email|email2nickname|escape }} invited you to join group {{ grp_name }} on {{ site_name }}: {% endblocktrans %}<br /> {% blocktrans with grp_name=group.group_name escaped_nickname=email|email2nickname|escape %}{{ escaped_nickname }} invited you to join group {{ grp_name }} on {{ site_name }}: {% endblocktrans %}<br />
{{ url_base }}{% url 'registration_register' %}?src={{ to_email }} {{ url_base }}{% url 'registration_register' %}?src={{ to_email }}
</p> </p>

4
seahub/templates/shared_link_email.html
View File

@@ -1,6 +1,6 @@
{% extends 'email_base.html' %} {% extends 'email_base.html' %}
{% load i18n %} {% load i18n seahub_tags %}
{% block email_con %} {% block email_con %}
@@ -9,7 +9,7 @@
<p style="color:#121214;font-size:14px;">{% trans "Hi," %}</p> <p style="color:#121214;font-size:14px;">{% trans "Hi," %}</p>
<p style="font-size:14px;color:#434144;"> <p style="font-size:14px;color:#434144;">
{% blocktrans %}{{ email|email2nickname|escape }} shared a {{ file_shared_type }} <span style="font-weight:bold;">{{ file_shared_name}}</span> to you on {{ site_name }}:{% endblocktrans%} <br /> {% blocktrans with escaped_nickname=email|email2nickname|escape %}{{ escaped_nickname }} shared a {{ file_shared_type }} <span style="font-weight:bold;">{{ file_shared_name}}</span> to you on {{ site_name }}:{% endblocktrans%} <br />
<a href="{{ file_shared_link }}">{{ file_shared_link }}</a> <a href="{{ file_shared_link }}">{{ file_shared_link }}</a>
</p> </p>

4
seahub/templates/shared_upload_link_email.html
View File

@@ -1,6 +1,6 @@
{% extends 'email_base.html' %} {% extends 'email_base.html' %}
{% load i18n %} {% load i18n seahub_tags %}
{% block email_con %} {% block email_con %}
{% autoescape off %} {% autoescape off %}
@@ -8,7 +8,7 @@
<p style="color:#121214;font-size:14px;">{% trans "Hi," %}</p> <p style="color:#121214;font-size:14px;">{% trans "Hi," %}</p>
<p style="font-size:14px;color:#434144;"> <p style="font-size:14px;color:#434144;">
{% blocktrans %}{{ email|email2nickname|escape }} shared an upload link to you on {{ site_name }}.{% endblocktrans%} {% blocktrans with escaped_nickname=email|email2nickname|escape %}{{ escaped_nickname }} shared an upload link to you on {{ site_name }}.{% endblocktrans%}
</p> </p>
<p style="font-size:14px;color:#434144;"> <p style="font-size:14px;color:#434144;">

6
seahub/templates/sysadmin/user_add_email.html
View File

@@ -1,6 +1,6 @@
{% extends 'email_base.html' %} {% extends 'email_base.html' %}
{% load i18n %} {% load i18n seahub_tags %}
{% block email_con %} {% block email_con %}
@@ -10,9 +10,9 @@
<p style="font-size:14px;color:#434144;"> <p style="font-size:14px;color:#434144;">
{% if org %} {% if org %}
{% blocktrans with org_name=org.org_name %}{{ user|email2nickname|escape }} invited you to join organization "{{ org_name }}" on {{ site_name }}.{% endblocktrans%} {% blocktrans with org_name=org.org_name escaped_nickname=user|email2nickname|escape %}{{ escaped_nickname }} invited you to join organization "{{ org_name }}" on {{ site_name }}.{% endblocktrans%}
{% else %} {% else %}
{% blocktrans %}{{ user|email2nickname|escape }} invited you to join {{ site_name }}.{% endblocktrans%} {% blocktrans with escaped_nickname=user|email2nickname|escape %}{{ escaped_nickname }} invited you to join {{ site_name }}.{% endblocktrans%}
{% endif %} {% endif %}
</p> </p>

4
seahub/templates/sysadmin/user_batch_add_email.html
View File

@@ -1,6 +1,6 @@
{% extends 'email_base.html' %} {% extends 'email_base.html' %}
{% load i18n %} {% load i18n seahub_tags %}
{% block email_con %} {% block email_con %}
@@ -9,7 +9,7 @@
<p style="color:#121214;font-size:14px;">{% trans "Hi," %}</p> <p style="color:#121214;font-size:14px;">{% trans "Hi," %}</p>
<p style="font-size:14px;color:#434144;"> <p style="font-size:14px;color:#434144;">
{% blocktrans %}{{ user|email2nickname|escape }} invited you to join {{ site_name }}.{% endblocktrans%} {% blocktrans with escaped_nickname=user|email2nickname|escape %}{{ escaped_nickname }} invited you to join {{ site_name }}.{% endblocktrans%}
</p> </p>
<p style="font-size:14px;color:#434144;"> <p style="font-size:14px;color:#434144;">