Changeset 59

Show
Ignore:
Timestamp:
2008年09月27日 02时19分12秒 (4 years ago)
Author:
jiangx
Message:

See #11: translate 'welcome'; fix mantis post-commit hooks.

Location:
trunk/pysvnmanager
Files:
6 modified

Legend:

Unmodified
Added
Removed

  • trunk/pysvnmanager/hooks/init/hook1.4/post-commit

    r57 r59  
    7474if [ "$mantis_integration" = "yes" ]; then 
    7575    SVNLOOK=/opt/svn/bin/svnlook 
    76     SED=/bin/sed 
    7776    MANTISBT=/opt/mantis/web 
    7877    PHP=/opt/php5/bin/php5 
    … …  
    8079    if [ -f "$MANTISBT/core/checkin.php" ]; then 
    8180      export LC_ALL=zh_CN.utf8 
    82       commitlog=`$SVNLOOK  log  -r "$REV" "$REPOS" | $SED -e 's/\$/\\\\n/g'` 
    83       commitauthor=`$SVNLOOK  author  -r "$REV" "$REPOS" | $SED -e 's/\$/\\\\n/g'` 
    84       commitdiff=`$SVNLOOK diff -r "$REV" "$REPOS" | head -25 | $SED -e 's/\$/\\\\n/g'` 
     81      commitlog=`$SVNLOOK  log  -r "$REV" "$REPOS"` 
     82      commitauthor=`$SVNLOOK  author  -r "$REV" "$REPOS"` 
     83      commitdiff=`$SVNLOOK diff -r "$REV" "$REPOS" | head -25` 
    8584      $PHP -q $MANTISBT/core/checkin.php $commitauthor << EOF 
    8685Author: $commitauthor 

  • trunk/pysvnmanager/hooks/init/hook1.5/post-commit

    r57 r59  
    7474if [ "$mantis_integration" = "yes" ]; then 
    7575    SVNLOOK=/opt/svn/bin/svnlook 
    76     SED=/bin/sed 
    7776    MANTISBT=/opt/mantis/web 
    7877    PHP=/opt/php5/bin/php5 
    … …  
    8079    if [ -f "$MANTISBT/core/checkin.php" ]; then 
    8180      export LC_ALL=zh_CN.utf8 
    82       commitlog=`$SVNLOOK  log  -r "$REV" "$REPOS" | $SED -e 's/\$/\\\\n/g'` 
    83       commitauthor=`$SVNLOOK  author  -r "$REV" "$REPOS" | $SED -e 's/\$/\\\\n/g'` 
    84       commitdiff=`$SVNLOOK diff -r "$REV" "$REPOS" | head -25 | $SED -e 's/\$/\\\\n/g'` 
     81      commitlog=`$SVNLOOK  log  -r "$REV" "$REPOS"` 
     82      commitauthor=`$SVNLOOK  author  -r "$REV" "$REPOS"` 
     83      commitdiff=`$SVNLOOK diff -r "$REV" "$REPOS" | head -25` 
    8584      $PHP -q $MANTISBT/core/checkin.php $commitauthor << EOF 
    8685Author: $commitauthor 

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

    r55 r59  
    1010"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" 
    1111"POT-Creation-Date: 2008-07-03 22:14+0800\n" 
    12 "PO-Revision-Date: 2008-08-30 13:12+0800\n" 
     12"PO-Revision-Date: 2008-09-27 00:48+0800\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
    1414"Language-Team: en <LL@li.org>\n" 
    … …  
    230230msgstr "" 
    231231 
    232 #: pysvnmanager/controllers/security.py:52 
     232#: pysvnmanager/controllers/security.py:50 
    233233#, python-format 
    234234msgid "User %s logged in" 
    235235msgstr "" 
    236236 
    237 #: pysvnmanager/controllers/security.py:63 
     237#: pysvnmanager/controllers/security.py:61 
    238238#, python-format 
    239239msgid "Login failed for user: %s" 
    240240msgstr "" 
    241241 
    242 #: pysvnmanager/controllers/security.py:71 
     242#: pysvnmanager/controllers/security.py:69 
    243243#, python-format 
    244244msgid "User %s logged out" 
    … …  
    552552msgstr "" 
    553553 
    554 #: pysvnmanager/model/svnauthz.py:1502 pysvnmanager/model/svnauthz.py:1509 
    555 #: pysvnmanager/model/svnauthz.py:1513 
     554#: pysvnmanager/model/svnauthz.py:1505 pysvnmanager/model/svnauthz.py:1512 
     555#: pysvnmanager/model/svnauthz.py:1516 
    556556#, python-format 
    557557msgid "Unknown rule format: %s" 
    558558msgstr "" 
    559559 
    560 #: pysvnmanager/model/svnauthz.py:1527 
     560#: pysvnmanager/model/svnauthz.py:1530 
    561561#, python-format 
    562562msgid "No module exist for %s:%s" 
    563563msgstr "" 
    564564 
    565 #: pysvnmanager/model/svnauthz.py:1637 
     565#: pysvnmanager/model/svnauthz.py:1640 
    566566#, python-format 
    567567msgid "Alias %s is referenced by group %s." 
    568568msgstr "" 
    569569 
    570 #: pysvnmanager/model/svnauthz.py:1649 
     570#: pysvnmanager/model/svnauthz.py:1652 
    571571#, python-format 
    572572msgid "%s is referenced by [%s]." 
    573573msgstr "" 
    574574 
    575 #: pysvnmanager/model/svnauthz.py:1785 
     575#: pysvnmanager/model/svnauthz.py:1788 
    576576#, python-format 
    577577msgid "User %(username)s has Full (RW) rights for module %(repos)s:%(path)s" 
    578578msgstr "" 
    579579 
    580 #: pysvnmanager/model/svnauthz.py:1787 
     580#: pysvnmanager/model/svnauthz.py:1790 
    581581#, python-format 
    582582msgid "User %(username)s has ReadOnly (RO) rights for module %(repos)s:%(path)s" 
    583583msgstr "" 
    584584 
    585 #: pysvnmanager/model/svnauthz.py:1789 
     585#: pysvnmanager/model/svnauthz.py:1792 
    586586#, python-format 
    587587msgid "User %(username)s can *NOT* access to module %(repos)s:%(path)s" 
    588588msgstr "" 
    589589 
    590 #: pysvnmanager/model/svnauthz.py:1829 
     590#: pysvnmanager/model/svnauthz.py:1832 
    591591#, python-format 
    592592msgid "" 
    … …  
    600600msgstr "" 
    601601 
    602 #: pysvnmanager/model/svnauthz.py:1848 
     602#: pysvnmanager/model/svnauthz.py:1851 
    603603#, python-format 
    604604msgid "" 
    … …  
    650650msgstr "" 
    651651 
     652#: pysvnmanager/templates/base.mako:38 
     653msgid "Welcome" 
     654msgstr "" 
     655 
    652656#: pysvnmanager/templates/base.mako:39 
    653657msgid "Logout" 

  • trunk/pysvnmanager/i18n/pysvnmanager.pot

    r55 r59  
    77msgid "" 
    88msgstr "" 
    9 "Project-Id-Version: pySvnManager 0.2.1\n" 
     9"Project-Id-Version: pySvnManager 0.3.0\n" 
    1010"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" 
    11 "POT-Creation-Date: 2008-08-30 13:12+0800\n" 
     11"POT-Creation-Date: 2008-09-27 00:47+0800\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
    … …  
    222222msgstr "" 
    223223 
    224 #: pysvnmanager/controllers/security.py:52 
     224#: pysvnmanager/controllers/security.py:50 
    225225#, python-format 
    226226msgid "User %s logged in" 
    227227msgstr "" 
    228228 
    229 #: pysvnmanager/controllers/security.py:63 
     229#: pysvnmanager/controllers/security.py:61 
    230230#, python-format 
    231231msgid "Login failed for user: %s" 
    232232msgstr "" 
    233233 
    234 #: pysvnmanager/controllers/security.py:71 
     234#: pysvnmanager/controllers/security.py:69 
    235235#, python-format 
    236236msgid "User %s logged out" 
    … …  
    543543msgstr "" 
    544544 
    545 #: pysvnmanager/model/svnauthz.py:1502 pysvnmanager/model/svnauthz.py:1509 
    546 #: pysvnmanager/model/svnauthz.py:1513 
     545#: pysvnmanager/model/svnauthz.py:1505 pysvnmanager/model/svnauthz.py:1512 
     546#: pysvnmanager/model/svnauthz.py:1516 
    547547#, python-format 
    548548msgid "Unknown rule format: %s" 
    549549msgstr "" 
    550550 
    551 #: pysvnmanager/model/svnauthz.py:1527 
     551#: pysvnmanager/model/svnauthz.py:1530 
    552552#, python-format 
    553553msgid "No module exist for %s:%s" 
    554554msgstr "" 
    555555 
    556 #: pysvnmanager/model/svnauthz.py:1637 
     556#: pysvnmanager/model/svnauthz.py:1640 
    557557#, python-format 
    558558msgid "Alias %s is referenced by group %s." 
    559559msgstr "" 
    560560 
    561 #: pysvnmanager/model/svnauthz.py:1649 
     561#: pysvnmanager/model/svnauthz.py:1652 
    562562#, python-format 
    563563msgid "%s is referenced by [%s]." 
    564564msgstr "" 
    565565 
    566 #: pysvnmanager/model/svnauthz.py:1785 
     566#: pysvnmanager/model/svnauthz.py:1788 
    567567#, python-format 
    568568msgid "User %(username)s has Full (RW) rights for module %(repos)s:%(path)s" 
    569569msgstr "" 
    570570 
    571 #: pysvnmanager/model/svnauthz.py:1787 
     571#: pysvnmanager/model/svnauthz.py:1790 
    572572#, python-format 
    573573msgid "User %(username)s has ReadOnly (RO) rights for module %(repos)s:%(path)s" 
    574574msgstr "" 
    575575 
    576 #: pysvnmanager/model/svnauthz.py:1789 
     576#: pysvnmanager/model/svnauthz.py:1792 
    577577#, python-format 
    578578msgid "User %(username)s can *NOT* access to module %(repos)s:%(path)s" 
    579579msgstr "" 
    580580 
    581 #: pysvnmanager/model/svnauthz.py:1829 
     581#: pysvnmanager/model/svnauthz.py:1832 
    582582#, python-format 
    583583msgid "" 
    … …  
    591591msgstr "" 
    592592 
    593 #: pysvnmanager/model/svnauthz.py:1848 
     593#: pysvnmanager/model/svnauthz.py:1851 
    594594#, python-format 
    595595msgid "" 
    … …  
    639639msgstr "" 
    640640 
     641#: pysvnmanager/templates/base.mako:38 
     642msgid "Welcome" 
     643msgstr "" 
     644 
    641645#: pysvnmanager/templates/base.mako:39 
    642646msgid "Logout" 

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

    r55 r59  
    1212"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" 
    1313"POT-Creation-Date: 2008-07-03 22:14+0800\n" 
    14 "PO-Revision-Date: 2008-08-30 13:12+0800\n" 
     14"PO-Revision-Date: 2008-09-27 00:48+0800\n" 
    1515"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" 
    1616"Language-Team: <zh@li.org>\n" 
    … …  
    240240msgstr "用户 %(user)s 删除别名: %(alias)s。(rev:%(rev)s,%(msg)s)" 
    241241 
    242 #: pysvnmanager/controllers/security.py:52 
     242#: pysvnmanager/controllers/security.py:50 
    243243#, python-format 
    244244msgid "User %s logged in" 
    245245msgstr "用户 %s 登录" 
    246246 
    247 #: pysvnmanager/controllers/security.py:63 
     247#: pysvnmanager/controllers/security.py:61 
    248248#, python-format 
    249249msgid "Login failed for user: %s" 
    250250msgstr "以 %s 身份登录失败" 
    251251 
    252 #: pysvnmanager/controllers/security.py:71 
     252#: pysvnmanager/controllers/security.py:69 
    253253#, python-format 
    254254msgid "User %s logged out" 
    … …  
    590590msgstr "更新失败！您的更改是基于一个过期的版本，请先刷新再更改。" 
    591591 
    592 #: pysvnmanager/model/svnauthz.py:1502 pysvnmanager/model/svnauthz.py:1509 
    593 #: pysvnmanager/model/svnauthz.py:1513 
     592#: pysvnmanager/model/svnauthz.py:1505 pysvnmanager/model/svnauthz.py:1512 
     593#: pysvnmanager/model/svnauthz.py:1516 
    594594#, python-format 
    595595msgid "Unknown rule format: %s" 
    596596msgstr "未知策略格式: %s" 
    597597 
    598 #: pysvnmanager/model/svnauthz.py:1527 
     598#: pysvnmanager/model/svnauthz.py:1530 
    599599#, python-format 
    600600msgid "No module exist for %s:%s" 
    601601msgstr "模块不存在: %s:%s" 
    602602 
    603 #: pysvnmanager/model/svnauthz.py:1637 
     603#: pysvnmanager/model/svnauthz.py:1640 
    604604#, python-format 
    605605msgid "Alias %s is referenced by group %s." 
    606606msgstr "别名 %s 为用户组 %s 引用。" 
    607607 
    608 #: pysvnmanager/model/svnauthz.py:1649 
     608#: pysvnmanager/model/svnauthz.py:1652 
    609609#, python-format 
    610610msgid "%s is referenced by [%s]." 
    611611msgstr "%s 在 [%s] 中被引用。" 
    612612 
    613 #: pysvnmanager/model/svnauthz.py:1785 
     613#: pysvnmanager/model/svnauthz.py:1788 
    614614#, python-format 
    615615msgid "User %(username)s has Full (RW) rights for module %(repos)s:%(path)s" 
    616616msgstr "用户 %(username)s 对模组 %(repos)s:%(path)s 具有完全权限 (RW)" 
    617617 
    618 #: pysvnmanager/model/svnauthz.py:1787 
     618#: pysvnmanager/model/svnauthz.py:1790 
    619619#, python-format 
    620620msgid "User %(username)s has ReadOnly (RO) rights for module %(repos)s:%(path)s" 
    621621msgstr "用户 %(username)s 对模组 %(repos)s:%(path)s 具有只读权限 (RO)" 
    622622 
    623 #: pysvnmanager/model/svnauthz.py:1789 
     623#: pysvnmanager/model/svnauthz.py:1792 
    624624#, python-format 
    625625msgid "User %(username)s can *NOT* access to module %(repos)s:%(path)s" 
    626626msgstr "用户 %(username)s 对模组 %(repos)s:%(path)s *没有* 访问权限 (XX)" 
    627627 
    628 #: pysvnmanager/model/svnauthz.py:1829 
     628#: pysvnmanager/model/svnauthz.py:1832 
    629629#, python-format 
    630630msgid "" 
    … …  
    645645"\n" 
    646646 
    647 #: pysvnmanager/model/svnauthz.py:1848 
     647#: pysvnmanager/model/svnauthz.py:1851 
    648648#, python-format 
    649649msgid "" 
    … …  
    708708msgstr "修改日志" 
    709709 
     710#: pysvnmanager/templates/base.mako:38 
     711msgid "Welcome" 
     712msgstr "欢迎," 
     713 
    710714#: pysvnmanager/templates/base.mako:39 
    711715msgid "Logout" 

  • trunk/pysvnmanager/templates/base.mako

    r55 r59  
    3636          <td>${h.link_to(_("Repos management"), h.url_for(controller="repos", id=None))}</td> 
    3737          <td>${h.link_to(_("Change log"), h.url_for(controller="logs", id=None))}</td> 
    38           <td>welcome ${session.get('user')}</td> 
     38          <td>${_("Welcome")} ${session.get('user')}</td> 
    3939          <td>${h.link_to(_("Logout"), h.url_for(controller="logout", id=None))}</td> 
    4040      </tr>