From efe31dcaf500ac93338c1e493672dbedbcecde7a Mon Sep 17 00:00:00 2001
From: Weitian LI <liweitianux@gmail.com>
Date: Tue, 29 Apr 2014 00:47:30 +0800
Subject: * 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

---
 templates/400.html                                  |  2 +-
 templates/registration/activation_email.txt         | 14 +++++++-------
 templates/registration/activation_email_subject.txt |  2 +-
 templates/test.html                                 |  3 ---
 4 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100644 templates/test.html

(limited to 'templates')

diff --git a/templates/400.html b/templates/400.html
index 89ce313..69bba66 100644
--- a/templates/400.html
+++ b/templates/400.html
@@ -10,7 +10,7 @@
 
 {% block content %}
   <div class="container">
-    <h2>404 Bad Request</h2>
+    <h2>400 Bad Request</h2>
     <p class="lead">Oops, 无效的请求……</p>
     <br>
     <p>如有问题，请与我们联系：<a href="mailto:skaschool2014@163.com"><code>skaschool2014@163.com</code></a></p>
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暑期学校]激活您的账户
diff --git a/templates/test.html b/templates/test.html
deleted file mode 100644
index 85ec3e6..0000000
--- a/templates/test.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% extends 'base.html' %}
-
-{# vim: set ts=8 sw=4 tw=0 fenc=utf-8 ft=htmldjango.html: #}
-- 
cgit v1.2.2