translate questions page

3 files changed, 24 insertions, 38 deletions

diff --git a/templates/pagesize.html b/templates/pagesize.html
index 5eb0159c..e5e17a24 100644
--- a/templates/pagesize.html
+++ b/templates/pagesize.html
@@ -1,7 +1,8 @@
 {% spaceless %}
+{% load i18n %}
 {% if is_paginated %}
 <div class="paginator">
-    <span class="text">每页显示</span>
+    <span class="text">{% trans "Size per page:" %}</span>
     {% ifequal pagesize 10 %}
         <span class="curr">10</span>
     {% else %}
@@ -21,4 +22,4 @@
     {% endifequal %}
 </div> 
 {% endif %}
-{% endspaceless %}
\ No newline at end of file
+{% endspaceless %}
diff --git a/templates/paginator.html b/templates/paginator.html
index 3e8bd856..ae8329cb 100644
--- a/templates/paginator.html
+++ b/templates/paginator.html
@@ -1,7 +1,8 @@
 {% spaceless %}
+{% load i18n %}
 {% if is_paginated %}
 <div class="paginator">
-{% if has_previous %}<span class="prev"><a href="{{base_url}}page={{ previous }}{{ extend_url }}" title="上一页">&laquo; 上一页</a></span>{% endif %}
+{% if has_previous %}<span class="prev"><a href="{{base_url}}page={{ previous }}{{ extend_url }}" title="{% trans 'Previous'%}">&laquo; <% trans "Previous" %></a></span>{% endif %}
  
 {% if not in_leading_range %}
 	{% for num in pages_outside_trailing_range %}
@@ -14,17 +15,17 @@
   {% ifequal num page %}
     {% ifequal pages 1 %}
     {% else %}
-    <span class="curr" title="当前页">{{ num }}</span>
+    <span class="curr" title='<% trans "Current page" %>'>{{ num }}</span>
     {% endifequal %}
   {% else %}
-  	<span class="page"><a href="{{base_url}}page={{ num }}{{ extend_url }}" title="第{{ num }}页">{{ num }}</a></span>
+  	<span class="page"><a href="{{base_url}}page={{ num }}{{ extend_url }}" title="No.{{ num }}">{{ num }}</a></span>
   {% endifequal %}
 {% endfor %}
  
 {% if not in_trailing_range %}
 	...
 	{% for num in pages_outside_leading_range reversed %}
-		<span class="page"><a href="{{base_url}}page={{ num }}{{ extend_url }}" title="第{{ num }}页">{{ num }}</a></span>
+		<span class="page"><a href="{{base_url}}page={{ num }}{{ extend_url }}" title="No.{{ num }}">{{ num }}</a></span>
 	{% endfor %}
 {% endif %}
  
@@ -32,4 +33,4 @@
 </div> 
 {% endif %}
  
-{% endspaceless %}
\ No newline at end of file
+{% endspaceless %}
diff --git a/templates/questions.html b/templates/questions.html
index 6663dbf2..bfc1177c 100644
--- a/templates/questions.html
+++ b/templates/questions.html
@@ -1,8 +1,9 @@
 {% extends "base.html" %}
+{% load i18n %}
 {% load extra_tags %}
 {% load humanize %}
 {% load extra_filters %}
-{% block title %}{% spaceless %}问题列表{% endspaceless %}{% endblock %}
+{% block title %}{% spaceless %}{% trans "Question list" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
         $().ready(function(){
@@ -18,12 +19,12 @@
 {% endblock %}
 {% block content %}
 <div class="tabBar">
-    <div class="headQuestions">{% if searchtag %}标签问题{% else %}{% if searchtitle %}查询结果{% else %}所有问题{% endif %}{% endif %}</div>
+    <div class="headQuestions">{% if searchtag %}{% trans "Tagged questions" %}{% else %}{% if searchtitle %}{% trans "Query result" %}{% else %}{% trans "All questions" %}{% endif %}{% endif %}</div>
     <div class="tabsA">
-        <a id="latest" href="?sort=latest" class="off" title="最新加入系统的问题">最新问题</a>
-        <a id="active" href="?sort=active" class="off" title="最近被更新的问题">活跃问题</a>
-        <a id="hottest" href="?sort=hottest" class="off" title="被回复最多的问题">热门问题</a>
-        <a id="mostvoted" href="?sort=mostvoted" class="off" title="投票次数最多的问题">最有价值问题</a>    
+        <a id="latest" href="?sort=latest" class="off" title="{% trans 'New questions' %}">{% trans "Newest" %}</a>
+        <a id="active" href="?sort=active" class="off" title="{% trans 'Newest updated questions' %}">{% trans "Active" %}</a>
+        <a id="hottest" href="?sort=hottest" class="off" title="{% trans 'Questions with most answers' %}">{% trans "Hottest" %}</a>
+        <a id="mostvoted" href="?sort=mostvoted" class="off" title="{% trans 'Questions with most votes' %}">{% trans "Best" %}</a>    
     </div>
 </div>
 <div id="listA">
@@ -40,9 +41,9 @@
                     <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>
 	            </tr>  
                 <tr>
-                    <td><span class="unit">回答</span></td>
-                    <td><span class="unit">票数</span></td>
-                    <td><span class="unit">浏览</span></td>
+                    <td><span class="unit">{% trans "Answers" %}</span></td>
+                    <td><span class="unit">{% trans "Votes" %}</span></td>
+                    <td><span class="unit">{% trans "Visits" %}</span></td>
 	            </tr> 
             </table>
         </div>
@@ -53,7 +54,7 @@
         
         {% ifequal tab_id 'active'%}
         {% if question.wiki %}
-        <span class="from wiki">社区Wiki</span>
+        <span class="from wiki">{% trans "Community wiki" %}</span>
         <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
         {% else %}
         <div class="from">
@@ -65,7 +66,7 @@
         {% endif %}
         {% else %}
         {% if question.wiki %}
-        <span class="from wiki">社区Wiki</span>
+        <span class="from wiki">{% trans "Community wiki" %}</span>
         <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
         {% else %}
         <div class="from">
@@ -79,7 +80,7 @@
         
         <div class="tags">
         {% for tag in question.tagname_list %}
-        <a href="{% url forum.views.tag tag|urlencode %}" title="查看有关'{{ tag }}'的问题" rel="tag">{{ tag }}</a>
+        <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans 'Browse questions with tag of '%}" rel="tag">{{ tag }}</a>
         {% endfor %}
         </div>
     </div>
@@ -118,30 +119,13 @@
                 </strong>
             {% endif %}
          的问题。</p>
-        {% ifequal tab_id "latest" %}
-        <p>问题按<strong>提问时间</strong>显示排序。新加入的问题将显示在最前面。</p>
-        {% endifequal %}
-        
-        {% ifequal tab_id "active" %}
-            <p>问题按<strong>最后更新时间</strong>显示排序。最后被回答或者更新的问题将显示在最前面。</p>
-        {% endifequal %}
-        
-        {% ifequal tab_id "hottest" %}
-            <p>问题按<strong>回复数量</strong>显示排序。回复最多的问题将显示在最前面。</p>
-        {% endifequal %}
-        
-        {% ifequal tab_id "mostvoted" %}
-            <p>问题按<strong>投票数量</strong>显示排序。投票最多的问题将显示在最前面。</p>
-        {% endifequal %}
-        
-        
     </p>
 </div>
 <div class="boxC">
-	<h3 class="subtitle">相关标签</h3>
+	<h3 class="subtitle">{% trans "Related tags" %}</h3>
     <div class="tags">
         {% for tag in tags %}
-            <a rel="tag" title="查看有关'{{ tag.name }}'的问题"  href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
+            <a rel="tag" href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
             <span class="tag-number">× {{ tag.used_count|intcomma }}</span>
             <br>
         {% endfor %}