Merge branch 'master' into pylons0.10

* master:
  add support for finger command line for db.debian.org query
This commit is contained in:
Jan Dittberner 2010-06-12 23:28:45 +02:00
commit fac0c223f4
5 changed files with 51 additions and 39 deletions

View file

@ -93,7 +93,8 @@ developer name on all bug logs)'),
'membership' : { 'membership' : {
'label' : N_('Membership'), 'label' : N_('Membership'),
'nm' : N_('NM'), 'nm' : N_('NM'),
'db' : N_('DB'), 'dbfinger' : N_('DB information via finger'),
'db' : N_('DB information via HTTP'),
'alioth' : N_('Alioth'), 'alioth' : N_('Alioth'),
'wiki' : N_('Wiki'), 'wiki' : N_('Wiki'),
'forum' : N_('Forum'), 'forum' : N_('Forum'),

View file

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: ddportfolioservice 0.2\n" "Project-Id-Version: ddportfolioservice 0.2\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2010-06-12 00:52+0200\n" "POT-Creation-Date: 2010-06-12 23:26+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -146,7 +146,7 @@ msgid "oldpeople"
msgstr "" msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:91 #: ddportfolioservice/controllers/ddportfolio.py:91
#: ddportfolioservice/controllers/ddportfolio.py:97 #: ddportfolioservice/controllers/ddportfolio.py:98
msgid "Alioth" msgid "Alioth"
msgstr "" msgstr ""
@ -159,68 +159,72 @@ msgid "NM"
msgstr "" msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:96 #: ddportfolioservice/controllers/ddportfolio.py:96
msgid "DB" msgid "DB information via finger"
msgstr "" msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:98 #: ddportfolioservice/controllers/ddportfolio.py:97
msgid "Wiki" msgid "DB information via HTTP"
msgstr "" msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:99 #: ddportfolioservice/controllers/ddportfolio.py:99
msgid "Wiki"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:100
msgid "Forum" msgid "Forum"
msgstr "" msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:102 #: ddportfolioservice/controllers/ddportfolio.py:103
msgid "Miscellaneous" msgid "Miscellaneous"
msgstr "" msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:103 #: ddportfolioservice/controllers/ddportfolio.py:104
msgid "debtags" msgid "debtags"
msgstr "" msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:104 #: ddportfolioservice/controllers/ddportfolio.py:105
msgid "links" msgid "links"
msgstr "" msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:105 #: ddportfolioservice/controllers/ddportfolio.py:106
msgid "Debian website" msgid "Debian website"
msgstr "" msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:106 #: ddportfolioservice/controllers/ddportfolio.py:107
msgid "Debian search" msgid "Debian search"
msgstr "" msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:107 #: ddportfolioservice/controllers/ddportfolio.py:108
msgid "GPG public key via finger" msgid "GPG public key via finger"
msgstr "" msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:108 #: ddportfolioservice/controllers/ddportfolio.py:109
msgid "GPG public key via HTTP" msgid "GPG public key via HTTP"
msgstr "" msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:111 #: ddportfolioservice/controllers/ddportfolio.py:112
msgid "Information reachable via ssh (for DDs)" msgid "Information reachable via ssh (for DDs)"
msgstr "" msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:112 #: ddportfolioservice/controllers/ddportfolio.py:113
msgid "owned debian.net domains" msgid "owned debian.net domains"
msgstr "" msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:113 #: ddportfolioservice/controllers/ddportfolio.py:114
msgid "" msgid ""
"<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database " "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database "
"information" "information"
msgstr "" msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:114 #: ddportfolioservice/controllers/ddportfolio.py:115
msgid "Group membership information" msgid "Group membership information"
msgstr "" msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:117 #: ddportfolioservice/controllers/ddportfolio.py:118
msgid "Ubuntu" msgid "Ubuntu"
msgstr "" msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:118 #: ddportfolioservice/controllers/ddportfolio.py:119
msgid "Available patches from Ubuntu" msgid "Available patches from Ubuntu"
msgstr "" msgstr ""

View file

@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: ddportfolioservice 0.2\n" "Project-Id-Version: ddportfolioservice 0.2\n"
"Report-Msgid-Bugs-To: jan@dittberner.info\n" "Report-Msgid-Bugs-To: jan@dittberner.info\n"
"POT-Creation-Date: 2009-01-20 23:13+0100\n" "POT-Creation-Date: 2009-01-20 23:13+0100\n"
"PO-Revision-Date: 2010-06-12 00:53+0200\n" "PO-Revision-Date: 2010-06-12 23:28+0200\n"
"Last-Translator: Jan Dittberner <jan@dittberner.info>\n" "Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
"Language-Team: de <de@li.org>\n" "Language-Team: de <de@li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@ -158,7 +158,7 @@ msgid "oldpeople"
msgstr "oldpeople" msgstr "oldpeople"
#: ddportfolioservice/controllers/ddportfolio.py:91 #: ddportfolioservice/controllers/ddportfolio.py:91
#: ddportfolioservice/controllers/ddportfolio.py:97 #: ddportfolioservice/controllers/ddportfolio.py:98
msgid "Alioth" msgid "Alioth"
msgstr "Alioth" msgstr "Alioth"
@ -171,54 +171,58 @@ msgid "NM"
msgstr "NM" msgstr "NM"
#: ddportfolioservice/controllers/ddportfolio.py:96 #: ddportfolioservice/controllers/ddportfolio.py:96
msgid "DB" msgid "DB information via finger"
msgstr "DB" msgstr "DB-Informationen per finger"
#: ddportfolioservice/controllers/ddportfolio.py:98 #: ddportfolioservice/controllers/ddportfolio.py:97
msgid "DB information via HTTP"
msgstr "DB-Informationen per HTTP"
#: ddportfolioservice/controllers/ddportfolio.py:99
msgid "Wiki" msgid "Wiki"
msgstr "Wiki" msgstr "Wiki"
#: ddportfolioservice/controllers/ddportfolio.py:99 #: ddportfolioservice/controllers/ddportfolio.py:100
msgid "Forum" msgid "Forum"
msgstr "Forum" msgstr "Forum"
#: ddportfolioservice/controllers/ddportfolio.py:102 #: ddportfolioservice/controllers/ddportfolio.py:103
msgid "Miscellaneous" msgid "Miscellaneous"
msgstr "Sonstiges" msgstr "Sonstiges"
#: ddportfolioservice/controllers/ddportfolio.py:103 #: ddportfolioservice/controllers/ddportfolio.py:104
msgid "debtags" msgid "debtags"
msgstr "debtags" msgstr "debtags"
#: ddportfolioservice/controllers/ddportfolio.py:104 #: ddportfolioservice/controllers/ddportfolio.py:105
msgid "links" msgid "links"
msgstr "Links" msgstr "Links"
#: ddportfolioservice/controllers/ddportfolio.py:105 #: ddportfolioservice/controllers/ddportfolio.py:106
msgid "Debian website" msgid "Debian website"
msgstr "Debian Webseite" msgstr "Debian Webseite"
#: ddportfolioservice/controllers/ddportfolio.py:106 #: ddportfolioservice/controllers/ddportfolio.py:107
msgid "Debian search" msgid "Debian search"
msgstr "Debian-Suche" msgstr "Debian-Suche"
#: ddportfolioservice/controllers/ddportfolio.py:107 #: ddportfolioservice/controllers/ddportfolio.py:108
msgid "GPG public key via finger" msgid "GPG public key via finger"
msgstr "öffentlicher GPG-Schlüssel per finger" msgstr "öffentlicher GPG-Schlüssel per finger"
#: ddportfolioservice/controllers/ddportfolio.py:108 #: ddportfolioservice/controllers/ddportfolio.py:109
msgid "GPG public key via HTTP" msgid "GPG public key via HTTP"
msgstr "öffentlicher GPG-Schlüssel per HTTP" msgstr "öffentlicher GPG-Schlüssel per HTTP"
#: ddportfolioservice/controllers/ddportfolio.py:111 #: ddportfolioservice/controllers/ddportfolio.py:112
msgid "Information reachable via ssh (for DDs)" msgid "Information reachable via ssh (for DDs)"
msgstr "Per ssh erreichbare Informationen (für DDs)" msgstr "Per ssh erreichbare Informationen (für DDs)"
#: ddportfolioservice/controllers/ddportfolio.py:112 #: ddportfolioservice/controllers/ddportfolio.py:113
msgid "owned debian.net domains" msgid "owned debian.net domains"
msgstr "Besitz von debian.net-Domains" msgstr "Besitz von debian.net-Domains"
#: ddportfolioservice/controllers/ddportfolio.py:113 #: ddportfolioservice/controllers/ddportfolio.py:114
msgid "" msgid ""
"<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database" "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database"
" information" " information"
@ -226,15 +230,15 @@ msgstr ""
"Informationen in der <a " "Informationen in der <a "
"href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>-Datenbank" "href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>-Datenbank"
#: ddportfolioservice/controllers/ddportfolio.py:114 #: ddportfolioservice/controllers/ddportfolio.py:115
msgid "Group membership information" msgid "Group membership information"
msgstr "Information über Gruppenmitgliedschaften" msgstr "Information über Gruppenmitgliedschaften"
#: ddportfolioservice/controllers/ddportfolio.py:117 #: ddportfolioservice/controllers/ddportfolio.py:118
msgid "Ubuntu" msgid "Ubuntu"
msgstr "Ubuntu" msgstr "Ubuntu"
#: ddportfolioservice/controllers/ddportfolio.py:118 #: ddportfolioservice/controllers/ddportfolio.py:119
msgid "Available patches from Ubuntu" msgid "Available patches from Ubuntu"
msgstr "Verfügbare Patches aus Ubuntu" msgstr "Verfügbare Patches aus Ubuntu"

View file

@ -75,8 +75,11 @@ alioth.pattern=http://alioth.debian.org/~%(aliothusername)s/
alioth.optional=true alioth.optional=true
[membership] [membership]
urls=nm,db,alioth,wiki,forum urls=nm,dbfinger,db,alioth,wiki,forum
nm.pattern=https://nm.debian.org/nmstatus.php?email=%(nonddemail)s nm.pattern=https://nm.debian.org/nmstatus.php?email=%(nonddemail)s
dbfinger.pattern=finger %(username)s@db.debian.org
dbfinger.type=finger
dbfinger.optional=true
db.pattern=http://db.debian.org/search.cgi?uid=%(username)s&amp;dosearch=Search db.pattern=http://db.debian.org/search.cgi?uid=%(username)s&amp;dosearch=Search
db.optional=true db.optional=true
alioth.pattern=http://alioth.debian.org/users/%(aliothusername)s/ alioth.pattern=http://alioth.debian.org/users/%(aliothusername)s/