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

---
 templates/question_edit.html | 85 +++++++++-----------------------------------
 1 file changed, 17 insertions(+), 68 deletions(-)

(limited to 'templates/question_edit.html')

diff --git a/templates/question_edit.html b/templates/question_edit.html
index 2cec358f..6fe8bb41 100644
--- a/templates/question_edit.html
+++ b/templates/question_edit.html
@@ -1,14 +1,16 @@
+<!-- question_edit.html -->
 {% extends "base.html" %}
-{% block title %}{% spaceless %}修改问题{% endspaceless %}{% endblock %}
+{% load i18n %}
+{% block title %}{% spaceless %}{% trans "Edit question" %}{% 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' src='/content/js/jquery.validate.pack.js'></script>
-        <script type='text/javascript' src='/content/js/wmd/showdown-min.js'></script>
-        <script type='text/javascript' src='/content/js/wmd/wmd-min.js'></script>
+        <script type='text/javascript' src='/content/js/wmd/showdown.js'></script>
+        <script type='text/javascript' src='/content/js/wmd/wmd.js'></script>
         <link rel="stylesheet" type="text/css" href="/content/js/wmd/wmd.css" />
         <script type="text/javascript">
-        
+		//todo move javascript out        
         $().ready(function(){
             $("#nav_questions").attr('className',"on");
             $('#editor').TextAreaResizer();
@@ -19,10 +21,10 @@
                              
             //toggle preview of editor
             var display = true;
-            var txt = "禁用预览";
+            var txt = "[{% trans "hide preview"}%]";
             $('#pre-collapse').text(txt);
             $('#pre-collapse').bind('click', function(){
-                txt = display ? "启用预览" : "禁用预览";
+                txt = display ? "[{% trans "show preview" %}]" : "[{% trans "hide preview" %}]";
                 display = !display;
                 $('#previewer').toggle();
                 $('#pre-collapse').text(txt);
@@ -60,15 +62,16 @@
         
 {% block content %}
 <div id="main-bar" class="headNormal">
-    修改问题 [<a href="{{ question.get_absolute_url }}">返回</a>]
+    {% trans "Edit question" %} [<a href="{{ question.get_absolute_url }}">{% trans "back" %}</a>]
 </div>
 <div id="main-body" class="ask-body">
     <div id="askform">
         <form id="fmedit" action="{% url edit_question question.id %}" method="post" >
-            <label for="id_revision" ><strong>版本:</strong></label> <br> 
+            <label for="id_revision" ><strong>{% trans "revision" %}:</strong></label> <br> 
             {% if revision_form.revision.errors %}{{ revision_form.revision.errors.as_ul }}{% endif %}
             <div style="vertical-align:middle">
-            {{ revision_form.revision }} <input type="submit" style="display:none" id="select_revision" name="select_revision" value="选择版本">
+            {{ revision_form.revision }} <input type="submit" style="display:none" id="select_revision" name="select_revision" 
+											value="{% trans "select revision"%}">
             </div><br> 
             <div class="form-item">
                 <label for="id_title" ><strong>{{ form.title.label_tag }}:</strong></label> <span class="form-error"></span><br> 
@@ -85,7 +88,7 @@
                     <table width="100%">
                         <tr>
                             <td>
-                                <span id="pre-collapse" title="打开或者关闭Markdown编辑器的实时预览">预览开关</span>
+                                <span id="pre-collapse" title="{% trans "Toggle the real time Markdown editor preview" %}">{% trans "toggle preview" %}</span>
                             </td>
                             <td style="text-align:right;">
                                 {{ form.wiki }} <span style="color:#000;cursor:help" title="{{form.wiki.help_text}}">{{ form.wiki.label_tag }} </span>
@@ -113,8 +116,8 @@
             <br>
 
             <div class="error" ></div>
-            <input type="submit" value="现在修改" class="submit" />
-            <input type="button" value="取消" class="submit" onclick="history.back(-1);" />
+            <input type="submit" value="{% trans "Save edit" %}" class="submit" />
+            <input type="button" value="{% trans "Cancel" %}" class="submit" onclick="history.back(-1);" />
             <br>
             <br>
         </form>
@@ -123,63 +126,9 @@
 {% endblock %}
 
 {% block sidebar %}
-<div class="boxC">
-    <p class="subtitle darkred">受欢迎的提问</p>
-    <div>
-        <ul class="list-item">
-            <li>
-                <b>您的问题与编程相关吗？</b>
-            </li>
-            <li>
-                建议您提的问题是可以被答复的，而不仅仅是可以讨论。
-            </li>
-            <li>
-                请详细描述您的问题。
-            </li>
-            <li>
-                我们推荐您使用中文描述问题，这样可以得到更多的答复机会。
-            </li>
-        </ul>
-         <a href="/faq/" target="_blank" title="查看常见问题" style="float:right;position:relative">faq »</a>
-         <br>  
-    </div>
-</div>
-
-<div class="boxC">
-    <p class="subtitle">Markdown快速参考</p>
-    <ul class="list-item">
-        <li>
-            *斜体* 或者 _斜体_  
-
-        </li>
-        <li>
-            **加粗** 或者 __加粗__ 
-
-        </li>
-        <li>
-            <b>链接</b>：一个[例子](http://url.com/ "标题")
-
-        </li>
-        
-        <li>
-            <b>图片</b>：![alt 文本](/path/img.jpg "标题")
-
-        </li>
-        <li>
-            列表：
-            1.  Foo
-            2.  Bar
-        </li>
-        <li>
-            基本的HTML标签也是支持的
-        </li>
-    </ul>
-    <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank" style="float:right;position:relative">有关Markdown详细说明 »</a>
-    <br>  
-</div>
-
+{% include "question_edit_tips.html" %}
 {% endblock %}
 
 {% block endjs %}
 {% endblock %}
-
+<!-- end question_edit.html -->
-- 
cgit v1.2.3-1-g7c22