diff --git a/ddportfolioservice/i18n/ddportfolioservice.pot b/ddportfolioservice/i18n/ddportfolioservice.pot index 266e9ef..90ec0d2 100644 --- a/ddportfolioservice/i18n/ddportfolioservice.pot +++ b/ddportfolioservice/i18n/ddportfolioservice.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ddportfolioservice 0.2\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2010-06-04 00:32+0200\n" +"POT-Creation-Date: 2010-06-12 00:22+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -240,8 +240,8 @@ msgstr "" msgid "Alioth user name" msgstr "" -#: ddportfolioservice/model/urlbuilder.py:95 -#: ddportfolioservice/model/urlbuilder.py:99 +#: ddportfolioservice/model/urlbuilder.py:96 +#: ddportfolioservice/model/urlbuilder.py:100 #, python-format msgid "Missing input: %s" msgstr "" @@ -263,11 +263,11 @@ msgid "" "Developer's or package maintainer's information regarding Debian." msgstr "" -#: ddportfolioservice/templates/base.mako:41 +#: ddportfolioservice/templates/base.mako:46 msgid "AGPL - Free Software" msgstr "" -#: ddportfolioservice/templates/base.mako:43 +#: ddportfolioservice/templates/base.mako:48 #, python-format msgid "" "The service is available under the terms of the git." msgstr "" -#: ddportfolioservice/templates/base.mako:44 +#: ddportfolioservice/templates/base.mako:49 msgid "Copyright © 2009, 2010 Jan Dittberner" msgstr "" @@ -295,39 +295,51 @@ msgstr "" msgid "Email address:" msgstr "" -#: ddportfolioservice/templates/showform.mako:50 +#: ddportfolioservice/templates/showform.mako:47 +msgid "Show all form fields" +msgstr "" + +#: ddportfolioservice/templates/showform.mako:54 msgid "Name:" msgstr "" -#: ddportfolioservice/templates/showform.mako:60 +#: ddportfolioservice/templates/showform.mako:64 msgid "GPG fingerprint:" msgstr "" -#: ddportfolioservice/templates/showform.mako:75 +#: ddportfolioservice/templates/showform.mako:79 msgid "Debian user name:" msgstr "" -#: ddportfolioservice/templates/showform.mako:90 +#: ddportfolioservice/templates/showform.mako:94 msgid "Non DD email address:" msgstr "" -#: ddportfolioservice/templates/showform.mako:105 +#: ddportfolioservice/templates/showform.mako:109 msgid "Alioth user name:" msgstr "" -#: ddportfolioservice/templates/showform.mako:117 +#: ddportfolioservice/templates/showform.mako:125 +msgid "Wiki user name:" +msgstr "" + +#: ddportfolioservice/templates/showform.mako:140 +msgid "Forum user id:" +msgstr "" + +#: ddportfolioservice/templates/showform.mako:151 msgid "Output format:" msgstr "" -#: ddportfolioservice/templates/showform.mako:123 +#: ddportfolioservice/templates/showform.mako:157 msgid "HTML" msgstr "" -#: ddportfolioservice/templates/showform.mako:125 +#: ddportfolioservice/templates/showform.mako:159 msgid "JSON" msgstr "" -#: ddportfolioservice/templates/showform.mako:127 +#: ddportfolioservice/templates/showform.mako:161 msgid "Build DD Portfolio URLs" msgstr "" diff --git a/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo b/ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo index fb03045..aefd201 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 650ab1d..ab032e8 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\n" "Report-Msgid-Bugs-To: jan@dittberner.info\n" "POT-Creation-Date: 2009-01-20 23:13+0100\n" -"PO-Revision-Date: 2010-06-04 00:34+0200\n" +"PO-Revision-Date: 2010-06-12 00:23+0200\n" "Last-Translator: Jan Dittberner \n" "Language-Team: de \n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -254,8 +254,8 @@ msgstr "Nicht-DD E-Mailadresse:" msgid "Alioth user name" msgstr "Alioth-Benutzername" -#: ddportfolioservice/model/urlbuilder.py:95 -#: ddportfolioservice/model/urlbuilder.py:99 +#: ddportfolioservice/model/urlbuilder.py:96 +#: ddportfolioservice/model/urlbuilder.py:100 #, python-format msgid "Missing input: %s" msgstr "Fehlende Eingabe: %s" @@ -282,11 +282,11 @@ msgstr "" "Informationen im Bezug auf Debian für Debian-Entwickler und Paketbetreuer" " erzeugt werden." -#: ddportfolioservice/templates/base.mako:41 +#: ddportfolioservice/templates/base.mako:46 msgid "AGPL - Free Software" msgstr "AGPL - Freie Software" -#: ddportfolioservice/templates/base.mako:43 +#: ddportfolioservice/templates/base.mako:48 #, python-format msgid "" "The service is available under the terms of the git den Quelltext " "herunterladen." -#: ddportfolioservice/templates/base.mako:44 +#: ddportfolioservice/templates/base.mako:49 msgid "Copyright © 2009, 2010 Jan Dittberner" msgstr "Copyright © 2009, 2010 Jan Dittberner" @@ -321,39 +321,51 @@ msgstr "Debian-Entwicklerportfolio" msgid "Email address:" msgstr "E-Mailadresse:" -#: ddportfolioservice/templates/showform.mako:50 +#: ddportfolioservice/templates/showform.mako:47 +msgid "Show all form fields" +msgstr "Alle Formularfelder anzeigen" + +#: ddportfolioservice/templates/showform.mako:54 msgid "Name:" msgstr "Name:" -#: ddportfolioservice/templates/showform.mako:60 +#: ddportfolioservice/templates/showform.mako:64 msgid "GPG fingerprint:" msgstr "GPG-Fingerabdruck:" -#: ddportfolioservice/templates/showform.mako:75 +#: ddportfolioservice/templates/showform.mako:79 msgid "Debian user name:" msgstr "Debian-Benutzername:" -#: ddportfolioservice/templates/showform.mako:90 +#: ddportfolioservice/templates/showform.mako:94 msgid "Non DD email address:" msgstr "Nicht-DD-E-Mailadresse" -#: ddportfolioservice/templates/showform.mako:105 +#: ddportfolioservice/templates/showform.mako:109 msgid "Alioth user name:" msgstr "Alioth-Benutzername:" -#: ddportfolioservice/templates/showform.mako:117 +#: ddportfolioservice/templates/showform.mako:125 +msgid "Wiki user name:" +msgstr "Wiki-Benutzername:" + +#: ddportfolioservice/templates/showform.mako:140 +msgid "Forum user id:" +msgstr "Forumsbenutzernummer:" + +#: ddportfolioservice/templates/showform.mako:151 msgid "Output format:" msgstr "Ausgabeformat:" -#: ddportfolioservice/templates/showform.mako:123 +#: ddportfolioservice/templates/showform.mako:157 msgid "HTML" msgstr "HTML" -#: ddportfolioservice/templates/showform.mako:125 +#: ddportfolioservice/templates/showform.mako:159 msgid "JSON" msgstr "JSON" -#: ddportfolioservice/templates/showform.mako:127 +#: ddportfolioservice/templates/showform.mako:161 msgid "Build DD Portfolio URLs" msgstr "Debian-Entwicklerportfolio-URLs bauen" diff --git a/ddportfolioservice/model/dddatabuilder.py b/ddportfolioservice/model/dddatabuilder.py index 4128a5f..8d26d5a 100644 --- a/ddportfolioservice/model/dddatabuilder.py +++ b/ddportfolioservice/model/dddatabuilder.py @@ -22,12 +22,15 @@ # """This file contains code to build a representation of a person based on keyring data associated to a given email address.""" +import logging from ddportfolioservice.model import keyfinder TYPE_NO = 0 TYPE_DM = 1 TYPE_DD = 2 +log = logging.getLogger(__name__) + def build_data(email_address): """Build a DD data structure from a given email address.""" @@ -43,4 +46,9 @@ def build_data(email_address): fields['type'] = TYPE_DM else: fields['type'] = TYPE_NO + if fields['name']: + log.debug('generate wikihomepage from name') + fields['wikihomepage'] = "".join( + [part.capitalize() for part in fields['name'].split()]) + return fields diff --git a/ddportfolioservice/templates/showform.mako b/ddportfolioservice/templates/showform.mako index 2e4ec7e..5ce2931 100644 --- a/ddportfolioservice/templates/showform.mako +++ b/ddportfolioservice/templates/showform.mako @@ -42,6 +42,10 @@ ${h.form(h.url(action='urllist', controller='ddportfolio'), method='get')} ${h.text('email', h.escape(request.params.get('email', None), True), id='email')}
+
-