diff --git a/ddportfolioservice/controllers/ddportfolio.py b/ddportfolioservice/controllers/ddportfolio.py index 34663d2..b8fd306 100644 --- a/ddportfolioservice/controllers/ddportfolio.py +++ b/ddportfolioservice/controllers/ddportfolio.py @@ -88,7 +88,8 @@ developer name on all bug logs)'), 'membership' : { 'label' : N_('Membership'), 'nm' : N_('NM'), - 'db' : N_('DB'), + 'dbfinger' : N_('DB information via finger'), + 'db' : N_('DB information via HTTP'), 'alioth' : N_('Alioth'), 'wiki' : N_('Wiki'), 'forum' : N_('Forum'), diff --git a/ddportfolioservice/i18n/ddportfolioservice.pot b/ddportfolioservice/i18n/ddportfolioservice.pot index ce684ea..6caf351 100644 --- a/ddportfolioservice/i18n/ddportfolioservice.pot +++ b/ddportfolioservice/i18n/ddportfolioservice.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ddportfolioservice 0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2010-06-12 00:46+0200\n" +"POT-Creation-Date: 2010-06-12 23:22+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -146,7 +146,7 @@ msgid "oldpeople" msgstr "" #: ddportfolioservice/controllers/ddportfolio.py:86 -#: ddportfolioservice/controllers/ddportfolio.py:92 +#: ddportfolioservice/controllers/ddportfolio.py:93 msgid "Alioth" msgstr "" @@ -159,68 +159,72 @@ msgid "NM" msgstr "" #: ddportfolioservice/controllers/ddportfolio.py:91 -msgid "DB" +msgid "DB information via finger" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:93 -msgid "Wiki" +#: ddportfolioservice/controllers/ddportfolio.py:92 +msgid "DB information via HTTP" msgstr "" #: ddportfolioservice/controllers/ddportfolio.py:94 +msgid "Wiki" +msgstr "" + +#: ddportfolioservice/controllers/ddportfolio.py:95 msgid "Forum" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:97 +#: ddportfolioservice/controllers/ddportfolio.py:98 msgid "Miscellaneous" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:98 +#: ddportfolioservice/controllers/ddportfolio.py:99 msgid "debtags" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:99 +#: ddportfolioservice/controllers/ddportfolio.py:100 msgid "links" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:100 +#: ddportfolioservice/controllers/ddportfolio.py:101 msgid "Debian website" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:101 +#: ddportfolioservice/controllers/ddportfolio.py:102 msgid "Debian search" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:102 +#: ddportfolioservice/controllers/ddportfolio.py:103 msgid "GPG public key via finger" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:103 +#: ddportfolioservice/controllers/ddportfolio.py:104 msgid "GPG public key via HTTP" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:106 +#: ddportfolioservice/controllers/ddportfolio.py:107 msgid "Information reachable via ssh (for DDs)" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:107 +#: ddportfolioservice/controllers/ddportfolio.py:108 msgid "owned debian.net domains" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:108 +#: ddportfolioservice/controllers/ddportfolio.py:109 msgid "" "MIA database " "information" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:109 +#: ddportfolioservice/controllers/ddportfolio.py:110 msgid "Group membership information" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:112 +#: ddportfolioservice/controllers/ddportfolio.py:113 msgid "Ubuntu" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:113 +#: ddportfolioservice/controllers/ddportfolio.py:114 msgid "Available patches from Ubuntu" msgstr "" diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo index 48cb6e7..c898049 100644 Binary files a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo and b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo differ diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po index 9cff4e8..23198fc 100644 --- a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po +++ b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: ddportfolioservice 0.1\n" "Report-Msgid-Bugs-To: jan@dittberner.info\n" "POT-Creation-Date: 2009-01-20 23:13+0100\n" -"PO-Revision-Date: 2010-06-12 00:47+0200\n" +"PO-Revision-Date: 2010-06-12 23:23+0200\n" "Last-Translator: Jan Dittberner \n" "Language-Team: de \n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -158,7 +158,7 @@ msgid "oldpeople" msgstr "oldpeople" #: ddportfolioservice/controllers/ddportfolio.py:86 -#: ddportfolioservice/controllers/ddportfolio.py:92 +#: ddportfolioservice/controllers/ddportfolio.py:93 msgid "Alioth" msgstr "Alioth" @@ -171,54 +171,58 @@ msgid "NM" msgstr "NM" #: ddportfolioservice/controllers/ddportfolio.py:91 -msgid "DB" -msgstr "DB" +msgid "DB information via finger" +msgstr "DB-Informationen per finger" -#: ddportfolioservice/controllers/ddportfolio.py:93 +#: ddportfolioservice/controllers/ddportfolio.py:92 +msgid "DB information via HTTP" +msgstr "DB-Informationen per HTTP" + +#: ddportfolioservice/controllers/ddportfolio.py:94 msgid "Wiki" msgstr "Wiki" -#: ddportfolioservice/controllers/ddportfolio.py:94 +#: ddportfolioservice/controllers/ddportfolio.py:95 msgid "Forum" msgstr "Forum" -#: ddportfolioservice/controllers/ddportfolio.py:97 +#: ddportfolioservice/controllers/ddportfolio.py:98 msgid "Miscellaneous" msgstr "Sonstiges" -#: ddportfolioservice/controllers/ddportfolio.py:98 +#: ddportfolioservice/controllers/ddportfolio.py:99 msgid "debtags" msgstr "debtags" -#: ddportfolioservice/controllers/ddportfolio.py:99 +#: ddportfolioservice/controllers/ddportfolio.py:100 msgid "links" msgstr "Links" -#: ddportfolioservice/controllers/ddportfolio.py:100 +#: ddportfolioservice/controllers/ddportfolio.py:101 msgid "Debian website" msgstr "Debian Webseite" -#: ddportfolioservice/controllers/ddportfolio.py:101 +#: ddportfolioservice/controllers/ddportfolio.py:102 msgid "Debian search" msgstr "Debian-Suche" -#: ddportfolioservice/controllers/ddportfolio.py:102 +#: ddportfolioservice/controllers/ddportfolio.py:103 msgid "GPG public key via finger" msgstr "öffentlicher GPG-Schlüssel per finger" -#: ddportfolioservice/controllers/ddportfolio.py:103 +#: ddportfolioservice/controllers/ddportfolio.py:104 msgid "GPG public key via HTTP" msgstr "öffentlicher GPG-Schlüssel per HTTP" -#: ddportfolioservice/controllers/ddportfolio.py:106 +#: ddportfolioservice/controllers/ddportfolio.py:107 msgid "Information reachable via ssh (for DDs)" msgstr "Per ssh erreichbare Informationen (für DDs)" -#: ddportfolioservice/controllers/ddportfolio.py:107 +#: ddportfolioservice/controllers/ddportfolio.py:108 msgid "owned debian.net domains" msgstr "Besitz von debian.net-Domains" -#: ddportfolioservice/controllers/ddportfolio.py:108 +#: ddportfolioservice/controllers/ddportfolio.py:109 msgid "" "MIA database" " information" @@ -226,15 +230,15 @@ msgstr "" "Informationen in der MIA-Datenbank" -#: ddportfolioservice/controllers/ddportfolio.py:109 +#: ddportfolioservice/controllers/ddportfolio.py:110 msgid "Group membership information" msgstr "Information über Gruppenmitgliedschaften" -#: ddportfolioservice/controllers/ddportfolio.py:112 +#: ddportfolioservice/controllers/ddportfolio.py:113 msgid "Ubuntu" msgstr "Ubuntu" -#: ddportfolioservice/controllers/ddportfolio.py:113 +#: ddportfolioservice/controllers/ddportfolio.py:114 msgid "Available patches from Ubuntu" msgstr "Verfügbare Patches aus Ubuntu" diff --git a/ddportfolioservice/model/ddportfolio.ini b/ddportfolioservice/model/ddportfolio.ini index 2a053fa..723462e 100644 --- a/ddportfolioservice/model/ddportfolio.ini +++ b/ddportfolioservice/model/ddportfolio.ini @@ -75,8 +75,11 @@ alioth.pattern=http://alioth.debian.org/~%(aliothusername)s/ alioth.optional=true [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 +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&dosearch=Search db.optional=true alioth.pattern=http://alioth.debian.org/users/%(aliothusername)s/