Merge branch 'newrules' into pylons0.10
* newrules: updated translations add ideas for SSH functions as comment add idea for debconf list search as comment add Debian search add website google search add patch tracker add piuparts add support for "firstchar" in patterns add ubuntudiff to new group Ubuntu Resolved conflicts: ddportfolioservice/i18n/ddportfolioservice.pot ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po ddportfolioservice/model/ddportfolio.ini
This commit is contained in:
commit
03954ba7e9
6 changed files with 123 additions and 42 deletions
|
|
@ -70,6 +70,8 @@ developer name on all bug logs)'),
|
|||
'lintianfull' : N_('full lintian reports (i.e. including \
|
||||
"info"-level messages)'),
|
||||
'dehs' : N_('DEHS (Debian External Health Status)'),
|
||||
'piuparts' : N_('piuparts'),
|
||||
'patchtracker' : N_('Debian patch tracking system'),
|
||||
},
|
||||
'upload' : {
|
||||
'label' : N_('Upload'),
|
||||
|
|
@ -98,6 +100,12 @@ developer name on all bug logs)'),
|
|||
'label' : N_('Miscellaneous'),
|
||||
'debtags' : N_('debtags'),
|
||||
'links' : N_('links'),
|
||||
'website' : N_('Debian website'),
|
||||
'search' : N_('Debian search'),
|
||||
},
|
||||
'ubuntu' : {
|
||||
'label' : N_('Ubuntu'),
|
||||
'ubuntudiff' : N_('Available patches from Ubuntu'),
|
||||
},
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: ddportfolioservice 0.2\n"
|
||||
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
|
||||
"POT-Creation-Date: 2010-04-18 21:15+0200\n"
|
||||
"POT-Creation-Date: 2010-05-10 21:26+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -99,73 +99,97 @@ msgstr ""
|
|||
msgid "DEHS (Debian External Health Status)"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:75
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:73
|
||||
msgid "piuparts"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:74
|
||||
msgid "Debian patch tracking system"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:77
|
||||
msgid "Upload"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:76
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:78
|
||||
msgid ""
|
||||
"keylog (per-key upload list)\n"
|
||||
"(note: uses key fingerprint)"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:80
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:82
|
||||
msgid "Mailing Lists"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:81
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:83
|
||||
msgid "lists.d.o"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:82
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:84
|
||||
msgid "lists.a.d.o"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:83
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:85
|
||||
msgid "gmane"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:86
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:88
|
||||
msgid "Files"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:87
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:89
|
||||
msgid "people.d.o"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:88
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:90
|
||||
msgid "oldpeople"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:89
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:95
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:91
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:97
|
||||
msgid "Alioth"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:92
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:94
|
||||
msgid "Membership"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:93
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:95
|
||||
msgid "NM"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:94
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:96
|
||||
msgid "DB"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:98
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:100
|
||||
msgid "Miscellaneous"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:99
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:101
|
||||
msgid "debtags"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:100
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:102
|
||||
msgid "links"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:103
|
||||
msgid "Debian website"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:104
|
||||
msgid "Debian search"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:107
|
||||
msgid "Ubuntu"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:108
|
||||
msgid "Available patches from Ubuntu"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/model/urlbuilder.py:40
|
||||
msgid "Email address"
|
||||
msgstr ""
|
||||
|
|
@ -190,7 +214,7 @@ msgstr ""
|
|||
msgid "Alioth user name"
|
||||
msgstr ""
|
||||
|
||||
#: ddportfolioservice/model/urlbuilder.py:73
|
||||
#: ddportfolioservice/model/urlbuilder.py:74
|
||||
#, python-format
|
||||
msgid "Missing input: %s"
|
||||
msgstr ""
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -9,7 +9,7 @@ msgstr ""
|
|||
"Project-Id-Version: ddportfolioservice 0.2\n"
|
||||
"Report-Msgid-Bugs-To: jan@dittberner.info\n"
|
||||
"POT-Creation-Date: 2009-01-20 23:13+0100\n"
|
||||
"PO-Revision-Date: 2010-04-18 21:15+0200\n"
|
||||
"PO-Revision-Date: 2010-05-10 21:30+0200\n"
|
||||
"Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
|
||||
"Language-Team: de <LL@li.org>\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
|
||||
|
|
@ -109,11 +109,19 @@ msgstr ""
|
|||
msgid "DEHS (Debian External Health Status)"
|
||||
msgstr "DEHS (Debian External Health Status)"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:75
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:73
|
||||
msgid "piuparts"
|
||||
msgstr "piuparts"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:74
|
||||
msgid "Debian patch tracking system"
|
||||
msgstr "Debian Nachverfolgungssystem für Patches"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:77
|
||||
msgid "Upload"
|
||||
msgstr "Upload"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:76
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:78
|
||||
msgid ""
|
||||
"keylog (per-key upload list)\n"
|
||||
"(note: uses key fingerprint)"
|
||||
|
|
@ -121,63 +129,79 @@ msgstr ""
|
|||
"Keylog\n"
|
||||
"(Anmerkung: verwendet den Fingerabdruck des Schlüssels)"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:80
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:82
|
||||
msgid "Mailing Lists"
|
||||
msgstr "Mailinglisten"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:81
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:83
|
||||
msgid "lists.d.o"
|
||||
msgstr "lists.d.o"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:82
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:84
|
||||
msgid "lists.a.d.o"
|
||||
msgstr "lists.a.d.o"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:83
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:85
|
||||
msgid "gmane"
|
||||
msgstr "Gmane"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:86
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:88
|
||||
msgid "Files"
|
||||
msgstr "Dateien"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:87
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:89
|
||||
msgid "people.d.o"
|
||||
msgstr "people.d.o"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:88
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:90
|
||||
msgid "oldpeople"
|
||||
msgstr "oldpeople"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:89
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:95
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:91
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:97
|
||||
msgid "Alioth"
|
||||
msgstr "Alioth"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:92
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:94
|
||||
msgid "Membership"
|
||||
msgstr "Mitgliedschaft"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:93
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:95
|
||||
msgid "NM"
|
||||
msgstr "NM"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:94
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:96
|
||||
msgid "DB"
|
||||
msgstr "DB"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:98
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:100
|
||||
msgid "Miscellaneous"
|
||||
msgstr "Sonstiges"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:99
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:101
|
||||
msgid "debtags"
|
||||
msgstr "debtags"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:100
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:102
|
||||
msgid "links"
|
||||
msgstr "Links"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:103
|
||||
msgid "Debian website"
|
||||
msgstr "Debian Webseite"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:104
|
||||
msgid "Debian search"
|
||||
msgstr "Debian-Suche"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:107
|
||||
msgid "Ubuntu"
|
||||
msgstr "Ubuntu"
|
||||
|
||||
#: ddportfolioservice/controllers/ddportfolio.py:108
|
||||
msgid "Available patches from Ubuntu"
|
||||
msgstr "Verfügbare Patches aus Ubuntu"
|
||||
|
||||
#: ddportfolioservice/model/urlbuilder.py:40
|
||||
msgid "Email address"
|
||||
msgstr "E-Mailadresse"
|
||||
|
|
@ -202,7 +226,7 @@ msgstr "Nicht-DD E-Mailadresse:"
|
|||
msgid "Alioth user name"
|
||||
msgstr "Alioth-Benutzername"
|
||||
|
||||
#: ddportfolioservice/model/urlbuilder.py:73
|
||||
#: ddportfolioservice/model/urlbuilder.py:74
|
||||
#, python-format
|
||||
msgid "Missing input: %s"
|
||||
msgstr "Fehlende Eingabe: %s"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Configuration for DDPortfolio service
|
||||
# Copyright (c) 2009 Jan Dittberner <jan@dittberner.info>
|
||||
# Copyright © 2009, 2010 Jan Dittberner <jan@dittberner.info>
|
||||
#
|
||||
# This file is part of DDPortfolio service.
|
||||
#
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
[DEFAULT]
|
||||
keyring.dir=${HOME}/debian/keyring.debian.org/keyrings
|
||||
urlbuilder.sections=overview,bugs,build,qa,upload,lists,files,membership,
|
||||
miscellaneous
|
||||
miscellaneous,ubuntu
|
||||
|
||||
[overview]
|
||||
urls=ddpo,alladdresses
|
||||
|
|
@ -44,10 +44,12 @@ buildd.pattern=http://buildd.debian.org/pkg.cgi?maint=%(email)s
|
|||
svnbuildstat.pattern=http://svnbuildstat.debian.net/packages/list/%(email)s
|
||||
|
||||
[qa]
|
||||
urls=lintian,lintianfull,dehs
|
||||
urls=lintian,lintianfull,dehs,piuparts,patchtracker
|
||||
lintian.pattern=http://lintian.debian.org/maintainer/%(email)s.html
|
||||
lintianfull.pattern=http://lintian.debian.org/full/%(email)s.html
|
||||
dehs.pattern=http://dehs.alioth.debian.org/report.php?login=%(email)s
|
||||
piuparts.pattern=http://piuparts.debian.org/sid/maintainer/%(firstchar)s/%(email)s.html
|
||||
patchtracker.pattern=http://patch-tracker.debian.org/email/%(email)s
|
||||
|
||||
[upload]
|
||||
urls=keylog
|
||||
|
|
@ -58,6 +60,11 @@ urls=dolists,adolists,gmane
|
|||
dolists.pattern=http://lists.debian.org/cgi-bin/search?author=%(name)s&sort=date
|
||||
adolists.pattern=http://www.google.com/search?q=site%%3Alists.alioth.debian.org+%%22%(name)s%%22
|
||||
gmane.pattern=http://search.gmane.org/?email=%(name)s&group=gmane.linux.debian.*
|
||||
# debconf list search has a tricky URL format
|
||||
# http://lists.debconf.org/lurker/search \
|
||||
# /20100510.202949.00000000@au:%(firstname)s,au:%(lastname)s.en.html
|
||||
# /YYYYMMDD.HHmmss.hashcode@au:%(firstname)s,au:%(lastname)s.en.html
|
||||
# maybe this could be implemented using some custom formatter function
|
||||
|
||||
[files]
|
||||
urls=people,alioth
|
||||
|
|
@ -71,6 +78,23 @@ db.pattern=http://db.debian.org/search.cgi?uid=%(username)s&dosearch=Search
|
|||
alioth.pattern=http://alioth.debian.org/users/%(aliothusername)s/
|
||||
|
||||
[miscellaneous]
|
||||
urls=debtags,links
|
||||
urls=debtags,links,website,search
|
||||
debtags.pattern=http://debtags.alioth.debian.org/todo.html?maint=%(email)s
|
||||
links.pattern=http://www.google.com/search?hl=en&lr=&q=site%%3Adebian.org+%%22%(name)s%%22+-site%%3Anm.debian.org+-site%%3Alintian.debian.org+-site%%3Abugs.debian.org+-site%%3Alists.debian.org+-site%%3Apackages.debian.org+-site%%3Alists.alioth.debian.org+-site%%3Aftp.debian.org++-site%%3Apackages.qa.debian.org++-site%%3Aftp*.*.debian.org+-inurl%%3Adebian.org%%2Fdevel%%2Fpeople.+-inurl%%3Aindices%%2FMaintainers+-inurl%%3Adebian.org%%2Fdebian%%2Fproject++-inurl%%3A%%2Fdists%%2F&btnG=Search
|
||||
website.pattern=http://www.google.com/search?q=site:www.debian.org+%(name)s
|
||||
search.pattern=http://search.debian.org/?q=%%22%(name)s%%22
|
||||
# SSH functions
|
||||
#
|
||||
# owned *.debian.net domains
|
||||
# ssh merkel.debian.org ldapsearch -u -x -H ldap://db.debian.org -b dc=debian,dc=org \
|
||||
# uid=%(username)s dnsZoneEntry
|
||||
#
|
||||
# MIA information
|
||||
# ssh merkel.debian.org /srv/qa.debian.org/mia/mia-query %(username)s
|
||||
#
|
||||
# Group information
|
||||
# ssh merkel.debian.org id %(username)s
|
||||
|
||||
[ubuntu]
|
||||
urls=ubuntudiff
|
||||
ubuntudiff.pattern=http://ubuntudiff.debian.net/q/uploaders/%(email)s
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ def build_urls(fields):
|
|||
fpr = keyfinder.getFingerprintByEmail(fields['email'].encode('utf8'))
|
||||
if fpr:
|
||||
qfields['gpgfp'] = fpr[0]
|
||||
qfields['firstchar'] = fields['email'][0].encode('utf8')
|
||||
for section in [section.strip() for section in \
|
||||
my_config.get('DEFAULT',
|
||||
'urlbuilder.sections').split(',')]:
|
||||
|
|
|
|||
Loading…
Reference in a new issue