diff options
author | Weitian LI <liweitianux@gmail.com> | 2014-04-29 09:11:52 +0800 |
---|---|---|
committer | Weitian LI <liweitianux@gmail.com> | 2014-04-29 09:11:52 +0800 |
commit | 06de4844b239c6ab33cdee121d1df3070a18eb13 (patch) | |
tree | 1d7d71e0c97495319e08cb14f16f21cdaa2a4678 | |
parent | a05186c6cbbd2fc434694d126cfdbe70e96be72b (diff) | |
download | django-skaschool-06de4844b239c6ab33cdee121d1df3070a18eb13.tar.bz2 |
* added 'Markdown' to requirements.txt
* updated zh_CN messages
* fixed a typo in 'my_markdown.py'
-rw-r--r-- | locale/zh_CN/LC_MESSAGES/django.mo | bin | 3897 -> 3966 bytes | |||
-rw-r--r-- | locale/zh_CN/LC_MESSAGES/django.po | 29 | ||||
-rw-r--r-- | notice/templatetags/my_markdown.py | 2 | ||||
-rw-r--r-- | requirements.txt | 1 |
4 files changed, 19 insertions, 13 deletions
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo Binary files differindex 60ef63f..11ee1e2 100644 --- a/locale/zh_CN/LC_MESSAGES/django.mo +++ b/locale/zh_CN/LC_MESSAGES/django.mo diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index 686c1ec..6009bd7 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: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-29 01:24+0800\n" +"POT-Creation-Date: 2014-04-29 09:09+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Weitian LI <liweitianux@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -19,6 +19,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #: account/extra.py:49 +#, python-format msgid "Please keep filesize under %(maxsize)s. Current filesize %(filesize)s" msgstr "请使文件小于%(maxsize)s. 当前大小%(filesize)s" @@ -193,11 +194,11 @@ msgid "user profiles" msgstr "用户信息" #: account/models.py:183 archive/models.py:18 notice/models.py:14 -#: notice/models.py:51 +#: notice/models.py:52 msgid "Title" msgstr "标题" -#: account/models.py:184 archive/models.py:22 notice/models.py:52 +#: account/models.py:184 archive/models.py:22 notice/models.py:53 msgid "Description" msgstr "描述" @@ -205,7 +206,7 @@ msgstr "描述" msgid "File" msgstr "文件" -#: account/models.py:190 archive/models.py:67 notice/models.py:40 +#: account/models.py:190 archive/models.py:67 notice/models.py:41 msgid "Created time" msgstr "创建时间" @@ -245,7 +246,7 @@ msgstr "资料" msgid "archives" msgstr "资料" -#: archive/models.py:66 notice/models.py:39 +#: archive/models.py:66 notice/models.py:40 msgid "Category name" msgstr "类别名称" @@ -265,31 +266,35 @@ msgstr "是否重要" msgid "Contents" msgstr "内容" -#: notice/models.py:23 +#: notice/models.py:19 +msgid "Markdown syntax supported" +msgstr "支持Markdown语法格式" + +#: notice/models.py:24 msgid "notice" msgstr "通知" -#: notice/models.py:24 +#: notice/models.py:25 msgid "notices" msgstr "通知" -#: notice/models.py:43 +#: notice/models.py:44 msgid "notice category" msgstr "通知类别" -#: notice/models.py:44 +#: notice/models.py:45 msgid "notice categories" msgstr "通知类别" -#: notice/models.py:54 +#: notice/models.py:55 msgid "Attachment" msgstr "附件" -#: notice/models.py:60 +#: notice/models.py:61 msgid "notice attachment" msgstr "通知附件" -#: notice/models.py:61 +#: notice/models.py:62 msgid "notice attachments" msgstr "通知附件" diff --git a/notice/templatetags/my_markdown.py b/notice/templatetags/my_markdown.py index 6b25146..842f72f 100644 --- a/notice/templatetags/my_markdown.py +++ b/notice/templatetags/my_markdown.py @@ -1,4 +1,4 @@ -# -*- coding: utf8 -*- +# -*- coding: utf-8 -*- """ implement my own 'markdown' template tag diff --git a/requirements.txt b/requirements.txt index f5fb4b4..bfb3038 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ Django==1.6.2 +Markdown==2.4 MySQL-python==1.2.5 South==0.8.4 django-bootstrap3==4.2.0 |