From c862991bbb9432eb93a98bdece9741f04505d7e7 Mon Sep 17 00:00:00 2001 From: zhengxie Date: Wed, 31 Oct 2012 11:36:49 +0800 Subject: [PATCH] Fixed plural bug --- locale/zh_CN/LC_MESSAGES/django.mo | Bin 16517 -> 16763 bytes locale/zh_CN/LC_MESSAGES/django.po | 23 ++++++++++++----------- templates/myhome.html | 4 ++-- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo index b5ea361b3ead549b1859928c670fd7b8dce9b172..37d947f7b5de782fdb54bf7e248de00fa52bb018 100644 GIT binary patch delta 5856 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 delta 5608 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 diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index ecd68eb4a7..222c0b7890 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-31 00:16+0800\n" +"POT-Creation-Date: 2012-10-31 11:28+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -336,21 +336,27 @@ msgid "" " " msgid_plural "" "\n" -" have new message\n" +" have new messages\n" " " msgstr[0] "" +"\n" +" 有新消息\n" +" " #: templates/myhome.html:36 -#, fuzzy, python-format +#, python-format msgid "" "\n" " one group message has new reply\n" " " msgid_plural "" "\n" -" %(counter)s group messages have new reply\n" +" %(counter)s group messages have new replies\n" +" " +msgstr[0] "" +"\n" +" %(counter)s 条群组留言有新回复\n" " " -msgstr[0] "条群组留言有新回复" #: templates/myhome.html:45 #, python-format @@ -364,10 +370,6 @@ msgid_plural "" " " msgstr[0] "" "\n" -" 一条团体消息\n" -" " -msgstr[1] "" -"\n" " %(counter)s 条团体消息\n" " " @@ -779,8 +781,7 @@ msgstr "更多历史" #, python-format msgid "one contributor" msgid_plural " %(counter)s contributors " -msgstr[0] "一个贡献者" -msgstr[1] " %(counter)s 个贡献者 " +msgstr[0] " %(counter)s 个贡献者 " #: templates/repo_view_file.html:113 msgid "Open local file" diff --git a/templates/myhome.html b/templates/myhome.html index 0df257a7ce..50191e6a15 100644 --- a/templates/myhome.html +++ b/templates/myhome.html @@ -27,7 +27,7 @@ {% blocktrans count counter=grpmsg_list|length %} has new message {% plural %} - have new message + have new messages {% endblocktrans %} {% endif %} @@ -36,7 +36,7 @@
  • {% blocktrans count counter=grpmsg_reply_list|length %} one group message has new reply {% plural %} - {{ counter }} group messages have new reply + {{ counter }} group messages have new replies {% endblocktrans %}
  • {% endif %}