merge Evgeny's English and Botum's Spanish translations

1 files changed, 11 insertions, 10 deletions

diff --git a/templates/revisions_question.html b/templates/revisions_question.html
index 94fb2644..77a421bb 100644
--- a/templates/revisions_question.html
+++ b/templates/revisions_question.html
@@ -1,13 +1,16 @@
+<!-- revisions_question.html -->
 {% extends "base_content.html" %}
+<!--somehow very similar to revisions_answer.html-->
 {% load extra_tags %}
+{% load i18n %}
 {% load extra_filters %}
 {% load humanize %}
-{% block title %}{% spaceless %}版本历史{% endspaceless %}{% endblock %}
+{% block title %}{% spaceless %}{% trans "Revision history" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
         <script type='text/javascript' src='/content/js/com.cnprog.editor.js'></script>
         <script type='text/javascript' src='/content/js/com.cnprog.post.js'></script>
         <script type="text/javascript">
-        
+        //todo - take this out into .js file 
         $().ready(function(){
             $("#nav_questions").attr('className',"on");
             $('div.revision div[id^=rev-header-]').bind('click', function(){
@@ -15,8 +18,6 @@
                 toggleRev(revId); 
             
             });
-            
-            
             lanai.highlightSyntax();
         });
         
@@ -27,13 +28,12 @@
             arrow.attr("src", "/content/images/expander-arrow-" + (visible ? "show" : "hide") + ".gif");
             $("#rev-body-" + id).slideToggle("fast");
         }
-        
         </script>
 {% endblock %}
         
 {% block content %}
 <div id="main-bar" class="headNormal">
-    版本历史 [<a href="{{ post.get_absolute_url }}">返回</a>]
+    {% trans "Revision history" %}[<a href="{{ post.get_absolute_url }}">{% trans "back" %}</a>]
 </div>
 <div id="main-body" class="">
     <div id="revisions">
@@ -44,13 +44,13 @@
             <table width="100%">
                 <tr>
                     <td width="20" style="vertical-align:middle"><img id="rev-arrow-{{ revision.revision }}" src="/content/images/expander-arrow-show.gif"></td>
-                    <td width="30px" style="vertical-align:middle"><span class="revision-number" title="版本 {{ revision.revision }}">{{ revision.revision }}</span></td>
+                    <td width="30px" style="vertical-align:middle"><span class="revision-number" title="{% trans "revision" %} {{ revision.revision }}">{{ revision.revision }}</span></td>
                     <td width="200px" style="vertical-align:middle">
                         {% if revision.summary %}
                         <div class="summary"><span>{{ revision.summary }}<span></div>
                         {% endif %}
                         {% if request.user|can_edit_post:post %}
-                        <a href="{% url edit_question post.id %}?revision={{ revision.revision }}">编辑</a>
+                        <a href="{% url edit_question post.id %}?revision={{ revision.revision }}">{% trans "edit" %}</a>
                         {% endif %}
   
                     </td>
@@ -60,9 +60,9 @@
                                 <tr >
                                     <td colspan="2" style="padding:3px 0 3px 0"> 
                                         {% ifequal revision.revision 1 %}
-                                        提问于<strong title="{{ post.added_at }}">{% diff_date post.added_at  %}</strong>
+                                        {% trans "asked" %}<strong title="{{ post.added_at }}">{% diff_date post.added_at  %}</strong>
                                         {% else %}
-                                        更新于<strong title="{{ post.last_edited_at }}">{% diff_date revision.revised_at  %}</strong>
+                                        {% trans "updated" %}<strong title="{{ post.last_edited_at }}">{% diff_date revision.revised_at  %}</strong>
                                         {% endifequal %}
                                     </td>
                                     
@@ -100,3 +100,4 @@
 {% block endjs %}
 {% endblock %}
 
+<!-- end revisions_question.html -->