Changeset 23

Timestamp:

2008年07月29日 08时47分18秒 (4 years ago)

Author:

jiangx

Message:

Fix #5: add cover-package to nose; set proper fallback lang for zh-cn;

Location:

trunk

Files:

• pysvnmanager/i18n/en/LC_MESSAGES/pysvnmanager.po (modified) (9 diffs)
• pysvnmanager/i18n/pysvnmanager.pot (modified) (8 diffs)
• pysvnmanager/i18n/zh/LC_MESSAGES/pysvnmanager.po (modified) (11 diffs)
• pysvnmanager/lib/base.py (modified) (2 diffs)
• setup.cfg (modified) (1 diff)
• test.ini (modified) (2 diffs)

trunk/pysvnmanager/i18n/en/LC_MESSAGES/pysvnmanager.po

@@ -10 +10 @@
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2008-07-03 22:14+0800\n"
-"PO-Revision-Date: 2008-07-27 13:21+0800\n"
+"PO-Revision-Date: 2008-07-28 09:59+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <LL@li.org>\n"
@@ -38 +38 @@
 
 #: pysvnmanager/controllers/authz.py:38 pysvnmanager/controllers/role.py:55
-#: pysvnmanager/controllers/role.py:79
+#: pysvnmanager/controllers/role.py:75
 #: pysvnmanager/templates/authz/index.mako:155
 #: pysvnmanager/templates/check/index.mako:17
@@ -48 +48 @@
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:41 pysvnmanager/controllers/role.py:62
-#: pysvnmanager/controllers/role.py:81
+#: pysvnmanager/controllers/authz.py:41 pysvnmanager/controllers/role.py:60
+#: pysvnmanager/controllers/role.py:77
 #: pysvnmanager/templates/authz/index.mako:157
 #: pysvnmanager/templates/check/index.mako:19
@@ -59 +59 @@
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:59 pysvnmanager/controllers/authz.py:83
+#: pysvnmanager/controllers/authz.py:59 pysvnmanager/controllers/authz.py:82
 #: pysvnmanager/controllers/check.py:91 pysvnmanager/controllers/role.py:48
 #: pysvnmanager/templates/check/index.mako:9
@@ -68 +68 @@
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:146
+#: pysvnmanager/controllers/authz.py:155
 #, python-format
 msgid "Repository %s not exist."
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:154
+#: pysvnmanager/controllers/authz.py:163
 #, python-format
 msgid "Module %s not exist."
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:160
+#: pysvnmanager/controllers/authz.py:169
 msgid "You can not delete yourself from admin list."
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:170
+#: pysvnmanager/controllers/authz.py:179
 #, python-format
 msgid "User %(user)s changed authz rules. (rev:%(rev)s,%(msg)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:194
+#: pysvnmanager/controllers/authz.py:203
 #, python-format
 msgid "User %(user)s delete authz rules. (rev:%(rev)s,%(msg)s)"
@@ -97 +97 @@
 msgstr ""
 
-#: pysvnmanager/controllers/role.py:121
+#: pysvnmanager/controllers/role.py:117
 #, python-format
 msgid "User %(user)s changed group: %(grp)s. (rev:%(rev)s,%(msg)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/role.py:141
+#: pysvnmanager/controllers/role.py:137
 #, python-format
 msgid "User %(user)s delete group: %(grp)s. (rev:%(rev)s,%(msg)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/role.py:161
+#: pysvnmanager/controllers/role.py:157
 #, python-format
 msgid "User %(user)s changed alias: %(alias)s. (rev:%(rev)s,%(msg)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/role.py:181
+#: pysvnmanager/controllers/role.py:177
 #, python-format
 msgid "User %(user)s delete alias: %(alias)s. (rev:%(rev)s,%(msg)s)"
@@ -175 +175 @@
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1592
+#: pysvnmanager/model/svnauthz.py:1593
 #, python-format
 msgid "Alias %s is referenced by group %s."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1604
+#: pysvnmanager/model/svnauthz.py:1605
 #, python-format
 msgid "%s is referenced by [%s]."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1741
+#: pysvnmanager/model/svnauthz.py:1742
 #, python-format
 msgid "User %(username)s has Full (RW) rights for module %(repos)s:%(path)s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1743
+#: pysvnmanager/model/svnauthz.py:1744
 #, python-format
 msgid "User %(username)s has ReadOnly (RO) rights for module %(repos)s:%(path)s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1745
+#: pysvnmanager/model/svnauthz.py:1746
 #, python-format
 msgid "User %(username)s can *NOT* access to module %(repos)s:%(path)s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1783
+#: pysvnmanager/model/svnauthz.py:1784
 #, python-format
 msgid ""
@@ -212 +212 @@
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1802
+#: pysvnmanager/model/svnauthz.py:1803
 #, python-format
 msgid ""
@@ -517 +517 @@
 msgstr ""
 
-#~ msgid "Aliasname is not provided."
-#~ msgstr ""
-
-#~ msgid "Aliasname should not begin with &."
-#~ msgstr ""
-
-#~ msgid "Group name is not provided."
-#~ msgstr ""
-
-#~ msgid "Group name should not begin with @."
-#~ msgstr ""
-

trunk/pysvnmanager/i18n/pysvnmanager.pot

@@ -9 +9 @@
 "Project-Id-Version: pySvnManager 0.1.2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2008-07-27 13:21+0800\n"
+"POT-Creation-Date: 2008-07-28 09:59+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -34 +34 @@
 
 #: pysvnmanager/controllers/authz.py:38 pysvnmanager/controllers/role.py:55
-#: pysvnmanager/controllers/role.py:79 pysvnmanager/templates/authz/index.mako:155
+#: pysvnmanager/controllers/role.py:75 pysvnmanager/templates/authz/index.mako:155
 #: pysvnmanager/templates/check/index.mako:17
 #: pysvnmanager/templates/role/index.mako:18
@@ -43 +43 @@
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:41 pysvnmanager/controllers/role.py:62
-#: pysvnmanager/controllers/role.py:81 pysvnmanager/templates/authz/index.mako:157
+#: pysvnmanager/controllers/authz.py:41 pysvnmanager/controllers/role.py:60
+#: pysvnmanager/controllers/role.py:77 pysvnmanager/templates/authz/index.mako:157
 #: pysvnmanager/templates/check/index.mako:19
 #: pysvnmanager/templates/role/index.mako:23
@@ -53 +53 @@
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:59 pysvnmanager/controllers/authz.py:83
+#: pysvnmanager/controllers/authz.py:59 pysvnmanager/controllers/authz.py:82
 #: pysvnmanager/controllers/check.py:91 pysvnmanager/controllers/role.py:48
 #: pysvnmanager/templates/check/index.mako:9
@@ -62 +62 @@
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:146
+#: pysvnmanager/controllers/authz.py:155
 #, python-format
 msgid "Repository %s not exist."
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:154
+#: pysvnmanager/controllers/authz.py:163
 #, python-format
 msgid "Module %s not exist."
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:160
+#: pysvnmanager/controllers/authz.py:169
 msgid "You can not delete yourself from admin list."
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:170
+#: pysvnmanager/controllers/authz.py:179
 #, python-format
 msgid "User %(user)s changed authz rules. (rev:%(rev)s,%(msg)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/authz.py:194
+#: pysvnmanager/controllers/authz.py:203
 #, python-format
 msgid "User %(user)s delete authz rules. (rev:%(rev)s,%(msg)s)"
@@ -90 +90 @@
 msgstr ""
 
-#: pysvnmanager/controllers/role.py:121
+#: pysvnmanager/controllers/role.py:117
 #, python-format
 msgid "User %(user)s changed group: %(grp)s. (rev:%(rev)s,%(msg)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/role.py:141
+#: pysvnmanager/controllers/role.py:137
 #, python-format
 msgid "User %(user)s delete group: %(grp)s. (rev:%(rev)s,%(msg)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/role.py:161
+#: pysvnmanager/controllers/role.py:157
 #, python-format
 msgid "User %(user)s changed alias: %(alias)s. (rev:%(rev)s,%(msg)s)"
 msgstr ""
 
-#: pysvnmanager/controllers/role.py:181
+#: pysvnmanager/controllers/role.py:177
 #, python-format
 msgid "User %(user)s delete alias: %(alias)s. (rev:%(rev)s,%(msg)s)"
@@ -168 +168 @@
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1592
+#: pysvnmanager/model/svnauthz.py:1593
 #, python-format
 msgid "Alias %s is referenced by group %s."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1604
+#: pysvnmanager/model/svnauthz.py:1605
 #, python-format
 msgid "%s is referenced by [%s]."
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1741
+#: pysvnmanager/model/svnauthz.py:1742
 #, python-format
 msgid "User %(username)s has Full (RW) rights for module %(repos)s:%(path)s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1743
+#: pysvnmanager/model/svnauthz.py:1744
 #, python-format
 msgid "User %(username)s has ReadOnly (RO) rights for module %(repos)s:%(path)s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1745
+#: pysvnmanager/model/svnauthz.py:1746
 #, python-format
 msgid "User %(username)s can *NOT* access to module %(repos)s:%(path)s"
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1783
+#: pysvnmanager/model/svnauthz.py:1784
 #, python-format
 msgid ""
@@ -205 +205 @@
 msgstr ""
 
-#: pysvnmanager/model/svnauthz.py:1802
+#: pysvnmanager/model/svnauthz.py:1803
 #, python-format
 msgid ""

trunk/pysvnmanager/i18n/zh/LC_MESSAGES/pysvnmanager.po

@@ -9 +9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: pysvnmanager\n"
+"Project-Id-Version:  pysvnmanager\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2008-07-03 22:14+0800\n"
-"PO-Revision-Date: 2008-07-27 13:23+0800\n"
+"PO-Revision-Date: 2008-07-28 09:59+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
-"Language-Team:  <zh@li.org>\n"
+"Language-Team: <zh@li.org>\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.2\n"
-"X-Generator: KBabel 1.11.4\n"
 
 #: pysvnmanager/controllers/authz.py:31
@@ -41 +40 @@
 
 #: pysvnmanager/controllers/authz.py:38 pysvnmanager/controllers/role.py:55
-#: pysvnmanager/controllers/role.py:79
+#: pysvnmanager/controllers/role.py:75
 #: pysvnmanager/templates/authz/index.mako:155
 #: pysvnmanager/templates/check/index.mako:17
@@ -51 +50 @@
 msgstr "团队:"
 
-#: pysvnmanager/controllers/authz.py:41 pysvnmanager/controllers/role.py:62
-#: pysvnmanager/controllers/role.py:81
+#: pysvnmanager/controllers/authz.py:41 pysvnmanager/controllers/role.py:60
+#: pysvnmanager/controllers/role.py:77
 #: pysvnmanager/templates/authz/index.mako:157
 #: pysvnmanager/templates/check/index.mako:19
@@ -62 +61 @@
 msgstr "别名:"
 
-#: pysvnmanager/controllers/authz.py:59 pysvnmanager/controllers/authz.py:83
+#: pysvnmanager/controllers/authz.py:59 pysvnmanager/controllers/authz.py:82
 #: pysvnmanager/controllers/check.py:91 pysvnmanager/controllers/role.py:48
 #: pysvnmanager/templates/check/index.mako:9
@@ -71 +70 @@
 msgstr "请选择..."
 
-#: pysvnmanager/controllers/authz.py:146
+#: pysvnmanager/controllers/authz.py:155
 #, python-format
 msgid "Repository %s not exist."
 msgstr "版本库 %s 不存在。"
 
-#: pysvnmanager/controllers/authz.py:154
+#: pysvnmanager/controllers/authz.py:163
 #, python-format
 msgid "Module %s not exist."
 msgstr "模组 %s 不存在。"
 
-#: pysvnmanager/controllers/authz.py:160
+#: pysvnmanager/controllers/authz.py:169
 msgid "You can not delete yourself from admin list."
 msgstr "您不能将自己从管理员列表中删除。"
 
-#: pysvnmanager/controllers/authz.py:170
+#: pysvnmanager/controllers/authz.py:179
 #, python-format
 msgid "User %(user)s changed authz rules. (rev:%(rev)s,%(msg)s)"
 msgstr "用户 %(user)s 修改了授权策略。(rev:%(rev)s,%(msg)s)"
 
-#: pysvnmanager/controllers/authz.py:194
+#: pysvnmanager/controllers/authz.py:203
 #, python-format
 msgid "User %(user)s delete authz rules. (rev:%(rev)s,%(msg)s)"
@@ -100 +99 @@
 msgstr "没有权限。"
 
-#: pysvnmanager/controllers/role.py:121
+#: pysvnmanager/controllers/role.py:117
 #, python-format
 msgid "User %(user)s changed group: %(grp)s. (rev:%(rev)s,%(msg)s)"
 msgstr "用户 %(user)s 修改用户组: %(grp)s。(rev:%(rev)s,%(msg)s)"
 
-#: pysvnmanager/controllers/role.py:141
+#: pysvnmanager/controllers/role.py:137
 #, python-format
 msgid "User %(user)s delete group: %(grp)s. (rev:%(rev)s,%(msg)s)"
 msgstr "用户 %(user)s 删除用户组: %(grp)s。(rev:%(rev)s,%(msg)s)"
 
-#: pysvnmanager/controllers/role.py:161
+#: pysvnmanager/controllers/role.py:157
 #, python-format
 msgid "User %(user)s changed alias: %(alias)s. (rev:%(rev)s,%(msg)s)"
 msgstr "用户 %(user)s 修改别名: %(alias)s。(rev:%(rev)s,%(msg)s)"
 
-#: pysvnmanager/controllers/role.py:181
+#: pysvnmanager/controllers/role.py:177
 #, python-format
 msgid "User %(user)s delete alias: %(alias)s. (rev:%(rev)s,%(msg)s)"
@@ -178 +177 @@
 msgstr "模块不存在: %s:%s"
 
-#: pysvnmanager/model/svnauthz.py:1592
+#: pysvnmanager/model/svnauthz.py:1593
 #, python-format
 msgid "Alias %s is referenced by group %s."
 msgstr "别名 %s 为用户组 %s 引用。"
 
-#: pysvnmanager/model/svnauthz.py:1604
+#: pysvnmanager/model/svnauthz.py:1605
 #, python-format
 msgid "%s is referenced by [%s]."
 msgstr "%s 在 [%s] 中被引用。"
 
-#: pysvnmanager/model/svnauthz.py:1741
+#: pysvnmanager/model/svnauthz.py:1742
 #, python-format
 msgid "User %(username)s has Full (RW) rights for module %(repos)s:%(path)s"
 msgstr "用户 %(username)s 对模组 %(repos)s:%(path)s 具有完全权限 (RW)"
 
-#: pysvnmanager/model/svnauthz.py:1743
+#: pysvnmanager/model/svnauthz.py:1744
 #, python-format
 msgid "User %(username)s has ReadOnly (RO) rights for module %(repos)s:%(path)s"
 msgstr "用户 %(username)s 对模组 %(repos)s:%(path)s 具有只读权限 (RO)"
 
-#: pysvnmanager/model/svnauthz.py:1745
+#: pysvnmanager/model/svnauthz.py:1746
 #, python-format
 msgid "User %(username)s can *NOT* access to module %(repos)s:%(path)s"
 msgstr "用户 %(username)s 对模组 %(repos)s:%(path)s 没有访问权限 (XX)"
 
-#: pysvnmanager/model/svnauthz.py:1783
+#: pysvnmanager/model/svnauthz.py:1784
 #, python-format
 msgid ""
@@ -222 +221 @@
 "\n"
 
-#: pysvnmanager/model/svnauthz.py:1802
+#: pysvnmanager/model/svnauthz.py:1803
 #, python-format
 msgid ""
@@ -465 +464 @@
 
 #: pysvnmanager/templates/role/index.mako:420
-#| msgid "Update ACL failed:"
 msgid "Update group failed:"
 msgstr "更新用户组失败："
 
 #: pysvnmanager/templates/role/index.mako:427
-#| msgid "Update ACL successfully."
 msgid "Update group successfully."
 msgstr "成功更新用户组。"
@@ -479 +476 @@
 
 #: pysvnmanager/templates/role/index.mako:471
-#| msgid "Update ACL failed:"
 msgid "Delete group failed:"
 msgstr "更新用户组失败："
 
 #: pysvnmanager/templates/role/index.mako:478
-#| msgid "Update ACL successfully."
 msgid "Delete group successfully."
 msgstr "成功删除用户组。"
 
 #: pysvnmanager/templates/role/index.mako:512
-#| msgid "Update ACL failed:"
 msgid "Update alias failed:"
 msgstr "更新别名失败："
 
 #: pysvnmanager/templates/role/index.mako:519
-#| msgid "Update ACL successfully."
 msgid "Update alias successfully."
 msgstr "成功更新别名。"
@@ -503 +496 @@
 
 #: pysvnmanager/templates/role/index.mako:562
-#| msgid "Update ACL failed:"
 msgid "Delete alias failed:"
 msgstr "删除别名失败："
 
 #: pysvnmanager/templates/role/index.mako:569
-#| msgid "Update ACL successfully."
 msgid "Delete alias successfully."
 msgstr "成功删除别名。"

trunk/pysvnmanager/lib/base.py

@@ -20 +20 @@
 from localconfig import LocalConfig as cfg
 
+#import logging
+#log = logging.getLogger(__name__)
+
 class BaseController(WSGIController):
     requires_auth = []
@@ -27 +30 @@
         if 'lang' in session:
             set_lang(session['lang'])
+        #log.debug(request.languages)
         for lang in request.languages:
-            if lang in ['zh', 'en']:
+            if lang.lower() in ['zh-cn', 'zh']:
+                add_fallback('zh')
+            elif lang in ['en']:
                 add_fallback(lang)
 

trunk/setup.cfg

@@ -64 +64 @@
 with-pylons=test.ini
 detailed-errors=1
-#with-coverage=1
+with-coverage=1
+cover-package=pysvnmanager
+cover-erase=1
 #with-doctest=1
 

trunk/test.ini

@@ -57 +57 @@
 # Logging configuration
 [loggers]
-keys = root, pysvnmanager
+keys = root, nose, nose_plugins_cover, pysvnmanager
 
 [handlers]
@@ -66 +66 @@
 
 [logger_root]
+level = DEBUG
+handlers = console
+
+[logger_nose]
 level = INFO
 handlers = console
+qualname = nose
+
+[logger_nose_plugins_cover]
+level = INFO
+handlers = console
+qualname = nose.plugins.cover
 
 [logger_pysvnmanager]