Merge branch 'master' into ubuntu-master

[deb/packages.git] / templates / html / show.tmpl

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index 0bc5fa2acd03742d8d91c87ce77b8d871aa58cf9..c72596432b1fc6437763f078f64f8e4a0a6399bc 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -63,7 +63,7 @@
 [% UNLESS is_virtual %]
 <div id="pmoreinfo">
 <h2>[% g('Links for %s', pkg) %]</h2>
-<h3>[% g('Debian Resources:') %]</h3>
+<h3>[% g('%s Resources:', organisation) %]</h3>
 <ul>
 <li><a href="[% launchpad_url _ (is_source ? pkg : src.pkg) _ '/+bugs' %]">[% g('Bug Reports') %]</a></li>
 
@@ -109,6 +109,8 @@
        mailarchiveurl = 'http://lists.debian.org/' _ matches.0 _ '/';
   ELSIF (matches = mail.match('^(.*)@lists\.alioth\.debian\.org$'));
        mailarchiveurl = 'http://lists.alioth.debian.org/pipermail/' _ matches.0 _ '/';
+  ELSIF (matches = mail.match('^(.*)@lists\.ubuntu\.com$'));
+       mailarchiveurl = 'http://lists.ubuntu.com/archives/' _ matches.0 _ '/';
   END -%]
   [%- '<ul>' IF loop.first -%]
        <li><a href="mailto:[% mail %]">[% name | html %]</a>