Merge branch 'master' into pylons0.10
authorJan Dittberner <jan@dittberner.info>
Thu, 3 Jun 2010 22:35:58 +0000 (00:35 +0200)
committerJan Dittberner <jan@dittberner.info>
Thu, 3 Jun 2010 22:35:58 +0000 (00:35 +0200)
* master:
  updated translations
  add support for non-url information

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
ddportfolioservice/templates/showurls.mako

@@@ -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-06-03 23:36+0200\n"
 -"POT-Creation-Date: 2010-06-04 00:25+0200\n"
++"POT-Creation-Date: 2010-06-04 00:32+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"
@@@ -190,11 -190,29 +190,29 @@@ msgstr "
  msgid "Debian search"
  msgstr ""
  
 -#: ddportfolioservice/controllers/ddportfolio.py:104
 +#: ddportfolioservice/controllers/ddportfolio.py:109
- msgid "Ubuntu"
+ msgid "Information reachable via ssh (for DDs)"
  msgstr ""
  
 -#: ddportfolioservice/controllers/ddportfolio.py:105
 +#: ddportfolioservice/controllers/ddportfolio.py:110
+ msgid "owned debian.net domains"
+ msgstr ""
 -#: ddportfolioservice/controllers/ddportfolio.py:106
++#: ddportfolioservice/controllers/ddportfolio.py:111
+ msgid ""
+ "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database "
+ "information"
+ msgstr ""
 -#: ddportfolioservice/controllers/ddportfolio.py:107
++#: ddportfolioservice/controllers/ddportfolio.py:112
+ msgid "Group membership information"
+ msgstr ""
 -#: ddportfolioservice/controllers/ddportfolio.py:110
++#: ddportfolioservice/controllers/ddportfolio.py:115
+ msgid "Ubuntu"
+ msgstr ""
 -#: ddportfolioservice/controllers/ddportfolio.py:111
++#: ddportfolioservice/controllers/ddportfolio.py:116
  msgid "Available patches from Ubuntu"
  msgstr ""
  
@@@ -6,12 -6,12 +6,12 @@@
  #
  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-06-03 23:37+0200\n"
 -"PO-Revision-Date: 2010-06-04 00:27+0200\n"
++"PO-Revision-Date: 2010-06-04 00:34+0200\n"
  "Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
- "Language-Team: de <LL@li.org>\n"
+ "Language-Team: de <de@li.org>\n"
  "Plural-Forms: nplurals=2; plural=(n != 1)\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=utf-8\n"
@@@ -202,11 -202,30 +202,31 @@@ msgstr "Debian Webseite
  msgid "Debian search"
  msgstr "Debian-Suche"
  
 -#: ddportfolioservice/controllers/ddportfolio.py:104
 +#: ddportfolioservice/controllers/ddportfolio.py:109
+ msgid "Information reachable via ssh (for DDs)"
+ msgstr "Per ssh erreichbare Informationen (für DDs)"
 -#: ddportfolioservice/controllers/ddportfolio.py:105
++#: ddportfolioservice/controllers/ddportfolio.py:110
+ msgid "owned debian.net domains"
+ msgstr "Besitz von debian.net-Domains"
 -#: ddportfolioservice/controllers/ddportfolio.py:106
++#: ddportfolioservice/controllers/ddportfolio.py:111
+ msgid ""
+ "<a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a> database"
+ " information"
 -msgstr "Informationen in der <a href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>-Datenbank"
++msgstr ""
++"Informationen in der <a "
++"href=\"http://wiki.debian.org/qa.debian.org/MIATeam\">MIA</a>-Datenbank"
 -#: ddportfolioservice/controllers/ddportfolio.py:107
 -#| msgid "Enter your personal information"
++#: ddportfolioservice/controllers/ddportfolio.py:112
+ msgid "Group membership information"
+ msgstr "Information über Gruppenmitgliedschaften"
 -#: ddportfolioservice/controllers/ddportfolio.py:110
++#: ddportfolioservice/controllers/ddportfolio.py:115
  msgid "Ubuntu"
  msgstr "Ubuntu"
  
- #: ddportfolioservice/controllers/ddportfolio.py:110
 -#: ddportfolioservice/controllers/ddportfolio.py:111
++#: ddportfolioservice/controllers/ddportfolio.py:116
  msgid "Available patches from Ubuntu"
  msgstr "Verfügbare Patches aus Ubuntu"
  
@@@ -19,9 -19,9 +19,9 @@@
  # <http://www.gnu.org/licenses/>.
  #
  [DEFAULT]
 -keyring.dir=~/debian/keyring.debian.org/keyrings
 +keyring.dir=${HOME}/debian/keyring.debian.org/keyrings
  urlbuilder.sections=overview,bugs,build,qa,upload,lists,files,membership,
-  miscellaneous,ubuntu
+  miscellaneous,ssh,ubuntu
  
  [overview]
  urls=ddpo,alladdresses
@@@ -44,8 -44,14 +44,14 @@@ License along with this program.  If no
        </tr>
        % else:
        <tr class="url ${urlclass}">
 -        <td>${h.textile(row[4])}</td>
 +        <td>${h.literal(h.textile(row[4]))}</td>
-         <td>${h.link_to(h.truncate(row[3], length=120), row[3])}</td>
+         <td>
+           % if row[2].type == 'url':
+           ${h.link_to(h.truncate(row[3], length=120), row[3])}
+           % else:
+           <tt>${row[3]}</tt>
+           % endif
+         </td>
        </tr>
        <%
           if urlclass == 'odd':