From bb801f2bbd9f26bebca846b71e8947a1951f86a5 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Fri, 10 Jul 2009 19:11:34 -0400
Subject: english translation

---
 templates/authopenid/complete.html | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'templates/authopenid/complete.html')

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 %}
-
-	
-
-- 
cgit v1.2.3-1-g7c22


From 5b45e526c74faf55110ff0afdcba19797d7e0f4d Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Fri, 10 Jul 2009 19:14:09 -0400
Subject: deleted all

---
 templates/authopenid/complete.html | 67 --------------------------------------
 1 file changed, 67 deletions(-)
 delete mode 100644 templates/authopenid/complete.html

(limited to 'templates/authopenid/complete.html')

diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html
deleted file mode 100644
index 28c38a04..00000000
--- a/templates/authopenid/complete.html
+++ /dev/null
@@ -1,67 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% block head %}{% endblock %}
-{% block title %}{% spaceless %}{% trans "Connect your OpenID with this site" %}{% endspaceless %}{% endblock %}
-{% block content %}
-    <div id="main-bar" class="headNormal">
-		{% trans "Connect your OpenID with your account on this site" %}
-    </div>      
-	<p id="completetxt" >
-    	<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">{% 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>
-		{% endif %}
-		{% if form1.email.errors %} 
-			<li><span class="error">{{ form1.email.errors|join:", " }}</span></li>
-		{% endif %}
-        </ul>
-	</p>
-	{% endif %}
-	{% if form2.errors %}
-	<p class="errors">
-        <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>
-		{% endif %}
-		{% if form2.password.errors %} 
-			<li><span class="error">{{ form2.password.errors|join:", " }}</span></li>
-		{% endif %}
-       </ul>
-	</p>
-	{% endif %}
-
-	<div class="login">
-        <form name="fregister" action="{% url user_register %}" method="POST">
-            {{ form.next }}
-            <fieldset style="padding:10px">
-            <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>
-	<div class="login" style="display:none">
-        <form name="fverify" action="{% url user_register %}" method="POST">
-            {{ form.next }}
-			<fieldset style="padding:10px">
-				<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 %}
-- 
cgit v1.2.3-1-g7c22


From 35b666224a05fbd249b1c51a0a48fb95b246fe9a Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Fri, 10 Jul 2009 19:15:28 -0400
Subject: adding all files again

---
 templates/authopenid/complete.html | 67 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 templates/authopenid/complete.html

(limited to 'templates/authopenid/complete.html')

diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html
new file mode 100644
index 00000000..28c38a04
--- /dev/null
+++ b/templates/authopenid/complete.html
@@ -0,0 +1,67 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block head %}{% endblock %}
+{% block title %}{% spaceless %}{% trans "Connect your OpenID with this site" %}{% endspaceless %}{% endblock %}
+{% block content %}
+    <div id="main-bar" class="headNormal">
+		{% trans "Connect your OpenID with your account on this site" %}
+    </div>      
+	<p id="completetxt" >
+    	<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">{% 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>
+		{% endif %}
+		{% if form1.email.errors %} 
+			<li><span class="error">{{ form1.email.errors|join:", " }}</span></li>
+		{% endif %}
+        </ul>
+	</p>
+	{% endif %}
+	{% if form2.errors %}
+	<p class="errors">
+        <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>
+		{% endif %}
+		{% if form2.password.errors %} 
+			<li><span class="error">{{ form2.password.errors|join:", " }}</span></li>
+		{% endif %}
+       </ul>
+	</p>
+	{% endif %}
+
+	<div class="login">
+        <form name="fregister" action="{% url user_register %}" method="POST">
+            {{ form.next }}
+            <fieldset style="padding:10px">
+            <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>
+	<div class="login" style="display:none">
+        <form name="fverify" action="{% url user_register %}" method="POST">
+            {{ form.next }}
+			<fieldset style="padding:10px">
+				<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 %}
-- 
cgit v1.2.3-1-g7c22


From ef8f66ba6c7a22c277c6315df8040365b5684e6c Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 5 Aug 2009 22:50:08 -0400
Subject: added anonymous posting, per-question subscription and fixes by
 Pothers and some more, see development.log

---
 templates/authopenid/complete.html | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'templates/authopenid/complete.html')

diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html
index 28c38a04..b9a14e16 100644
--- a/templates/authopenid/complete.html
+++ b/templates/authopenid/complete.html
@@ -1,4 +1,5 @@
-{% extends "base.html" %}
+{% extends "base_content.html" %}
+<!-- complete.html -->
 {% load i18n %}
 {% block head %}{% endblock %}
 {% block title %}{% spaceless %}{% trans "Connect your OpenID with this site" %}{% endspaceless %}{% endblock %}
@@ -7,7 +8,9 @@
 		{% trans "Connect your OpenID with your account on this site" %}
     </div>      
 	<p id="completetxt" >
-    	<h3>{% trans "Your OpenID is accepted. Please complete this to finish registration." %}</h3>
+        <div class="message">
+            {% blocktrans %}register new {{provider}} account info{% endblocktrans %}
+        </div>
     	<p style="display:none">{% trans "This account already exists, please use another." %}</p>
 	</p>
 
@@ -41,12 +44,9 @@
 	<div class="login">
         <form name="fregister" action="{% url user_register %}" method="POST">
             {{ form.next }}
-            <fieldset style="padding:10px">
-            <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>
+            <div class="form-row"><label for="id_username">{% trans "Screen name label" %}</label><br />{{ form1.username }}</div>
+            <div class="form-row"><label for="id_email">{% trans "Email address label" %}</label><br />{{ form1.email }}</div>
+            <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"></div>
 		</form>
 	</div>
 	<div class="login" style="display:none">
@@ -65,3 +65,4 @@
 		</form>
 	</div>
 {% endblock %}
+<!-- end complete.html -->
-- 
cgit v1.2.3-1-g7c22