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/users.html | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'templates/users.html')

diff --git a/templates/users.html b/templates/users.html
index 16a83b21..701dbaa2 100644
--- a/templates/users.html
+++ b/templates/users.html
@@ -1,9 +1,12 @@
+<!-- users.html -->
 {% extends "base_content.html" %}
 {% load extra_tags %}
 {% load humanize %}
-{% block title %}{% spaceless %}用户列表{% endspaceless %}{% endblock %}
+{% load i18n %}
+{% block title %}{% spaceless %}{% trans "Users" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
+	   //todo move javascript out
         $().ready(function(){
             $("#nav_users").attr('className',"on");
             $("#type-user").attr('checked',true);
@@ -14,27 +17,26 @@
             Hilite.elementid = "main-body";
             Hilite.debug_referrer = location.href;
         });
-         
         </script>
 {% endblock %}
 {% block content %}
 <div class="tabBar">
-    <div class="headUsers">用户列表</div>
+    <div class="headUsers">{% trans "Users" %}</div>
     <div class="tabsA">
-        <a id="sort_reputation" href="?sort=reputation" class="off" title="积分">积分</a>
-        <a id="sort_newest" href="?sort=newest" class="off" title="最新加入">最新加入</a>
-        <a id="sort_last" href="?sort=last" class="off" title="最先加入">最先加入</a>
-        <a id="sort_user" href="?sort=user" class="off" title="用户名">用户名</a>
+        <a id="sort_reputation" href="?sort=reputation" class="off" title="{% trans "reputation" %}">{% trans "reputation" %}</a>
+        <a id="sort_newest" href="?sort=newest" class="off" title="{% trans "recent" %}">{% trans "recent" %}</a>
+        <a id="sort_last" href="?sort=last" class="off" title="{% trans "oldest" %}">{% trans "oldest" %}</a>
+        <a id="sort_user" href="?sort=user" class="off" title="{% trans "by username" %}">{% trans "by username" %}</a>
     </div>
 </div>
 <div id="main-body" style="width:100%">
     <p>        
         {% if suser %}
-            匹配查询 '<span class="darkred"><strong>{{ suser }}</strong></span>' 的所有用户名： 
+			{% blocktrans %}users matching query {{suser}}:{% endblocktrans %}
         {% endif %}
     
         {% if not users.object_list %}
-            <span >没有找到相关数据。</span>
+            <span>{% trans "Nothing found." %}</span>
         {% endif %}
     </p>
     <div class="userList">
@@ -67,4 +69,5 @@
 <div class="pager">
     {% cnprog_paginator context %}
 </div>              
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+<!-- end users.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/users.html | 73 ----------------------------------------------------
 1 file changed, 73 deletions(-)
 delete mode 100644 templates/users.html

(limited to 'templates/users.html')

diff --git a/templates/users.html b/templates/users.html
deleted file mode 100644
index 701dbaa2..00000000
--- a/templates/users.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!-- users.html -->
-{% extends "base_content.html" %}
-{% load extra_tags %}
-{% load humanize %}
-{% load i18n %}
-{% block title %}{% spaceless %}{% trans "Users" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-	   //todo move javascript out
-        $().ready(function(){
-            $("#nav_users").attr('className',"on");
-            $("#type-user").attr('checked',true);
-            var orderby = "{{ tab_id }}";
-            $("#sort_" + orderby).attr('className',"on");
-            
-            Hilite.exact = false;
-            Hilite.elementid = "main-body";
-            Hilite.debug_referrer = location.href;
-        });
-        </script>
-{% endblock %}
-{% block content %}
-<div class="tabBar">
-    <div class="headUsers">{% trans "Users" %}</div>
-    <div class="tabsA">
-        <a id="sort_reputation" href="?sort=reputation" class="off" title="{% trans "reputation" %}">{% trans "reputation" %}</a>
-        <a id="sort_newest" href="?sort=newest" class="off" title="{% trans "recent" %}">{% trans "recent" %}</a>
-        <a id="sort_last" href="?sort=last" class="off" title="{% trans "oldest" %}">{% trans "oldest" %}</a>
-        <a id="sort_user" href="?sort=user" class="off" title="{% trans "by username" %}">{% trans "by username" %}</a>
-    </div>
-</div>
-<div id="main-body" style="width:100%">
-    <p>        
-        {% if suser %}
-			{% blocktrans %}users matching query {{suser}}:{% endblocktrans %}
-        {% endif %}
-    
-        {% if not users.object_list %}
-            <span>{% trans "Nothing found." %}</span>
-        {% endif %}
-    </p>
-    <div class="userList">
-        <table class="list-table">
-            <tr>    
-                <td class="list-td">
-                    {% for user in users.object_list %}
-                    
-                    <div class="user">
-                        <ul>
-                                <li class="thumb"><a href="{{ user.get_profile_url }}">{% gravatar user 32 %}</a></li>
-                                <li><a href="{{ user.get_profile_url }}">{{user.username}}</a></li>
-                                <li>{% get_score_badge user %}</li>
-                            </ul>
-                    </div>
-                    
-            {% if forloop.counter|divisibleby:"7" %}
-                </td>
-                <td>
-            {% endif %}
-
-                    {% endfor %}
-                </td>
-            </tr>   
-        </table>
-    </div>
-</div>
-{% endblock %}
-{% block tail %}
-<div class="pager">
-    {% cnprog_paginator context %}
-</div>              
-{% endblock %}
-<!-- end users.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/users.html | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 templates/users.html

(limited to 'templates/users.html')

diff --git a/templates/users.html b/templates/users.html
new file mode 100644
index 00000000..701dbaa2
--- /dev/null
+++ b/templates/users.html
@@ -0,0 +1,73 @@
+<!-- users.html -->
+{% extends "base_content.html" %}
+{% load extra_tags %}
+{% load humanize %}
+{% load i18n %}
+{% block title %}{% spaceless %}{% trans "Users" %}{% endspaceless %}{% endblock %}
+{% block forejs %}
+       <script type="text/javascript">
+	   //todo move javascript out
+        $().ready(function(){
+            $("#nav_users").attr('className',"on");
+            $("#type-user").attr('checked',true);
+            var orderby = "{{ tab_id }}";
+            $("#sort_" + orderby).attr('className',"on");
+            
+            Hilite.exact = false;
+            Hilite.elementid = "main-body";
+            Hilite.debug_referrer = location.href;
+        });
+        </script>
+{% endblock %}
+{% block content %}
+<div class="tabBar">
+    <div class="headUsers">{% trans "Users" %}</div>
+    <div class="tabsA">
+        <a id="sort_reputation" href="?sort=reputation" class="off" title="{% trans "reputation" %}">{% trans "reputation" %}</a>
+        <a id="sort_newest" href="?sort=newest" class="off" title="{% trans "recent" %}">{% trans "recent" %}</a>
+        <a id="sort_last" href="?sort=last" class="off" title="{% trans "oldest" %}">{% trans "oldest" %}</a>
+        <a id="sort_user" href="?sort=user" class="off" title="{% trans "by username" %}">{% trans "by username" %}</a>
+    </div>
+</div>
+<div id="main-body" style="width:100%">
+    <p>        
+        {% if suser %}
+			{% blocktrans %}users matching query {{suser}}:{% endblocktrans %}
+        {% endif %}
+    
+        {% if not users.object_list %}
+            <span>{% trans "Nothing found." %}</span>
+        {% endif %}
+    </p>
+    <div class="userList">
+        <table class="list-table">
+            <tr>    
+                <td class="list-td">
+                    {% for user in users.object_list %}
+                    
+                    <div class="user">
+                        <ul>
+                                <li class="thumb"><a href="{{ user.get_profile_url }}">{% gravatar user 32 %}</a></li>
+                                <li><a href="{{ user.get_profile_url }}">{{user.username}}</a></li>
+                                <li>{% get_score_badge user %}</li>
+                            </ul>
+                    </div>
+                    
+            {% if forloop.counter|divisibleby:"7" %}
+                </td>
+                <td>
+            {% endif %}
+
+                    {% endfor %}
+                </td>
+            </tr>   
+        </table>
+    </div>
+</div>
+{% endblock %}
+{% block tail %}
+<div class="pager">
+    {% cnprog_paginator context %}
+</div>              
+{% endblock %}
+<!-- end users.html -->
-- 
cgit v1.2.3-1-g7c22


From 20a7ce5657bf3d8683bdb4f9b860dbad044fb2f3 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Tue, 4 Aug 2009 23:25:57 -0400
Subject: included changes by Adolfo and Chaitanya and found temporary fix for
 languages

---
 templates/users.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/users.html')

diff --git a/templates/users.html b/templates/users.html
index 701dbaa2..966596fc 100644
--- a/templates/users.html
+++ b/templates/users.html
@@ -1,5 +1,5 @@
-<!-- users.html -->
 {% extends "base_content.html" %}
+<!-- users.html -->
 {% load extra_tags %}
 {% load humanize %}
 {% load i18n %}
-- 
cgit v1.2.3-1-g7c22