Merge branch 'extraparams' into pylons0.10

* extraparams:
  generate wikihomepage from name if parameter is missing
  add translations for new pattern labels
  add support for optional patterns
  support non unicode fields
  add new patterns for wiki and forum
  improve handling of missing fields
  accept extra fields forumsid and wikihomepage
  use the fixed set of dependency versions from Lenny
This commit is contained in:
Jan Dittberner 2010-06-03 23:08:05 +02:00
commit 74ed088cf9
7 changed files with 75 additions and 32 deletions

View file

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ddportfolioservice 0.2\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2010-05-10 21:26+0200\n"
"POT-Creation-Date: 2010-06-03 23:03+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"
@ -162,31 +162,39 @@ msgstr ""
msgid "DB"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:100
msgid "Miscellaneous"
#: ddportfolioservice/controllers/ddportfolio.py:98
msgid "Wiki"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:101
msgid "debtags"
#: ddportfolioservice/controllers/ddportfolio.py:99
msgid "Forum"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:102
msgid "links"
msgid "Miscellaneous"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:103
msgid "Debian website"
msgid "debtags"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:104
msgid "links"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:105
msgid "Debian website"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:106
msgid "Debian search"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:107
#: ddportfolioservice/controllers/ddportfolio.py:109
msgid "Ubuntu"
msgstr ""
#: ddportfolioservice/controllers/ddportfolio.py:108
#: ddportfolioservice/controllers/ddportfolio.py:110
msgid "Available patches from Ubuntu"
msgstr ""
@ -214,7 +222,8 @@ msgstr ""
msgid "Alioth user name"
msgstr ""
#: ddportfolioservice/model/urlbuilder.py:74
#: ddportfolioservice/model/urlbuilder.py:86
#: ddportfolioservice/model/urlbuilder.py:90
#, python-format
msgid "Missing input: %s"
msgstr ""

View file

@ -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-05-10 21:30+0200\n"
"PO-Revision-Date: 2010-06-03 23:06+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"
@ -174,31 +174,39 @@ msgstr "NM"
msgid "DB"
msgstr "DB"
#: ddportfolioservice/controllers/ddportfolio.py:100
#: ddportfolioservice/controllers/ddportfolio.py:98
msgid "Wiki"
msgstr "Wiki"
#: ddportfolioservice/controllers/ddportfolio.py:99
msgid "Forum"
msgstr "Forum"
#: ddportfolioservice/controllers/ddportfolio.py:102
msgid "Miscellaneous"
msgstr "Sonstiges"
#: ddportfolioservice/controllers/ddportfolio.py:101
#: ddportfolioservice/controllers/ddportfolio.py:103
msgid "debtags"
msgstr "debtags"
#: ddportfolioservice/controllers/ddportfolio.py:102
#: ddportfolioservice/controllers/ddportfolio.py:104
msgid "links"
msgstr "Links"
#: ddportfolioservice/controllers/ddportfolio.py:103
#: ddportfolioservice/controllers/ddportfolio.py:105
msgid "Debian website"
msgstr "Debian Webseite"
#: ddportfolioservice/controllers/ddportfolio.py:104
#: ddportfolioservice/controllers/ddportfolio.py:106
msgid "Debian search"
msgstr "Debian-Suche"
#: ddportfolioservice/controllers/ddportfolio.py:107
#: ddportfolioservice/controllers/ddportfolio.py:109
msgid "Ubuntu"
msgstr "Ubuntu"
#: ddportfolioservice/controllers/ddportfolio.py:108
#: ddportfolioservice/controllers/ddportfolio.py:110
msgid "Available patches from Ubuntu"
msgstr "Verfügbare Patches aus Ubuntu"
@ -226,7 +234,8 @@ msgstr "Nicht-DD E-Mailadresse:"
msgid "Alioth user name"
msgstr "Alioth-Benutzername"
#: ddportfolioservice/model/urlbuilder.py:74
#: ddportfolioservice/model/urlbuilder.py:86
#: ddportfolioservice/model/urlbuilder.py:90
#, python-format
msgid "Missing input: %s"
msgstr "Fehlende Eingabe: %s"