diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2009-07-10 19:11:10 -0400 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2009-07-10 19:11:10 -0400 |
commit | 1ec02bd63bc9367637832f23cd011b660b68dc86 (patch) | |
tree | cd4f7417cdbabc6834aeb45f73f09208a738ac2d /templates/authopenid | |
parent | 4d16497d949208d290e9b0f0f540cf41386cf896 (diff) | |
download | askbot-1ec02bd63bc9367637832f23cd011b660b68dc86.tar.gz askbot-1ec02bd63bc9367637832f23cd011b660b68dc86.tar.bz2 askbot-1ec02bd63bc9367637832f23cd011b660b68dc86.zip |
english translation
Diffstat (limited to 'templates/authopenid')
-rw-r--r-- | templates/authopenid/changeemail.html | 4 | ||||
-rw-r--r-- | templates/authopenid/complete.html | 37 | ||||
-rw-r--r-- | templates/authopenid/htmlfiles | 8 | ||||
-rw-r--r-- | templates/authopenid/sendpw.html | 17 | ||||
-rw-r--r-- | templates/authopenid/settings.html | 10 | ||||
-rw-r--r-- | templates/authopenid/signin.html | 47 | ||||
-rw-r--r-- | templates/authopenid/signup.html | 25 |
7 files changed, 77 insertions, 71 deletions
diff --git a/templates/authopenid/changeemail.html b/templates/authopenid/changeemail.html index a6c53a64..99984b3f 100644 --- a/templates/authopenid/changeemail.html +++ b/templates/authopenid/changeemail.html @@ -1,9 +1,5 @@ {% extends "base_content.html" %} {% load i18n %} - - - - {% block content %} <div id="main-bar" class=""> <h3> diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html index fd243f28..28c38a04 100644 --- a/templates/authopenid/complete.html +++ b/templates/authopenid/complete.html @@ -1,19 +1,19 @@ {% extends "base.html" %} +{% load i18n %} {% block head %}{% endblock %} -{% block title %}{% spaceless %}绑定OpenID{% endspaceless %}{% endblock %} +{% block title %}{% spaceless %}{% trans "Connect your OpenID with this site" %}{% endspaceless %}{% endblock %} {% block content %} <div id="main-bar" class="headNormal"> - 绑定OpenID帐号 - + {% trans "Connect your OpenID with your account on this site" %} </div> <p id="completetxt" > - <h3>您的OpenID帐号已经验证通过! 请完成最后一步 - 绑定OpenID到您的帐号。</h3> - <p style="display:none">输入您的新帐号或者指定已经存在的帐号。</p> + <h3>{% trans "Your OpenID is accepted. Please complete this to finish registration." %}</h3> + <p style="display:none">{% trans "This account already exists, please use another." %}</p> </p> {% if form1.errors %} <p class="errors"> - <span class="big">请注意以下错误:</span><br> + <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br> <ul class="error-list"> {% if form1.username.errors %} <li><span class="error">{{ form1.username.errors|join:", " }}</span></li> @@ -26,7 +26,7 @@ {% endif %} {% if form2.errors %} <p class="errors"> - <span class="big">请注意以下错误:</span><br> + <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br> <ul class="error-list"> {% if form2.username.errors %} <li><span class="error">{{ form2.username.errors|join:", " }}</span></li> @@ -42,10 +42,10 @@ <form name="fregister" action="{% url user_register %}" method="POST"> {{ form.next }} <fieldset style="padding:10px"> - <legend class="big">新帐号</legend> - <div class="form-row"><label for="id_username">用户名(<i>在社区显示友好名称,不可更改</i>)</label><br />{{ form1.username }}</div> - <div class="form-row"><label for="id_email">电子邮件(<i>用于头像显示服务</i>)</label><br />{{ form1.email }}</div> - <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="创建帐号"></div> + <legend class="big">{% trans "New account" %}</legend> + <div class="form-row"><label for="id_username">{% trans "User name (<i>will be shown to others, cannot be modified</i>)" %}</label><br />{{ form1.username }}</div> + <div class="form-row"><label for="id_email">{% trans "Email (<i>not shared with anyone</i>)" %}</label><br />{{ form1.email }}</div> + <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"></div> </fieldset> </form> </div> @@ -53,14 +53,15 @@ <form name="fverify" action="{% url user_register %}" method="POST"> {{ form.next }} <fieldset style="padding:10px"> - <legend class="big">已经存在的用户</legend> - <div class="form-row"><label for="id_username">用户名</label><br />{{ form2.username }}</div> - <div class="form-row"><label for="id_passwordl">密码</label><br />{{ form2.password }}</div> - <div class="submit-row"><input type="submit" class="submit" name="bverify" value="确认"> <a href="">忘记密码?</a></div> + <legend class="big">{% trans "Existing account" %}</legend> + <div class="form-row"><label for="id_username">{% trans "user name" %}</label><br />{{ form2.username }}</div> + <div class="form-row"><label for="id_passwordl">{% trans "password" %}</label><br />{{ form2.password }}</div> + <!--todo double check translation from chinese 确认 = "Register" --> + <div class="submit-row"> + <input type="submit" class="submit" name="bverify" value="{% trans "Register" %}"> + <a href="">{% trans "Forgot your password?" %}</a> + </div> </fieldset> </form> </div> {% endblock %} - - - diff --git a/templates/authopenid/htmlfiles b/templates/authopenid/htmlfiles new file mode 100644 index 00000000..1b9dccd0 --- /dev/null +++ b/templates/authopenid/htmlfiles @@ -0,0 +1,8 @@ +changeemail.html +changeopenid.html +changepw.html +delete.html +failure.html +sendpw.html +settings.html +signup.html diff --git a/templates/authopenid/sendpw.html b/templates/authopenid/sendpw.html index 237a5cf6..a9488c4c 100644 --- a/templates/authopenid/sendpw.html +++ b/templates/authopenid/sendpw.html @@ -1,17 +1,18 @@ {% extends "base.html" %} -{% block title %}{% spaceless %}发送新密码{% endspaceless %}{% endblock %} +{% load i18n %} +{% block title %}{% spaceless %}{% trans "Send new password" %}{% endspaceless %}{% endblock %} {% block content %} <div id="main-bar" class=""> - <h3 >发送新密码</h3> + <h3>{% trans "Send new password" %}</h3> </div> <div class="paragraph"> -丢失了您的密码? 你可以在这里重设密码。<br> -请输入用户名,新的密码会发送到你注册时候填写的电子邮件。 +{% trans "Lost your password? No problem - here you can reset it." %}<br> +{% trans "Please enter your username below and new password will be sent to your registered e-mail" %} </div> {% if form.errors %} -<p class="errors"><span class="big">请注意以下错误:</span><br> +<p class="errors"><span class="big">{% "Sorry, looks like we have some errors:" %}</span><br> {% if form.username.errors %} <span class="error">{{ form.username.errors|join:", " }}</span> {% endif %} @@ -23,11 +24,11 @@ <div class="aligned"> <form action="." method="post" accept-charset="utf-8"> - <div id="form-row"><label for="id_username">用户名: </label>{{ form.username }}</div> + <div id="form-row"><label for="id_username">{% trans "User name" %}:</label>{{ form.username }}</div> - <p style="padding-top:10px"><input type="submit" value="重设密码"> <a href="{% url user_signin %}">返回登录</a></p> + <p style="padding-top:10px"><input type="submit" value="{% trans "Reset password" %}"> <a href="{% url user_signin %}">{% trans "return to login" %}</a></p> </form> - <span class="darkred">注意: 新的密码只有您在激活邮件中的链接后才会被激活。</span> + <span class="darkred">{% trans "Note: your new password will be activated only after you click the activation link in the email message" %}</span> </div> {% endblock %} diff --git a/templates/authopenid/settings.html b/templates/authopenid/settings.html index c765b989..ffd5dd8f 100644 --- a/templates/authopenid/settings.html +++ b/templates/authopenid/settings.html @@ -17,7 +17,7 @@ {% block content %} <div id="main-bar"> - <h3><strong>{{ request.user.username }}账户设置</strong></h3> + <h3><strong>{{ request.user.username }} {% trans "Profile" %}</strong></h3> </div> <div id="settings-options"> {% if msg %} @@ -25,16 +25,16 @@ {% endif %} <dl class="list-item"> - <dt>» <a href="{% url user_changepw %}">修改密码</a></dt> + <dt>» <a href="{% url user_changepw %}">{% trans "Change password" %}</a></dt> <dd>{% trans "Give your account a new password." %}</dd> - <dt>» <a href="{% url user_changeemail %}">更换电子邮件</a></dt> + <dt>» <a href="{% url user_changeemail %}">{% trans "Change email " %}</a></dt> <dd>{% trans "Add or update the email address associated with your account." %}</dd> {% if is_openid %} - <dt>» <a href="{% url user_changeopenid %}">更换OpenID地址</a></dt> + <dt>» <a href="{% url user_changeopenid %}">{% trans "Change OpenID %}</a></dt> <dd>{% trans "Change openid associated to your account" %}</dd> {% endif %} - <dt>» <a href="{% url user_delete %}">删除帐号</a></dt> + <dt>» <a href="{% url user_delete %}">{% trans "Delete account" %}</a></dt> <dd>{% trans "Erase your username and all your data from website" %}</dd> </dl> </div> diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html index 9c5511f2..aff2f06f 100644 --- a/templates/authopenid/signin.html +++ b/templates/authopenid/signin.html @@ -1,5 +1,6 @@ {% extends "base.html" %} -{% block title %}{% spaceless %}用户登录{% endspaceless %}{% endblock %} +{% load i18n %} +{% block title %}{% spaceless %}{% trans "User login" %}{% endspaceless %}{% endblock %} {% block forejs %} <script type="text/javascript" src="/content/js/jquery.openid.js?"></script> <script type='text/javascript' src='/content/js/jquery.validate.pack.js'></script> @@ -12,26 +13,26 @@ {% endblock %} {% block content %} <div class="headNormal"> - 用户登录 + {% trans "User login" %} </div> <div class="login"> <form name="openid_form" action="{% url user_signin %}" method="post"> {{ form2.next }} - <p style="display:none">CNProg支持<b>两种</b>登录模式。您可以使用帐号、密码登录,或者使用OpenID登录。</p> + <p style="display:none">{% trans "we support two login modes" %}</p> {% if msg %} <p class="warning">{{ msg }}</p> {% endif %} <fieldset class="fieldset"> - <legend ><strong>使用OpenID登录</strong></legend> + <legend ><strong>{% trans "Login with your OpenID" %}</strong></legend> <div id="openid_choice"> - <p>请选择您的帐号类型并完成正确的OpenID地址(如:替换“{username}”为您的对应帐号):</p> + <p>{% trans "select openid provider" %}</p> <div id="openid_btns"> </div> + <br><br><br> + <p>{% trans "verify openid link and login" %}</p> </div> - <br> - <br><br> <p> - {{ form2.openid_url }} <input id="bsignin" name="bsignin" type="submit" value="登录" class="openid-login-submit" /> + {{ form2.openid_url }} <input id="bsignin" name="bsignin" type="submit" value="{% trans "Login" %}" class="openid-login-submit" /> </p> </fieldset> </form> @@ -39,7 +40,7 @@ <br> {% if form1.errors %} <p class="errors"> - <span class="big">请注意以下错误:</span><br> + <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br> <ul class="error-list"> {% if form1.username.errors %} <li><span class="error">{{ form1.username.errors|join:", " }}</span></li> @@ -54,11 +55,12 @@ <form name="fauth" action="{% url user_signin %}" method="post"> {{ form1.next }} <fieldset class="fieldset" > - <legend class="big">使用帐号密码登录</legend> - <div class="form-row"><label for="id_username">用户名:</label><br />{{ form1.username }}</div> - <div class="form-row"><label for="id_password">密码:</label><br />{{ form1.password }}</div> - <div class="submit-row"><input type="submit" class="submit" name="blogin" value="登录"> <a href="">忘记密码?</a> <a href="">注册新帐号</a></div> - + <legend class="big">{% trans "Use login name and password" %}</legend> + <div class="form-row"><label for="id_username">{% trans "Login name" %}:</label><br />{{ form1.username }}</div> + <div class="form-row"><label for="id_password">{% trans "Password" %}:</label><br />{{ form1.password }}</div> + <div class="submit-row"><input type="submit" class="submit" name="blogin" value="{% trans "Login" %}"> + <a href="">{% trans "Forgot your password?" %}</a> + <a href="">{% trans "Create new acccount" %}</a></div> </fieldset> </form> </div> @@ -67,28 +69,25 @@ {% block sidebar %} <div class="boxC"> - <h3 class="subtitle">为什么需要OpenID登录?</h3> + <h3 class="subtitle">{% trans "Why use OpenID?" %}</h3> <p> <ul class="list-item"> <li> - 构建在OpenID网络认证上的本系统,不需要你注册新的帐号,即可使用我们系统的所有功能 + {% trans "with openid it is easier" %} </li> <li> - 用同一个帐号可登录互联网所有激活OpenID的网站 - + {% trans "reuse openid" %} </li> <li> - 全世界有1.6亿OpenID帐号,和10,000个支持OpenID的站点 - + {% trans "openid is widely adopted" %} </li> <li> - OpenID是有开放标准,并且有相关的基金组织提供支持 - + {% trans "openid is supported open standard" %} </li> </ul> - <a href="http://openid.net/what/" target="_blank" style="float:right;position:relative">查看更多 »</a><br> - <a href="http://openid.net/get/" target="_blank" style="float:right;position:relative">获取OpenID »</a> + <a href="http://openid.net/what/" target="_blank" style="float:right;position:relative">{% trans "Find out more" %} »</a><br> + <a href="http://openid.net/get/" target="_blank" style="float:right;position:relative">{% trans "Get OpenID" %} »</a> </p> <br> </div> diff --git a/templates/authopenid/signup.html b/templates/authopenid/signup.html index e51544f7..a4460aa3 100644 --- a/templates/authopenid/signup.html +++ b/templates/authopenid/signup.html @@ -1,18 +1,18 @@ {% extends "base.html" %} -{% block title %}{% spaceless %}注册帐号{% endspaceless %}{% endblock %} +{% block title %}{% spaceless %}{% trans "Signup" %}{% endspaceless %}{% endblock %} {% block content %} <div id="main-bar" class=""> - <h3 >注册帐号</h3> + <h3 >{% trans "Signup" %}</h3> </div> <div class="jointxt"> - <p>我们支持两种注册方式,你可以使用常规的用户名、密码方式注册,或者<a href="{% url user_signin %}">使用OpenID帐号注册</a>。</p> + <p>{% trans "We support two types of user registration: conventional username/password, and" %} <a href="{% url user_signin %}">{% trans "the OpenID method" %}</a>.</p> {% if form.errors %} <p class="errors"> - <span class="big">请注意以下错误:</span><br> + <span class="big">{% trans "Sorry, looks like we have some errors" %}</span><br> <ul class="error-list"> {% if form.username.errors %} <li><span class="error">{{ form.username.errors|join:", " }}</span></li> @@ -30,22 +30,23 @@ </div> <form action="{% url user_signup %}" method="post" accept-charset="utf-8"> <fieldset class="fieldset"> - <legend class="big">常规注册</legend> - <div class="form-row"><label for="id_username">选择一个用户名:</label><br>{{ form.username }}</div> + <legend class="big">{% trans "Conventional registration" %}</legend> + <div class="form-row"><label for="id_username">{% trans "choose a user name" %}:</label><br>{{ form.username }}</div> - <div class="form-row"><label for="id_email">您的电子邮件地址:</label><br>{{ form.email }}</div> - <div class="form-row"><label for="id_password1">密码:</label><br />{{ form.password1 }}</div> - <div class="form-row"><label for="id_password2">确认密码:</label><br>{{ form.password2 }}</div> - <div class="submit-row"><input type="submit" class="submit" value="注册" > <a href="{% url user_signin %}">返回登录</a></div> + <div class="form-row"><label for="id_email">{% trans "your email address" %}:</label><br>{{ form.email }}</div> + <div class="form-row"><label for="id_password1">{% trans "choose password" %}:</label><br />{{ form.password1 }}</div> + <div class="form-row"><label for="id_password2">{% trans "retype password" %}:</label><br>{{ form.password2 }}</div> + <div class="submit-row"><input type="submit" class="submit" value="{% trans "login" %}" > + <a href="{% url user_signin %}">{% trans "back to login" %}</a></div> </fieldset> <br > </form> <br > <div style="display:none"> - <h2 class="signup">使用OpenID注册</h2> + <h2 class="signup">{% trans "Register with your OpenID" %}</h2> <form name="fopenid" action="{% url user_signin %}" method="post"> <div class="form-row">{{ form2.openid_url }}</div> - <div class="submit-row "><input name="bsignin" class="submit" type="submit" value="使用OpenID登录"></div> + <div class="submit-row "><input name="bsignin" class="submit" type="submit" value="{% trans "Login with your OpenID" %}"></div> </form> </div> {% endblock %} |