From 9ddc17616f4dc9955533623e01f0635581adee40 Mon Sep 17 00:00:00 2001 From: Mike Chen Date: Wed, 15 Jul 2009 21:55:03 +0800 Subject: translate questions page --- locale/zh_CN/LC_MESSAGES/django.mo | Bin 8581 -> 8955 bytes locale/zh_CN/LC_MESSAGES/django.po | 57 ++++++++++++++++++++++++++++++------- templates/pagesize.html | 5 ++-- templates/paginator.html | 11 +++---- templates/questions.html | 46 ++++++++++-------------------- 5 files changed, 70 insertions(+), 49 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo index 3b86743b..fafeef89 100644 Binary files a/locale/zh_CN/LC_MESSAGES/django.mo and b/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index 160a3a64..176e41dc 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-09 15:42+0000\n" +"POT-Creation-Date: 2009-07-15 13:53+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -229,7 +229,7 @@ msgstr "用户收藏的问题" msgid "Favorites - User Profile" msgstr "收藏-用户资料" -#: forum/user.py:60 templates/index.html:46 +#: forum/user.py:60 templates/index.html:46 templates/questions.html:45 msgid "Votes" msgstr "投票" @@ -336,31 +336,32 @@ msgstr "搜索" msgid "Home" msgstr "首页" -#: templates/index.html:23 +#: templates/index.html:23 templates/questions.html:25 msgid "Newest updated questions" msgstr "最新更新的问题" -#: templates/index.html:23 +#: templates/index.html:23 templates/questions.html:24 msgid "Newest" msgstr "最新问题" -#: templates/index.html:24 +#: templates/index.html:24 templates/questions.html:26 msgid "Questions with most answers" msgstr "被回复最多的问题" -#: templates/index.html:24 +#: templates/index.html:24 templates/questions.html:26 msgid "Hottest" msgstr "最热问题" -#: templates/index.html:25 +#: templates/index.html:25 templates/questions.html:27 msgid "Questions with most votes" msgstr "被投票最多的问题" -#: templates/index.html:25 +#: templates/index.html:25 templates/questions.html:27 msgid "Best" msgstr "最有价值问题" #: templates/index.html:26 templates/index.html.py:118 +#: templates/questions.html:22 msgid "All questions" msgstr "所有问题" @@ -368,19 +369,21 @@ msgstr "所有问题" msgid "All" msgstr "所有问题" -#: templates/index.html:45 +#: templates/index.html:45 templates/questions.html:44 msgid "Answers" msgstr "回答" -#: templates/index.html:47 +#: templates/index.html:47 templates/questions.html:46 msgid "Visits" msgstr "访问" -#: templates/index.html:55 +#: templates/index.html:55 templates/questions.html:57 +#: templates/questions.html.py:69 msgid "Community wiki" msgstr "社区wiki" #: templates/index.html:67 templates/index.html.py:91 +#: templates/questions.html:83 msgid "Browse questions with tag of " msgstr "查看所有以下主题问题：" @@ -424,6 +427,38 @@ msgstr "。请帮助我们回答" msgid "Unanswered questions" msgstr "没有回答的问题" +#: templates/pagesize.html:5 +msgid "Size per page:" +msgstr "每页显示：" + +#: templates/paginator.html:5 +msgid "Previous" +msgstr "上一页" + +#: templates/questions.html:6 +msgid "Question list" +msgstr "问题列表" + +#: templates/questions.html:22 +msgid "Tagged questions" +msgstr "标签问题" + +#: templates/questions.html:22 +msgid "Query result" +msgstr "查询结果" + +#: templates/questions.html:24 +msgid "New questions" +msgstr "最新问题" + +#: templates/questions.html:25 +msgid "Active" +msgstr "活跃问题" + +#: templates/questions.html:125 +msgid "Related tags" +msgstr "相关标签" + #: templates/authopenid/changeemail.html:10 msgid "Account: change email" msgstr "修改电子邮件" 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 %}
- 每页显示 + {% trans "Size per page:" %} {% ifequal pagesize 10 %} 10 {% else %} @@ -21,4 +22,4 @@ {% endifequal %}
{% 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 %}
-{% if has_previous %}« 上一页{% endif %} +{% if has_previous %}« <% trans "Previous" %>{% endif %} {% if not in_leading_range %} {% for num in pages_outside_trailing_range %} @@ -14,17 +15,17 @@ {% ifequal num page %} {% ifequal pages 1 %} {% else %} - {{ num }} + {{ num }} {% endifequal %} {% else %} - {{ num }} + {{ num }} {% endifequal %} {% endfor %} {% if not in_trailing_range %} ... {% for num in pages_outside_leading_range reversed %} - {{ num }} + {{ num }} {% endfor %} {% endif %} @@ -32,4 +33,4 @@
{% 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 %}
    -
  • 查看最新问题 »
    • -
  • 查看标签列表 »
    • +
  • {% trans "see all questions" %} »
    • +
  • {% trans "see all tags" %} »
    • {% endblock %} - - - + diff --git a/templates/500.html b/templates/500.html index 2e89783a..c99774b3 100644 --- a/templates/500.html +++ b/templates/500.html @@ -1,4 +1,6 @@ + {% extends "base_content.html" %} +{% load i18n %} {% block title %}{% spaceless %}500 Error{% endspaceless %}{% endblock %} {% block forejs %} {% endblock %} {% block content %} -
    - 500 Server Error +
    +

    + 500 Server Error +

    +
    -
    +
    -

    对不起，系统发生了错误，不能响应您的请求！

    +

    {% trans "sorry, system error"


    - 系统已经记录错误日志，我们会尽快解决此问题。
    - 如果这个问题长时间没有被修复，请搜索查看当前问题的状态，或者报告新的bug。感谢您的支持！ - + {% trans "system error log is recorded, error will be fixed as soon as possible" %}
    + {% trans "please report the error to the site administrators if you wish" %}
    {% endblock %} - - - + diff --git a/templates/answer_edit.html b/templates/answer_edit.html index f914660a..008d9f78 100644 --- a/templates/answer_edit.html +++ b/templates/answer_edit.html @@ -1,11 +1,13 @@ + {% extends "base.html" %} -{% block title %}{% spaceless %}修改回答{% endspaceless %}{% endblock %} +{% load i18n %} +{% block title %}{% spaceless %}{% trans "Edit answer" %}{% endspaceless %}{% endblock %} {% block forejs %} - - + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + +
    +
    + +
    +
    + +
    +
    +
    + + + + + + + +
    +
    + +
    + + + + + + +
    + + + + + + + +
    +
    +
    + evgenyfadeev / CNPROG + + + + + + + + + + + + fork + + + + + watch + + + + + + download tarball + + +
    + + + + + +
    + public +
    + + + + + +
    + + + +
    Forks14Right
    +     +
    + +
    + + + +
    Watchers2Right
    +     +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Fork of chagel/CNPROG +
    Description: + An open source Q&A(question and answer) eco-system + +
    Homepage: + + + http://www.cnprog.com + + +
    Clone URL: + git://github.com/evgenyfadeev/CNPROG.git + + + + + + + + + + + + +
    + +
    +
    + + + + + + +
    + + +
    +
    + +
    +
    + + 
    added APP_TITLE, APP_KEYWORDS and APP_DESCRIPTION
    + + +
    +
    + + +
    +
    evgenyfadeev (author)
    +
    + Mon Jul 27 17:44:51 -0700 2009 +
    +
    + + + +
    +
    + commit  f38036ae08927e3a7726b45623ba81146003b8a1
    + tree    92408af2557eb7b6677495a3bdf4e39c8a47af62
    + + + parent  + + 464c14f8e63cc1df409f2f72a1871d364d41b0d7 + + +
    +
    + +
    +
    + + + + +
    + CNPROG / templates / answer_edit_tips.html + + + + + + + + + + +
    + +
    +
    +
    +
    + 100644 + 55 lines (50 sloc) + 1.685 kb +
    +
    + + raw + + blame + + history +
    +
    + +
    + + + + + + +
    + + 
    +1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+
    +     		+ + + 
    <!-- template answer_edit_tips.html -->
    {% load i18n %}
    <div class="boxC">
        <p class="subtitle darkred">{% trans "answer tips" %}</p>
        <div>
            <ul class="list-item">
                <li> <b>{% trans "please make your answer relevant to this community" %}</b>
                </li>
                <li>
                    {% trans  "try to give an answer, rather than engage into a discussion" %}
                </li>
                <li>
                    {% trans "please try to provide details" %}
                </li>
                <li>
    				{% trans "be clear and concise" %}
                </li>
            </ul>
             <a href="/faq/" target="_blank" title="{% trans "see frequently asked questions" %}" style="float:right;position:relative">faq »</a>
             <br>  
        </div>
    </div>
     
    <div class="boxC">
        <p class="subtitle">{% trans "Markdown tips" %}</p>
        <ul class="list-item">
            <li>
                {% trans "*italic* or __italic__" %}
            </li>
            <li>
    			{% trans "**bold** or __bold__" %}
            </li>
            <li>
                <b>{% trans "link" %}</b>:[{% trans "text" %}](http://url.com/ "{% trans "title" %}")
     
            </li>
            
            <li>
                <b>{% trans "image" %}</b>：![alt {% trans "text" %}](/path/img.jpg "{% trans "title" %}")
     
            </li>
            <li>
    			{% trans "numbered list:" %}
                1.  Foo
                2.  Bar
            </li>
            <li>
    			{% trans "basic HTML tags are also supported" %}
            </li>
        </ul>
        <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank" style="float:right;position:relative">{% trans "learn more about Markdown" %} »</a>
        <br>  
    </div>
    <!-- end template answer_edit_tips.html -->
     
    + +
    + +
    + + +
    +
    + + + + +
    + + + +
    +
    + + + + + + + + + + + + + diff --git a/templates/ask.html b/templates/ask.html index ecd176bc..1b00a701 100644 --- a/templates/ask.html +++ b/templates/ask.html @@ -1,11 +1,13 @@ + {% extends "base.html" %} -{% block title %}{% spaceless %}我要提问{% endspaceless %}{% endblock %} +{% load i18n %} +{% block title %}{% spaceless %}{% trans "Ask a question" %}{% endspaceless %}{% endblock %} {% block forejs %} - + - - + + @@ -12,26 +13,26 @@ {% endblock %} {% block content %}
    - 用户登录 + {% trans "User login" %}
    @@ -67,28 +69,25 @@ {% block sidebar %}
    -

    为什么需要OpenID登录？

    +

    {% trans "Why use OpenID?" %}

    • - 构建在OpenID网络认证上的本系统，不需要你注册新的帐号，即可使用我们系统的所有功能 + {% trans "with openid it is easier" %}
    • - 用同一个帐号可登录互联网所有激活OpenID的网站 - + {% trans "reuse openid" %}
    • - 全世界有1.6亿OpenID帐号，和10,000个支持OpenID的站点 - + {% trans "openid is widely adopted" %}
    • - OpenID是有开放标准，并且有相关的基金组织提供支持 - + {% trans "openid is supported open standard" %}
    - 查看更多 »
    - 获取OpenID » + {% trans "Find out more" %} »
    + {% trans "Get OpenID" %} »


    diff --git a/templates/authopenid/signup.html b/templates/authopenid/signup.html index e51544f7..a4460aa3 100644 --- a/templates/authopenid/signup.html +++ b/templates/authopenid/signup.html @@ -1,18 +1,18 @@ {% extends "base.html" %} -{% block title %}{% spaceless %}注册帐号{% endspaceless %}{% endblock %} +{% block title %}{% spaceless %}{% trans "Signup" %}{% endspaceless %}{% endblock %} {% block content %}
    -

    注册帐号

    +

    {% trans "Signup" %}

    -

    我们支持两种注册方式，你可以使用常规的用户名、密码方式注册，或者使用OpenID帐号注册。

    +

    {% trans "We support two types of user registration: conventional username/password, and" %} {% trans "the OpenID method" %}.

    {% if form.errors %}

    - 请注意以下错误：
    + {% trans "Sorry, looks like we have some errors" %}

      {% if form.username.errors %}
    • {{ form.username.errors|join:", " }}
      • @@ -30,22 +30,23 @@
    - 常规注册 -

    {{ form.username }}
    + {% trans "Conventional registration" %} +

    {{ form.username }}
    -

    {{ form.email }}
    -

    {{ form.password1 }}
    -

    {{ form.password2 }}
    -
    返回登录
    +

    {{ form.email }}
    +

    {{ form.password1 }}
    +

    {{ form.password2 }}
    +
    + {% trans "back to login" %}


    - +
    {{ form2.openid_url }}
    -
    +
    {% endblock %} diff --git a/templates/badge.html b/templates/badge.html index 4ffedfa6..d0906918 100644 --- a/templates/badge.html +++ b/templates/badge.html @@ -1,7 +1,9 @@ + {% extends "base_content.html" %} +{% load i18n %} {% load extra_tags %} {% load humanize %} -{% block title %}{% spaceless %}{{ badge.name }}-奖牌{% endspaceless %}{% endblock %} +{% block title %}{% spaceless %}{{ badge.name }} - {% trans "Badge" %}{% endspaceless %}{% endblock %} {% block forejs %} - + + + + + {% with request.user.get_messages as messages%} {% if messages %}