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/user_preferences.html | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'templates/user_preferences.html')

diff --git a/templates/user_preferences.html b/templates/user_preferences.html
index 3a760a25..246a834e 100644
--- a/templates/user_preferences.html
+++ b/templates/user_preferences.html
@@ -1,20 +1,11 @@
+<!-- user_preferences.html -->
 {% extends "user.html" %}
 {% load extra_tags %}
 {% load humanize %}
 
 {% block usercontent %}
         <div style="padding:5px;">
-        <fieldset>
-            <legend><b>同步Twitter消息</b></legend>
-            <form>
-                <label for="name">账号:</label>
-                <input id="name" /><br>
-                <label for="password">密码:</label>
-                <input id="password" type="password"/><br>
-                <input id="cbMessage" type="checkbox" />发布我的提问到我的Twitter<br>
-                <input id="cbReply" type="checkbox" />发布我的回答到我的Twitter<br>
-                <input type="submit" value="保存" />
-            </form>
-        </fieldset>
+            <h1>Surprise will be here soon ;-)</h1>
         </div>
 {% endblock %}
+<!-- end user_preferences.html -->
-- 
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/user_preferences.html | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 templates/user_preferences.html

(limited to 'templates/user_preferences.html')

diff --git a/templates/user_preferences.html b/templates/user_preferences.html
deleted file mode 100644
index 246a834e..00000000
--- a/templates/user_preferences.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- user_preferences.html -->
-{% extends "user.html" %}
-{% load extra_tags %}
-{% load humanize %}
-
-{% block usercontent %}
-        <div style="padding:5px;">
-            <h1>Surprise will be here soon ;-)</h1>
-        </div>
-{% endblock %}
-<!-- end user_preferences.html -->
-- 
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/user_preferences.html | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 templates/user_preferences.html

(limited to 'templates/user_preferences.html')

diff --git a/templates/user_preferences.html b/templates/user_preferences.html
new file mode 100644
index 00000000..246a834e
--- /dev/null
+++ b/templates/user_preferences.html
@@ -0,0 +1,11 @@
+<!-- user_preferences.html -->
+{% extends "user.html" %}
+{% load extra_tags %}
+{% load humanize %}
+
+{% block usercontent %}
+        <div style="padding:5px;">
+            <h1>Surprise will be here soon ;-)</h1>
+        </div>
+{% endblock %}
+<!-- end user_preferences.html -->
-- 
cgit v1.2.3-1-g7c22


From faf167aed99ac4e28927f729b7c7bc94a47ef139 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 26 Jul 2009 22:33:56 -0400
Subject: merged in latest Mikes changes

---
 templates/user_preferences.html | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'templates/user_preferences.html')

diff --git a/templates/user_preferences.html b/templates/user_preferences.html
index 246a834e..3a760a25 100644
--- a/templates/user_preferences.html
+++ b/templates/user_preferences.html
@@ -1,11 +1,20 @@
-<!-- user_preferences.html -->
 {% extends "user.html" %}
 {% load extra_tags %}
 {% load humanize %}
 
 {% block usercontent %}
         <div style="padding:5px;">
-            <h1>Surprise will be here soon ;-)</h1>
+        <fieldset>
+            <legend><b>同步Twitter消息</b></legend>
+            <form>
+                <label for="name">账号:</label>
+                <input id="name" /><br>
+                <label for="password">密码:</label>
+                <input id="password" type="password"/><br>
+                <input id="cbMessage" type="checkbox" />发布我的提问到我的Twitter<br>
+                <input id="cbReply" type="checkbox" />发布我的回答到我的Twitter<br>
+                <input type="submit" value="保存" />
+            </form>
+        </fieldset>
         </div>
 {% endblock %}
-<!-- end user_preferences.html -->
-- 
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/user_preferences.html | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'templates/user_preferences.html')

diff --git a/templates/user_preferences.html b/templates/user_preferences.html
index 3a760a25..eb7c4761 100644
--- a/templates/user_preferences.html
+++ b/templates/user_preferences.html
@@ -1,20 +1,23 @@
 {% extends "user.html" %}
+<!-- user_preferences.html -->
+{% load i18n %}
 {% load extra_tags %}
 {% load humanize %}
 
 {% block usercontent %}
         <div style="padding:5px;">
         <fieldset>
-            <legend><b>同步Twitter消息</b></legend>
+            <legend><b>{% trans "Connect with Twitter" %}</b></legend>
             <form>
-                <label for="name">账号:</label>
+                <label for="name">{% trans "Twitter account name:" %}</label>
                 <input id="name" /><br>
-                <label for="password">密码:</label>
+                <label for="password">{% trans "Twitter password:" %}</label>
                 <input id="password" type="password"/><br>
-                <input id="cbMessage" type="checkbox" />发布我的提问到我的Twitter<br>
-                <input id="cbReply" type="checkbox" />发布我的回答到我的Twitter<br>
-                <input type="submit" value="保存" />
+                <input id="cbMessage" type="checkbox" />{% trans "Send my Questions to Twitter" %}<br>
+                <input id="cbReply" type="checkbox" />{% trans "Send my Answers to Twitter" %}<br>
+                <input type="submit" value="{% trans "Save" %}" />
             </form>
         </fieldset>
         </div>
 {% endblock %}
+<!-- end user_preferences.html -->
-- 
cgit v1.2.3-1-g7c22