Merge branch 'extraparams' into pylons0.10
authorJan Dittberner <jan@dittberner.info>
Thu, 3 Jun 2010 21:08:05 +0000 (23:08 +0200)
committerJan Dittberner <jan@dittberner.info>
Thu, 3 Jun 2010 21:08:05 +0000 (23:08 +0200)
* 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

1  2 
ddportfolioservice/controllers/ddportfolio.py
ddportfolioservice/i18n/ddportfolioservice.pot
ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.mo
ddportfolioservice/i18n/de/LC_MESSAGES/ddportfolioservice.po
ddportfolioservice/model/ddportfolio.ini

@@@ -7,9 -7,9 +7,9 @@@
  #, fuzzy
  msgid ""
  msgstr ""
 -"Project-Id-Version: ddportfolioservice 0.1\n"
 +"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 22:38+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 +162,39 @@@ msgstr "
  msgid "DB"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:100
 -#: ddportfolioservice/controllers/ddportfolio.py:93
++#: ddportfolioservice/controllers/ddportfolio.py:98
+ msgid "Wiki"
+ msgstr ""
 -#: ddportfolioservice/controllers/ddportfolio.py:94
++#: ddportfolioservice/controllers/ddportfolio.py:99
+ msgid "Forum"
+ msgstr ""
 -#: ddportfolioservice/controllers/ddportfolio.py:97
++#: ddportfolioservice/controllers/ddportfolio.py:102
  msgid "Miscellaneous"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:101
 -#: ddportfolioservice/controllers/ddportfolio.py:98
++#: ddportfolioservice/controllers/ddportfolio.py:103
  msgid "debtags"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:102
 -#: ddportfolioservice/controllers/ddportfolio.py:99
++#: ddportfolioservice/controllers/ddportfolio.py:104
  msgid "links"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:103
 -#: ddportfolioservice/controllers/ddportfolio.py:100
++#: ddportfolioservice/controllers/ddportfolio.py:105
  msgid "Debian website"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:104
 -#: ddportfolioservice/controllers/ddportfolio.py:101
++#: ddportfolioservice/controllers/ddportfolio.py:106
  msgid "Debian search"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:107
 -#: ddportfolioservice/controllers/ddportfolio.py:104
++#: ddportfolioservice/controllers/ddportfolio.py:109
  msgid "Ubuntu"
  msgstr ""
  
- #: ddportfolioservice/controllers/ddportfolio.py:108
 -#: ddportfolioservice/controllers/ddportfolio.py:105
++#: ddportfolioservice/controllers/ddportfolio.py:110
  msgid "Available patches from Ubuntu"
  msgstr ""
  
@@@ -6,10 -6,10 +6,10 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: ddportfolioservice 0.1\n"
 +"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 22:38+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 +174,39 @@@ msgstr "NM
  msgid "DB"
  msgstr "DB"
  
- #: ddportfolioservice/controllers/ddportfolio.py:100
 -#: ddportfolioservice/controllers/ddportfolio.py:93
++#: ddportfolioservice/controllers/ddportfolio.py:98
+ msgid "Wiki"
+ msgstr "Wiki"
 -#: ddportfolioservice/controllers/ddportfolio.py:94
++#: ddportfolioservice/controllers/ddportfolio.py:99
+ msgid "Forum"
+ msgstr "Forum"
 -#: ddportfolioservice/controllers/ddportfolio.py:97
++#: ddportfolioservice/controllers/ddportfolio.py:102
  msgid "Miscellaneous"
  msgstr "Sonstiges"
  
- #: ddportfolioservice/controllers/ddportfolio.py:101
 -#: ddportfolioservice/controllers/ddportfolio.py:98
++#: ddportfolioservice/controllers/ddportfolio.py:103
  msgid "debtags"
  msgstr "debtags"
  
- #: ddportfolioservice/controllers/ddportfolio.py:102
 -#: ddportfolioservice/controllers/ddportfolio.py:99
++#: ddportfolioservice/controllers/ddportfolio.py:104
  msgid "links"
  msgstr "Links"
  
- #: ddportfolioservice/controllers/ddportfolio.py:103
 -#: ddportfolioservice/controllers/ddportfolio.py:100
++#: ddportfolioservice/controllers/ddportfolio.py:105
  msgid "Debian website"
  msgstr "Debian Webseite"
  
- #: ddportfolioservice/controllers/ddportfolio.py:104
 -#: ddportfolioservice/controllers/ddportfolio.py:101
++#: ddportfolioservice/controllers/ddportfolio.py:106
  msgid "Debian search"
  msgstr "Debian-Suche"
  
- #: ddportfolioservice/controllers/ddportfolio.py:107
 -#: ddportfolioservice/controllers/ddportfolio.py:104
++#: ddportfolioservice/controllers/ddportfolio.py:109
  msgid "Ubuntu"
  msgstr "Ubuntu"
  
- #: ddportfolioservice/controllers/ddportfolio.py:108
 -#: ddportfolioservice/controllers/ddportfolio.py:105
++#: ddportfolioservice/controllers/ddportfolio.py:110
  msgid "Available patches from Ubuntu"
  msgstr "Verf├╝gbare Patches aus Ubuntu"