diff --git a/ddportfolioservice/controllers/ddportfolio.py b/ddportfolioservice/controllers/ddportfolio.py index 7464345..ef30451 100644 --- a/ddportfolioservice/controllers/ddportfolio.py +++ b/ddportfolioservice/controllers/ddportfolio.py @@ -51,7 +51,6 @@ class DdportfolioController(BaseController): #430986)'''), 'reported': N_('bugs reported'), - 'bugstats': N_('bugstats AKA karma'), 'usertags': N_('user tags'), 'searchall': N_('all messages (i.e., full text search for \ developer name on all bug logs)'), @@ -69,7 +68,6 @@ developer name on all bug logs)'), 'lintian': N_('lintian reports'), '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'), }, @@ -107,6 +105,7 @@ developer name on all bug logs)'), 'search': N_('Debian search'), 'gpgfinger': N_('GPG public key via finger'), 'gpgweb': N_('GPG public key via HTTP'), + 'nm': N_('NM, AM participation'), }, 'ssh': { 'label': N_('Information reachable via ssh (for Debian Members)'), diff --git a/ddportfolioservice/i18n/ddportfolioservice.pot b/ddportfolioservice/i18n/ddportfolioservice.pot index 444c494..ff0cf77 100644 --- a/ddportfolioservice/i18n/ddportfolioservice.pot +++ b/ddportfolioservice/i18n/ddportfolioservice.pot @@ -7,9 +7,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ddportfolioservice 0.2.1\n" +"Project-Id-Version: ddportfolioservice 0.2.5\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-01-07 01:16+0100\n" +"POT-Creation-Date: 2012-03-24 22:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,37 +18,33 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.5\n" -#: ddportfolioservice/controllers/ddportfolio.py:41 +#: ddportfolioservice/controllers/ddportfolio.py:42 msgid "Overview" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:42 +#: ddportfolioservice/controllers/ddportfolio.py:43 msgid "Debian Member's Package Overview" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:43 +#: ddportfolioservice/controllers/ddportfolio.py:44 msgid "" "Debian Member's Package Overview\n" "... showing all email addresses" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:47 +#: ddportfolioservice/controllers/ddportfolio.py:48 msgid "Bugs" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:48 +#: ddportfolioservice/controllers/ddportfolio.py:49 msgid "" "bugs received\n" "(note: co-maintainers not listed, see #430986)" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:52 -msgid "bugs reported" -msgstr "" - #: ddportfolioservice/controllers/ddportfolio.py:53 -msgid "bugstats AKA karma" +msgid "bugs reported" msgstr "" #: ddportfolioservice/controllers/ddportfolio.py:54 @@ -96,112 +92,112 @@ msgid "full lintian reports (i.e. including \"info\"-level messages)" msgstr "" #: ddportfolioservice/controllers/ddportfolio.py:71 -msgid "DEHS (Debian External Health Status)" -msgstr "" - -#: ddportfolioservice/controllers/ddportfolio.py:72 msgid "piuparts" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:73 +#: ddportfolioservice/controllers/ddportfolio.py:72 msgid "Debian patch tracking system" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:76 +#: ddportfolioservice/controllers/ddportfolio.py:75 msgid "Upload" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:77 +#: ddportfolioservice/controllers/ddportfolio.py:76 msgid "" "keylog (per-key upload list)\n" "(note: uses key fingerprint)" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:81 +#: ddportfolioservice/controllers/ddportfolio.py:80 msgid "Mailing Lists" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:82 +#: ddportfolioservice/controllers/ddportfolio.py:81 msgid "lists.d.o" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:83 +#: ddportfolioservice/controllers/ddportfolio.py:82 msgid "lists.a.d.o" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:84 +#: ddportfolioservice/controllers/ddportfolio.py:83 msgid "gmane" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:87 +#: ddportfolioservice/controllers/ddportfolio.py:86 msgid "Files" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:88 +#: ddportfolioservice/controllers/ddportfolio.py:87 msgid "people.d.o" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:89 +#: ddportfolioservice/controllers/ddportfolio.py:88 msgid "oldpeople" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:90 -#: ddportfolioservice/controllers/ddportfolio.py:97 +#: ddportfolioservice/controllers/ddportfolio.py:89 +#: ddportfolioservice/controllers/ddportfolio.py:96 msgid "Alioth" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:93 +#: ddportfolioservice/controllers/ddportfolio.py:92 msgid "Membership" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:94 +#: ddportfolioservice/controllers/ddportfolio.py:93 msgid "NM" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:95 +#: ddportfolioservice/controllers/ddportfolio.py:94 msgid "DB information via finger" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:96 +#: ddportfolioservice/controllers/ddportfolio.py:95 msgid "DB information via HTTP" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:98 +#: ddportfolioservice/controllers/ddportfolio.py:97 msgid "Wiki" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:99 +#: ddportfolioservice/controllers/ddportfolio.py:98 msgid "Forum" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:102 +#: ddportfolioservice/controllers/ddportfolio.py:101 msgid "Miscellaneous" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:103 +#: ddportfolioservice/controllers/ddportfolio.py:102 msgid "debtags" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:104 +#: ddportfolioservice/controllers/ddportfolio.py:103 msgid "links" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:105 +#: ddportfolioservice/controllers/ddportfolio.py:104 msgid "Debian website" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:106 +#: ddportfolioservice/controllers/ddportfolio.py:105 msgid "Debian search" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:107 +#: ddportfolioservice/controllers/ddportfolio.py:106 msgid "GPG public key via finger" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:108 +#: ddportfolioservice/controllers/ddportfolio.py:107 msgid "GPG public key via HTTP" msgstr "" +#: ddportfolioservice/controllers/ddportfolio.py:108 +msgid "NM, AM participation" +msgstr "" + #: ddportfolioservice/controllers/ddportfolio.py:111 msgid "Information reachable via ssh (for Debian Members)" msgstr "" @@ -216,15 +212,15 @@ msgid "" "information" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:114 +#: ddportfolioservice/controllers/ddportfolio.py:115 msgid "Group membership information" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:117 +#: ddportfolioservice/controllers/ddportfolio.py:118 msgid "Ubuntu" msgstr "" -#: ddportfolioservice/controllers/ddportfolio.py:118 +#: ddportfolioservice/controllers/ddportfolio.py:119 msgid "Available patches from Ubuntu" msgstr "" @@ -252,8 +248,8 @@ msgstr "" msgid "Alioth user name" msgstr "" -#: ddportfolioservice/model/urlbuilder.py:96 -#: ddportfolioservice/model/urlbuilder.py:100 +#: ddportfolioservice/model/urlbuilder.py:97 +#: ddportfolioservice/model/urlbuilder.py:101 #, python-format msgid "Missing input: %s" msgstr "" diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo index 0b90791..b7b03e0 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 f65b904..bed6158 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.2.1\n" "Report-Msgid-Bugs-To: jan@dittberner.info\n" "POT-Creation-Date: 2009-01-20 23:13+0100\n" -"PO-Revision-Date: 2012-01-07 16:37+0100\n" +"PO-Revision-Date: 2012-03-24 22:07+0100\n" "Last-Translator: Jan Dittberner \n" "Language-Team: de \n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -18,15 +18,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.5\n" -#: ddportfolioservice/controllers/ddportfolio.py:41 +#: ddportfolioservice/controllers/ddportfolio.py:42 msgid "Overview" msgstr "Überblick" -#: ddportfolioservice/controllers/ddportfolio.py:42 +#: ddportfolioservice/controllers/ddportfolio.py:43 msgid "Debian Member's Package Overview" msgstr "Paketübersicht des Debian-Mitglieds" -#: ddportfolioservice/controllers/ddportfolio.py:43 +#: ddportfolioservice/controllers/ddportfolio.py:44 msgid "" "Debian Member's Package Overview\n" "... showing all email addresses" @@ -34,11 +34,11 @@ msgstr "" "Paketübersicht des Debian-Mitglieds\n" "... mit allen E-Mailadressen" -#: ddportfolioservice/controllers/ddportfolio.py:47 +#: ddportfolioservice/controllers/ddportfolio.py:48 msgid "Bugs" msgstr "Fehler" -#: ddportfolioservice/controllers/ddportfolio.py:48 +#: ddportfolioservice/controllers/ddportfolio.py:49 msgid "" "bugs received\n" "(note: co-maintainers not listed, see #430986)" -#: ddportfolioservice/controllers/ddportfolio.py:52 +#: ddportfolioservice/controllers/ddportfolio.py:53 msgid "bugs reported" msgstr "Berichtete Fehler" -#: ddportfolioservice/controllers/ddportfolio.py:53 -msgid "bugstats AKA karma" -msgstr "Fehlerstatistiken auch bekannt als Karma" - #: ddportfolioservice/controllers/ddportfolio.py:54 msgid "user tags" msgstr "User Tags" @@ -106,22 +102,18 @@ msgstr "" "\"info\")" #: ddportfolioservice/controllers/ddportfolio.py:71 -msgid "DEHS (Debian External Health Status)" -msgstr "DEHS (Debian External Health Status)" - -#: ddportfolioservice/controllers/ddportfolio.py:72 msgid "piuparts" msgstr "piuparts" -#: ddportfolioservice/controllers/ddportfolio.py:73 +#: ddportfolioservice/controllers/ddportfolio.py:72 msgid "Debian patch tracking system" msgstr "Debian Nachverfolgungssystem für Patches" -#: ddportfolioservice/controllers/ddportfolio.py:76 +#: ddportfolioservice/controllers/ddportfolio.py:75 msgid "Upload" msgstr "Upload" -#: ddportfolioservice/controllers/ddportfolio.py:77 +#: ddportfolioservice/controllers/ddportfolio.py:76 msgid "" "keylog (per-key upload list)\n" "(note: uses key fingerprint)" @@ -129,91 +121,95 @@ msgstr "" "Keylog\n" "(Anmerkung: verwendet den Fingerabdruck des Schlüssels)" -#: ddportfolioservice/controllers/ddportfolio.py:81 +#: ddportfolioservice/controllers/ddportfolio.py:80 msgid "Mailing Lists" msgstr "Mailinglisten" -#: ddportfolioservice/controllers/ddportfolio.py:82 +#: ddportfolioservice/controllers/ddportfolio.py:81 msgid "lists.d.o" msgstr "lists.d.o" -#: ddportfolioservice/controllers/ddportfolio.py:83 +#: ddportfolioservice/controllers/ddportfolio.py:82 msgid "lists.a.d.o" msgstr "lists.a.d.o" -#: ddportfolioservice/controllers/ddportfolio.py:84 +#: ddportfolioservice/controllers/ddportfolio.py:83 msgid "gmane" msgstr "Gmane" -#: ddportfolioservice/controllers/ddportfolio.py:87 +#: ddportfolioservice/controllers/ddportfolio.py:86 msgid "Files" msgstr "Dateien" -#: ddportfolioservice/controllers/ddportfolio.py:88 +#: ddportfolioservice/controllers/ddportfolio.py:87 msgid "people.d.o" msgstr "people.d.o" -#: ddportfolioservice/controllers/ddportfolio.py:89 +#: ddportfolioservice/controllers/ddportfolio.py:88 msgid "oldpeople" msgstr "oldpeople" -#: ddportfolioservice/controllers/ddportfolio.py:90 -#: ddportfolioservice/controllers/ddportfolio.py:97 +#: ddportfolioservice/controllers/ddportfolio.py:89 +#: ddportfolioservice/controllers/ddportfolio.py:96 msgid "Alioth" msgstr "Alioth" -#: ddportfolioservice/controllers/ddportfolio.py:93 +#: ddportfolioservice/controllers/ddportfolio.py:92 msgid "Membership" msgstr "Mitgliedschaft" -#: ddportfolioservice/controllers/ddportfolio.py:94 +#: ddportfolioservice/controllers/ddportfolio.py:93 msgid "NM" msgstr "NM" -#: ddportfolioservice/controllers/ddportfolio.py:95 +#: ddportfolioservice/controllers/ddportfolio.py:94 msgid "DB information via finger" msgstr "DB-Informationen per finger" -#: ddportfolioservice/controllers/ddportfolio.py:96 +#: ddportfolioservice/controllers/ddportfolio.py:95 msgid "DB information via HTTP" msgstr "DB-Informationen per HTTP" -#: ddportfolioservice/controllers/ddportfolio.py:98 +#: ddportfolioservice/controllers/ddportfolio.py:97 msgid "Wiki" msgstr "Wiki" -#: ddportfolioservice/controllers/ddportfolio.py:99 +#: ddportfolioservice/controllers/ddportfolio.py:98 msgid "Forum" msgstr "Forum" -#: ddportfolioservice/controllers/ddportfolio.py:102 +#: ddportfolioservice/controllers/ddportfolio.py:101 msgid "Miscellaneous" msgstr "Sonstiges" -#: ddportfolioservice/controllers/ddportfolio.py:103 +#: ddportfolioservice/controllers/ddportfolio.py:102 msgid "debtags" msgstr "debtags" -#: ddportfolioservice/controllers/ddportfolio.py:104 +#: ddportfolioservice/controllers/ddportfolio.py:103 msgid "links" msgstr "Links" -#: ddportfolioservice/controllers/ddportfolio.py:105 +#: ddportfolioservice/controllers/ddportfolio.py:104 msgid "Debian website" msgstr "Debian Webseite" -#: ddportfolioservice/controllers/ddportfolio.py:106 +#: ddportfolioservice/controllers/ddportfolio.py:105 msgid "Debian search" msgstr "Debian-Suche" -#: ddportfolioservice/controllers/ddportfolio.py:107 +#: ddportfolioservice/controllers/ddportfolio.py:106 msgid "GPG public key via finger" msgstr "öffentlicher GPG-Schlüssel per finger" -#: ddportfolioservice/controllers/ddportfolio.py:108 +#: ddportfolioservice/controllers/ddportfolio.py:107 msgid "GPG public key via HTTP" msgstr "öffentlicher GPG-Schlüssel per HTTP" +#: ddportfolioservice/controllers/ddportfolio.py:108 +msgid "NM, AM participation" +msgstr "NM-, AM-Teilnahme" + #: ddportfolioservice/controllers/ddportfolio.py:111 msgid "Information reachable via ssh (for Debian Members)" msgstr "Per ssh erreichbare Informationen (für Debian Mitglieder)" @@ -230,15 +226,15 @@ msgstr "" "Informationen in der MIA-Datenbank" -#: ddportfolioservice/controllers/ddportfolio.py:114 +#: ddportfolioservice/controllers/ddportfolio.py:115 msgid "Group membership information" msgstr "Information über Gruppenmitgliedschaften" -#: ddportfolioservice/controllers/ddportfolio.py:117 +#: ddportfolioservice/controllers/ddportfolio.py:118 msgid "Ubuntu" msgstr "Ubuntu" -#: ddportfolioservice/controllers/ddportfolio.py:118 +#: ddportfolioservice/controllers/ddportfolio.py:119 msgid "Available patches from Ubuntu" msgstr "Verfügbare Patches aus Ubuntu" @@ -266,8 +262,8 @@ msgstr "Nicht-Debian-E-Mailadresse" msgid "Alioth user name" msgstr "Alioth-Benutzername" -#: ddportfolioservice/model/urlbuilder.py:96 -#: ddportfolioservice/model/urlbuilder.py:100 +#: ddportfolioservice/model/urlbuilder.py:97 +#: ddportfolioservice/model/urlbuilder.py:101 #, python-format msgid "Missing input: %s" msgstr "Fehlende Eingabe: %s" diff --git a/ddportfolioservice/model/ddportfolio.ini b/ddportfolioservice/model/ddportfolio.ini index f8f007c..2811abd 100644 --- a/ddportfolioservice/model/ddportfolio.ini +++ b/ddportfolioservice/model/ddportfolio.ini @@ -1,6 +1,6 @@ # # Configuration for DDPortfolio service -# Copyright © 2009, 2010, 2011 Jan Dittberner +# Copyright © 2009, 2010, 2011, 2012 Jan Dittberner # # This file is part of DDPortfolio service. # @@ -29,10 +29,9 @@ ddpo.pattern=http://qa.debian.org/developer.php?login=%(email)s alladdresses.pattern=http://qa.debian.org/developer.php?login=%(name)s [bugs] -urls=received,reported,bugstats,usertags,searchall,wnpp,correspondent,graph +urls=received,reported,usertags,searchall,wnpp,correspondent,graph received.pattern=http://bugs.debian.org/%(email)s reported.pattern=http://bugs.debian.org/from:%(email)s -bugstats.pattern=http://asdfasdf.debian.net/~tar/bugstats/?%(email)s usertags.pattern=http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=%(email)s searchall.pattern=http://merkel.debian.org/~don/cgi/search.cgi?phrase=%(name)s;search=search wnpp.pattern=http://qa.debian.org/developer.php?wnpp=%(email)s @@ -44,10 +43,9 @@ urls=buildd buildd.pattern=https://buildd.debian.org/status/package.php?p=%(email)s&compact=compact&comaint=yes [qa] -urls=lintian,lintianfull,dehs,piuparts,patchtracker +urls=lintian,lintianfull,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 @@ -76,7 +74,7 @@ alioth.optional=true [membership] urls=nm,dbfinger,db,alioth,wiki,forum -nm.pattern=https://nm.debian.org/public/nmstatus/%(nonddemail)s +nm.pattern=https://nm.debian.org/public/nmstatus/%(username)s dbfinger.pattern=finger %(username)s@db.debian.org dbfinger.type=finger dbfinger.optional=true @@ -99,6 +97,7 @@ gpgfinger.type=finger gpgfinger.optional=true gpgweb.pattern=http://db.debian.org/fetchkey.cgi?fingerprint=%(gpgfp)s gpgweb.optional=true +nm.pattern=https://nm.debian.org/public/person/%(username)s [ssh] # SSH functions diff --git a/setup.py b/setup.py index 95dcedb..0fc4f46 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ except ImportError: setup( name='ddportfolioservice', - version='0.2.5', + version='0.2.6', description='service to create DDPortfolio URLs', long_description="""This is a service implementation that returns a set of personalized URLs as outlined in