From 068bb7dc78d0b3565c100b61acc859ede0adc0d4 Mon Sep 17 00:00:00 2001
From: Mike Chen <chagel@gmail.com>
Date: Wed, 29 Jul 2009 00:00:52 +0800
Subject: merge Evgeny's English and Botum's Spanish translations

---
 templates/users.html | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'templates/users.html')

diff --git a/templates/users.html b/templates/users.html
index 16a83b21..c3c9f790 100644
--- a/templates/users.html
+++ b/templates/users.html
@@ -1,9 +1,11 @@
 {% 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 +16,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 +68,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