aboutsummaryrefslogtreecommitdiffstats
path: root/templates/registration
diff options
context:
space:
mode:
authorWeitian LI <liweitianux@gmail.com>2014-04-29 00:47:30 +0800
committerWeitian LI <liweitianux@gmail.com>2014-04-29 00:47:30 +0800
commitefe31dcaf500ac93338c1e493672dbedbcecde7a (patch)
tree1dd6fd2b9864525b48464080dd7eb9600d94331a /templates/registration
parent0f3c82eb7219a5bddf2609087df1472717225d5c (diff)
downloaddjango-skaschool-efe31dcaf500ac93338c1e493672dbedbcecde7a.tar.bz2
* updated activation_email subject and content template
* updated password_reset_email subject and content template * fixed a typo in 400.html * small update to profile_update_done btn style
Diffstat (limited to 'templates/registration')
-rw-r--r--templates/registration/activation_email.txt14
-rw-r--r--templates/registration/activation_email_subject.txt2
2 files changed, 8 insertions, 8 deletions
diff --git a/templates/registration/activation_email.txt b/templates/registration/activation_email.txt
index 0667fa0..8bb5122 100644
--- a/templates/registration/activation_email.txt
+++ b/templates/registration/activation_email.txt
@@ -1,14 +1,14 @@
-Hello,
+您好,
-Please follow the link below to activate your account at
-"2014 SKA Summer School"({{ site }}).
+感谢您在"2014SKA暑期学校网站"(http://{{ site }})
+注册账户,请使用以下链接来激活您的账户,然后您便可以登录
+以及修改个人资料。
http://{{ site }}/accounts/activate/{{ activation_key }}
-Note: this link will expire in {{ expiration_days }} days.
+注意:该链接将在{{ expiration_days }}天后过期失效。
-Best regards.
-
-2014 SKA Summer School Team
+祝好!
+2014SKA暑期学校团队
diff --git a/templates/registration/activation_email_subject.txt b/templates/registration/activation_email_subject.txt
index 215f006..43d2353 100644
--- a/templates/registration/activation_email_subject.txt
+++ b/templates/registration/activation_email_subject.txt
@@ -1 +1 @@
-激活您的账户
+[2014SKA暑期学校]激活您的账户