Merge lp:~danilo/launchpad/bug-423836-a into lp:~danilo/launchpad/bug-427264

[Данило Шеган]

[Данило Шеган (danilo)]

= Bug 423836: distroserieslanguage page =

(WARNING: Look at the attached diff in MP, not the full diff)

This branch migrates distroserieslanguage page to 3.0 layout. It's
split up from productserieslanguage migration (which reuses the same
template), so lint still has one error which will be fixed by a followup
branch.

It also introduces some global bits like a TranslationsLanguage
breadcrumb, which will be reused in the followup branch (i.e. it's
"global" instead of specific to DSL for a reason).

I also add missing tests for translation group breadcrumbs, which I
introduced earlier.

= Tests =

 bin/test -vvt 'translations.*breadcrumbs' -t stories.translations

(stories/translations/43-distrorelease-translations is the relevant page
test)

= Demo & QA =

 https://translations.launchpad.dev/ubuntu/hoary/+lang/es

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/canonical/launchpad/pagetitles.py
  lib/canonical/launchpad/icing/style-3-0.css
  lib/lp/translations/configure.zcml
  lib/lp/translations/browser/configure.zcml
  lib/lp/translations/browser/distroserieslanguage.py
  lib/lp/translations/browser/translations.py
  lib/lp/translations/browser/tests/test_breadcrumbs.py
  lib/lp/translations/doc/canonical_url_examples.txt
  lib/lp/translations/model/distroserieslanguage.py
  lib/lp/translations/stories/standalone/xx-test-potlists.txt

lib/lp/translations/stories/translations/43-distrorelease-translations.txt
  lib/lp/translations/templates/serieslanguage-index.pt

== Pyflakes notices ==

lib/lp/translations/browser/tests/test_breadcrumbs.py
    16: 'IProductSeriesLanguageSet' imported but unused

== Pylint notices ==

lib/lp/translations/browser/tests/test_breadcrumbs.py
    16: [W0611] Unused import IProductSeriesLanguageSet

[Michael Nelson (michael.nelson)]

Wow - a huge amount of work has gone into this Danilo!

I've mainly got a few questions below, but there was one thing that needs fixing - a CSS rule that I think you meant to apply just to your table, but applies globally to all th's.

Phew! I'm glad you managed to split them up now - I don't think I could sensibly do another review today :)

Cheers,
-Michael

> === modified file 'lib/canonical/launchpad/icing/style-3-0.css'
> --- lib/canonical/launchpad/icing/style-3-0.css 2009-09-05 03:17:24 +0000
> +++ lib/canonical/launchpad/icing/style-3-0.css 2009-09-09 18:52:48 +0000
> @@ -748,6 +748,38 @@
> padding: 2px 1em 2px 2px;
> }
>
> +/* Translations statistics and legend.
> + *
> + * Examples:
> + * https://translations.launchpad.dev/ubuntu/hoary/+lang/es
> + * https://translations.launchpad.dev/evolution/trunk/+lang/es
> + */

Great to see examples in there as recommended the other week!

> +
> +div.translations-legend {
> + padding-top: 2em;
> + padding-bottom: 1em;
> +}

Note: although we didn't get to it in the reviewers meeting on 09/09/09,
I saw that barry had an agenda item:

* 4-space indents for CSS styles [barry]

Also, if that table can get large, and you want to do easy
alternate-row-shading, I just found the other day that you can do things like:

tbody.translation-stats tr:nth-child(odd) {...}

which works in FF3.5, webkit/chromium etc., without having to add markup.
See http://dev.opera.com/articles/view/zebra-striping-tables-with-css3/
if you're interested.

This CSS could possibly be much simpler if you put
the 'translation-stats' class on the table element (instead of on the
tbody). Then you could remove the overall-translation-stats class and do:

> +tbody.translation-stats td {

table.translation-stats td {...

(that way you don't need a separate rule for the tfoot below.)

> + text-align:center;
> +}
> +tbody.translation-stats td.template-name {

table.translation-stats td.template-name {...

(no difference there).

> + text-align:left;
> +}
> +tfoot tr.overall-translation-stats td, th {

Yikes - careful there. This actually reads currently as:

"Apply the following styles to any td's inside a tr...etc., or *any* th."

So, for example, you can see this is being applied to th's at:

https://launchpad.dev/builders

Anyway, if you updated the class as suggested above, you could write it
as:
table.translation-stats tfoot td, table.translation-stats tfoot th {...

> + background-color: #f7f7f7;
> + border: 0px;
> + border-top: 2px solid #d2d2d2;
> + border-bottom: 2px solid #d2d2d2;
> + padding-top: 5px;
> + padding-bottom: 5px;
> + font-weight: bold;
> +}
> +tfoot tr.overall-translation-stats th {

table.translation-stats tfoot th { ...

> + text-align:left;
> +}
> +tfoot tr.overall-translation-stats td {

table.translation-stats tfoot td { ...

> + text-align:center;
> +}
> table.narrow-listing {
> width: 45em;
> }
>

[snip]
> === modified file 'lib/lp/translations/browser/distroserieslanguage.py'
> --- lib/lp/translations/browser/distroserieslanguage.py 2009-07-17 00:26:05 +0000
> +++ lib/lp/translations/browser/distroserieslanguage.py 2009-09-10 09:45:00 +0000
> @@ -5,17 +5,26 @@
>
> __meta...

review: Needs Fixing (code)

[Данило Шеган (danilo)]

Hi Michael,

Thanks a lot for the review. Comments inline.

У чет, 10. 09 2009. у 14:44 +0000, Michael Nelson пише:

> I've mainly got a few questions below, but there was one thing that
> needs fixing - a CSS rule that I think you meant to apply just to your
> table, but applies globally to all th's.

Indeed, this is something I forgot to fix up from the 'prototyping'
phase.

> > === modified file 'lib/canonical/launchpad/icing/style-3-0.css'
> > --- lib/canonical/launchpad/icing/style-3-0.css 2009-09-05 03:17:24 +0000
> > +++ lib/canonical/launchpad/icing/style-3-0.css 2009-09-09 18:52:48 +0000
...
> > +
> > +div.translations-legend {
> > + padding-top: 2em;
> > + padding-bottom: 1em;
> > +}
>
> Note: although we didn't get to it in the reviewers meeting on 09/09/09,
> I saw that barry had an agenda item:
>
> * 4-space indents for CSS styles [barry]

Fixed.

> Also, if that table can get large, and you want to do easy
> alternate-row-shading, I just found the other day that you can do things like:
>
> tbody.translation-stats tr:nth-child(odd) {...}

Oh, I know about that CSS3 feature. However, considering my main
browser is Epiphany which still uses xulrunner 1.9 (I believe shared
with Firefox 2 or 3), I am not personally interested :)

Just kidding, I am not going to change styles on existing table too
much, if at all. I am trying to make this mostly mechanical.

> This CSS could possibly be much simpler if you put
> the 'translation-stats' class on the table element (instead of on the
> tbody). Then you could remove the overall-translation-stats class and do:

That's actually what I started with. However, fighting legacy CSS code
is hell. 'table.listing tbody td' takes precedence over
'table.translation-stats tbody td'. I am not yet ready to do away with
class='listing' on these tables, though, simply because I am not trying
to solve all the problems with these pages. It's mostly mechanical
changes, and no real redesign.

> > +tbody.translation-stats td {
>
> table.translation-stats td {...
>
> (that way you don't need a separate rule for the tfoot below.)

Actually, the 'cascading' of CSS seems to cause me problems in at least
Epiphany (xulrunner 1.9): if I set the rule up like that (that's what I
started with), it doesn't get picked up. I'll play a bit more with CSS
and will follow up.

It's good to know that even CSS precedence rules differ between
browsers. :(

> > +tfoot tr.overall-translation-stats td, th {
>
> Yikes - careful there. This actually reads currently as:
>
> "Apply the following styles to any td's inside a tr...etc., or *any* th."
>
> So, for example, you can see this is being applied to th's at:
>
> https://launchpad.dev/builders

Right, fixed.

> > === modified file 'lib/lp/translations/browser/distroserieslanguage.py'
...
> >
> > + @property
> > + def page_title(self):
> > + return self.context.title
> > +
>
> Just note that you will probably need to remove this soon - when barry's
> branch lands that calculates the <title> automatically. It should only
> be overridden here in special cases (yes, this changed... see the points
> under "Here are the specific coding recommendations fo...

[Michael Nelson (michael.nelson)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Данило Шеган wrote:
> Hi Michael,
>
> Thanks a lot for the review. Comments inline.
>

Thanks for the changes! r=me - some comments below.

Cheers,
Michael.

>
>> This CSS could possibly be much simpler if you put
>> the 'translation-stats' class on the table element (instead of on the
>> tbody). Then you could remove the overall-translation-stats class and do:
>
> That's actually what I started with. However, fighting legacy CSS code
> is hell. 'table.listing tbody td' takes precedence over
> 'table.translation-stats tbody td'. I am not yet ready to do away with
> class='listing' on these tables, though, simply because I am not trying
> to solve all the problems with these pages. It's mostly mechanical
> changes, and no real redesign.

OK. It's up to you, but I'm guessing:

table.listing.translation-stats tbody td {...}

would take precedence (ie. selecting both classes - as it's more
specific). I'm not fussed either way - what you've got works, and it's
not a huge improvement to remove one class.

>
>>> +tbody.translation-stats td {
>> table.translation-stats td {...
>>
>> (that way you don't need a separate rule for the tfoot below.)
>
> Actually, the 'cascading' of CSS seems to cause me problems in at least
> Epiphany (xulrunner 1.9): if I set the rule up like that (that's what I
> started with), it doesn't get picked up. I'll play a bit more with CSS
> and will follow up.
>
> It's good to know that even CSS precedence rules differ between
> browsers. :(

Really? That is very strange. Try the more specific one I mentioned
above - selecting both classes - I'd be interested to know why it was
been over-ruled... is there something like firebug for epiphany?

>
>>> +tfoot tr.overall-translation-stats td, th {
>> Yikes - careful there. This actually reads currently as:
>>
>> "Apply the following styles to any td's inside a tr...etc., or *any* th."
>>
>> So, for example, you can see this is being applied to th's at:
>>
>> https://launchpad.dev/builders
>
> Right, fixed.

Great.

>
>>> === modified file 'lib/lp/translations/browser/distroserieslanguage.py'
> ...
>>>
>>> + @property
>>> + def page_title(self):
>>> + return self.context.title
>>> +
>> Just note that you will probably need to remove this soon - when barry's
>> branch lands that calculates the <title> automatically. It should only
>> be overridden here in special cases (yes, this changed... see the points
>> under "Here are the specific coding recommendations for your templates"
>> at: https://dev.launchpad.net/VersionThreeDotO/UI/Conversion#Heading%20rules
>
> At the moment, I either can't remove it from pagetitles.py or I have to
> define it like this. And yes, I am completely aware of the work Barry's
> doing, and I am completely aware that I'll have to go through all the
> translations pages to make sure that breadcrumbs, page titles, h2's and
> h1's make sense on them. And that's exactly what I was planning to do
> anyway.

Well *sorrrry* - I'd forgotten it was you helping barry with the rules -
 in previous reviews people haven't been aware. Next time I'll just keep
my mouth shut ;)

>
>>> @@ -25...

[Michael Nelson (michael.nelson)]

review: Approve (code)

[Данило Шеган (danilo)]

У пет, 11. 09 2009. у 07:18 +0000, Michael Nelson пише:

> >> This CSS could possibly be much simpler if you put
> >> the 'translation-stats' class on the table element (instead of on the
> >> tbody). Then you could remove the overall-translation-stats class and do:
> >
> > That's actually what I started with. However, fighting legacy CSS code
> > is hell. 'table.listing tbody td' takes precedence over
> > 'table.translation-stats tbody td'. I am not yet ready to do away with
> > class='listing' on these tables, though, simply because I am not trying
> > to solve all the problems with these pages. It's mostly mechanical
> > changes, and no real redesign.
>
> OK. It's up to you, but I'm guessing:
>
> table.listing.translation-stats tbody td {...}

> would take precedence (ie. selecting both classes - as it's more
> specific). I'm not fussed either way - what you've got works, and it's
> not a huge improvement to remove one class.

Actually, it seems the problem was the 'tr' I had in when I tried this.
It "suddenly" just works.

Btw, I wouldn't think of combining classes like this, so thanks for the
pointer: I am sure it'll be useful in the future, but the simpler stuff
works here :)

> >>> +tbody.translation-stats td {
> >> table.translation-stats td {...
> >>
> >> (that way you don't need a separate rule for the tfoot below.)
> >
> > Actually, the 'cascading' of CSS seems to cause me problems in at least
> > Epiphany (xulrunner 1.9): if I set the rule up like that (that's what I
> > started with), it doesn't get picked up. I'll play a bit more with CSS
> > and will follow up.
> >
> > It's good to know that even CSS precedence rules differ between
> > browsers. :(
>
> Really? That is very strange. Try the more specific one I mentioned
> above - selecting both classes - I'd be interested to know why it was
> been over-ruled... is there something like firebug for epiphany?

Oh, it seems they don't differ: I was using a CSS rule with 'tr' in it
as well, and that probably caused problems. With that removed, it works
in Epiphany as well.

Also, I was under the impression that you tried this out in Firefox 3.5:
I did try this out in whatever-firefox-is-in-jaunty with firebug (which
is how I've seen that it doesn't really work properly). There is not
yet anything like firebug for epiphany, so in hard cases, I resort to
firefox :)

> Well *sorrrry* - I'd forgotten it was you helping barry with the rules -
> in previous reviews people haven't been aware. Next time I'll just keep
> my mouth shut ;)

Not at all! I think you should keep mentioning it: it's important that
everybody is aware of it.

> > Perhaps it'd make some sense for me to provide Navigation class for
> > ITranslationGroupSet, just so it's more consistent and so no confusion
> > arises in the future. Or perhaps just comment that this doesn't show up
> > in the request.traversed_objects because it doesn't provide Navigation
> > class.
> >
> > What do you think?
>
> I think a comment would be fine - it would have cleared up my confusion.

Done.

> No problem - I hope you didn't feel patronized by me pointing out things
> that were already obvious to you.

Don't worry at a...

=== modified file 'lib/canonical/launchpad/icing/style-3-0.css'
--- lib/canonical/launchpad/icing/style-3-0.css	2009-09-05 03:17:24 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css	2009-09-09 18:52:48 +0000
@@ -748,6 +748,38 @@
   padding: 2px 1em 2px 2px;
 }
 
+/* Translations statistics and legend.
+ *
+ * Examples:
+ *   https://translations.launchpad.dev/ubuntu/hoary/+lang/es
+ *   https://translations.launchpad.dev/evolution/trunk/+lang/es
+ */
+
+div.translations-legend {
+  padding-top: 2em;
+  padding-bottom: 1em;
+}
+tbody.translation-stats td {
+  text-align:center;
+}
+tbody.translation-stats td.template-name {
+  text-align:left;
+}
+tfoot tr.overall-translation-stats td, th {
+  background-color: #f7f7f7;
+  border: 0px;
+  border-top: 2px solid #d2d2d2;
+  border-bottom: 2px solid #d2d2d2;
+  padding-top: 5px;
+  padding-bottom: 5px;
+  font-weight: bold;
+}
+tfoot tr.overall-translation-stats th {
+  text-align:left;
+}
+tfoot tr.overall-translation-stats td {
+  text-align:center;
+}
 table.narrow-listing {
   width: 45em;
 }

=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py	2009-09-10 01:35:03 +0000
+++ lib/canonical/launchpad/pagetitles.py	2009-09-10 10:27:20 +0000
@@ -399,8 +399,6 @@
 
 distroseries_queue = ContextTitle('Queue for %s')
 
-distroserieslanguage_index = ContextTitle('%s')
-
 distroseriessourcepackagerelease_index = ContextTitle('%s')
 
 errorservice_config = 'Configure error log'

=== modified file 'lib/lp/translations/browser/configure.zcml'
--- lib/lp/translations/browser/configure.zcml	2009-09-01 11:09:53 +0000
+++ lib/lp/translations/browser/configure.zcml	2009-09-10 10:27:20 +0000
@@ -35,12 +35,9 @@
         <browser:page
             name="+products-with-translations"
             template="../templates/rosetta-products.pt"/>
-        
+
         <!-- portlets -->
-        
-        <browser:page
-            name="+portlet-stats"
-            template="../templates/rosetta-portlet-stats.pt"/>
+
         <browser:page
             name="+portlet-groups"
             template="../templates/rosetta-portlet-groups.pt"/>
@@ -155,19 +152,22 @@
     <browser:url
         for="lp.translations.interfaces.distroserieslanguage.IDistroSeriesLanguage"
         path_expression="string:+lang/${language/code}"
-        attribute_to_parent="distroseries"/>
+        attribute_to_parent="distroseries"
+        rootsite="translations"/>
+    <browser:navigation
+        module="lp.translations.browser.distroserieslanguage"
+        classes="
+            DistroSeriesLanguageNavigation"/>
     <browser:defaultView
         for="lp.translations.interfaces.distroserieslanguage.IDistroSeriesLanguage"
-        name="+index"/>
+        name="+index"
+        layer="canonical.launchpad.layers.TranslationsLayer"/>
     <browser:pages
         for="lp.translations.interfaces.distroserieslanguage.IDistroSeriesLanguage"
         permission="zope.Public"
         facet="translations"
         layer="canonical.launchpad.layers.TranslationsLayer">
         <browser:page
-            name="+portlet-stats"
-            template="../templates/distroserieslanguage-portlet-stats.pt"/>
-        <browser:page
             name="+rosetta-status-legend"
             template="../templates/rosetta-status-legend.pt"/>
     </browser:pages>
@@ -175,7 +175,7 @@
         name="+index"
         permission="zope.Public"
         for="lp.translations.interfaces.distroserieslanguage.IDistroSeriesLanguage"
-        template="../templates/distroserieslanguage-index.pt"
+        template="../templates/serieslanguage-index.pt"
         class="lp.translations.browser.distroserieslanguage.DistroSeriesLanguageView"
         facet="translations"
         layer="canonical.launchpad.layers.TranslationsLayer"/>
@@ -906,9 +906,6 @@
         <browser:page
             name="+langchart"
             template="../templates/distroseries-langchart.pt"/>
-        <browser:page
-            name="+potlist"
-            template="../templates/object-pots.pt"/>
     </browser:pages>
     <browser:page
         for="lp.registry.interfaces.distroseries.IDistroSeries"

=== modified file 'lib/lp/translations/browser/distroserieslanguage.py'
--- lib/lp/translations/browser/distroserieslanguage.py	2009-07-17 00:26:05 +0000
+++ lib/lp/translations/browser/distroserieslanguage.py	2009-09-10 09:45:00 +0000
@@ -5,17 +5,26 @@
 
 __metaclass__ = type
 
-__all__ = ['DistroSeriesLanguageView']
+__all__ = [
+    'DistroSeriesLanguageNavigation',
+    'DistroSeriesLanguageView',
+    ]
 
 from canonical.launchpad.webapp import LaunchpadView
 from canonical.launchpad.webapp.batching import BatchNavigator
-
+from canonical.launchpad.webapp.publisher import Navigation
+from lp.translations.interfaces.distroserieslanguage import (
+    IDistroSeriesLanguage)
 
 class DistroSeriesLanguageView(LaunchpadView):
     """View class to render translation status for an `IDistroSeries`."""
 
     pofiles = None
 
+    @property
+    def page_title(self):
+        return self.context.title
+
     def initialize(self):
         self.form = self.request.form
 
@@ -25,3 +34,23 @@
 
         self.pofiles = self.context.getPOFilesFor(
             self.batchnav.currentBatch())
+        self.parent = self.context.distroseries.distribution
+
+    @property
+    def translation_group(self):
+        return self.context.distroseries.distribution.translationgroup
+
+    @property
+    def translation_team(self):
+        """Is there a translation team for this translation."""
+        if self.translation_group is not None:
+            team = self.translation_group.query_translator(
+                self.context.language)
+        else:
+            team = None
+        return team
+
+
+class DistroSeriesLanguageNavigation(Navigation):
+    """Navigation for `IDistroSeriesLanguage`."""
+    usedfor = IDistroSeriesLanguage

=== modified file 'lib/lp/translations/browser/tests/test_breadcrumbs.py'
--- lib/lp/translations/browser/tests/test_breadcrumbs.py	2009-09-10 09:58:30 +0000
+++ lib/lp/translations/browser/tests/test_breadcrumbs.py	2009-09-10 10:27:20 +0000
@@ -98,6 +98,46 @@
             ["Crumb Tester", "Translations"])
 
 
+class TestTranslationGroupsBreadcrumbs(BaseTranslationsBreadcrumbTestCase):
+
+    def test_translationgroupset(self):
+        group_set = getUtility(ITranslationGroupSet)
+        url = canonical_url(group_set, rootsite='translations')
+        # Translation group listing is top-level, so no breadcrumbs show up.
+        self._testContextBreadcrumbs(
+            [], [], [],
+            url=url)
+
+    def test_translationgroup(self):
+        group_set = getUtility(ITranslationGroupSet)
+        group = self.factory.makeTranslationGroup(
+            name='test-translators', title='Test translators')
+        self._testContextBreadcrumbs(
+            [group_set, group],
+            ["http://translations.launchpad.dev/+groups",
+             "http://translations.launchpad.dev/+groups/test-translators"],
+            ["Translation groups", "Test translators"])
+
+
+class TestSeriesLanguageBreadcrumbs(BaseTranslationsBreadcrumbTestCase):
+    def setUp(self):
+        super(TestSeriesLanguageBreadcrumbs, self).setUp()
+        self.language = getUtility(ILanguageSet)['sr']
+
+    def test_distroserieslanguage(self):
+        distribution = self.factory.makeDistribution(
+            name='crumb-tester', displayname="Crumb Tester")
+        series = self.factory.makeDistroRelease(
+            name="test", version="1.0", distribution=distribution)
+        serieslanguage = getUtility(IDistroSeriesLanguageSet).getDummy(
+            series, self.language)
+        self._testContextBreadcrumbs(
+            [distribution, series, serieslanguage],
+            ["http://launchpad.dev/crumb-tester",
+             "http://launchpad.dev/crumb-tester/test",
+             "http://translations.launchpad.dev/crumb-tester/test",
+             "http://translations.launchpad.dev/crumb-tester/test/+lang/sr"],
+            ["Crumb Tester", "1.0", "Translations", "Serbian (sr)"])
 
 
 def test_suite():

=== modified file 'lib/lp/translations/browser/translations.py'
--- lib/lp/translations/browser/translations.py	2009-09-10 09:58:30 +0000
+++ lib/lp/translations/browser/translations.py	2009-09-10 10:27:20 +0000
@@ -9,6 +9,7 @@
     'RosettaStatsView',
     'RosettaApplicationNavigation',
     'TranslateRedirectView',
+    'TranslationsLanguageBreadcrumb',
     'TranslationsMixin',
     'TranslationsRedirectView',
     'TranslationsVHostBreadcrumb',
@@ -192,3 +193,10 @@
     @property
     def text(self):
         return 'Translations'
+
+
+class TranslationsLanguageBreadcrumb(Breadcrumb):
+    """Breadcrumb for objects with language."""
+    @property
+    def text(self):
+        return self.context.language.displayname

=== modified file 'lib/lp/translations/configure.zcml'
--- lib/lp/translations/configure.zcml	2009-09-10 09:58:30 +0000
+++ lib/lp/translations/configure.zcml	2009-09-10 10:27:20 +0000
@@ -250,6 +250,12 @@
 
     <!-- DistroSeriesLanguage and Dummy -->
 
+    <adapter
+        provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
+        for="lp.translations.interfaces.distroserieslanguage.IDistroSeriesLanguage"
+        factory="lp.translations.browser.translations.TranslationsLanguageBreadcrumb"
+        permission="zope.Public"/>
+
     <class
         class="lp.translations.model.distroserieslanguage.DistroSeriesLanguage">
         <allow

=== modified file 'lib/lp/translations/doc/canonical_url_examples.txt'
--- lib/lp/translations/doc/canonical_url_examples.txt	2009-09-10 09:58:30 +0000
+++ lib/lp/translations/doc/canonical_url_examples.txt	2009-09-10 10:27:20 +0000
@@ -151,7 +151,7 @@
     >>> boo_bah_serbian = getUtility(IDistroSeriesLanguageSet).getDummy(
     ...     distroseries, serbian)
     >>> canonical_url(boo_bah_serbian)
-    u'http://launchpad.dev/boo/bah/+lang/sr'
+    u'http://translations.launchpad.dev/boo/bah/+lang/sr'
 
 Product, ProductSeries and ProductSeriesLanguage
 ---------------------------------------------------

=== modified file 'lib/lp/translations/model/distroserieslanguage.py'
--- lib/lp/translations/model/distroserieslanguage.py	2009-07-17 00:26:05 +0000
+++ lib/lp/translations/model/distroserieslanguage.py	2009-09-09 11:57:25 +0000
@@ -52,10 +52,14 @@
 
     @property
     def title(self):
-        return '%s translations of applications in %s, %s' % (
+        return '%s translations of %s %s' % (
             self.language.englishname,
             self.distroseries.distribution.displayname,
-            self.distroseries.title)
+            self.distroseries.displayname)
+
+    @property
+    def text(self):
+        return self.language.englishname
 
     @property
     def pofiles(self):
@@ -158,10 +162,10 @@
         self.dateupdated = datetime.now(tz=pytz.timezone('UTC'))
         self.translator_count = 0
         self.contributor_count = 0
-        self.title = '%s translations of applications in %s, %s' % (
+        self.title = '%s translations of %s %s' % (
             self.language.englishname,
             self.distroseries.distribution.displayname,
-            self.distroseries.title)
+            self.distroseries.displayname)
 
     @property
     def pofiles(self):

=== modified file 'lib/lp/translations/stories/standalone/xx-test-potlists.txt'
--- lib/lp/translations/stories/standalone/xx-test-potlists.txt	2009-07-01 20:45:39 +0000
+++ lib/lp/translations/stories/standalone/xx-test-potlists.txt	2009-09-09 12:41:48 +0000
@@ -11,17 +11,3 @@
   ...
   ...Listing of FEW templates...
   ...
-
-Check that we can get a potlist for a distroseries:
-
-  >>> print http(r"""
-  ... GET /ubuntu/hoary/+potlist HTTP/1.1
-  ... Host: translations.launchpad.dev
-  ... """)
-  HTTP/1.1 200 Ok
-  Content-Length: ...
-  Content-Type: text/html;charset=utf-8
-  <BLANKLINE>
-  ...
-  ...Listing of FEW templates...
-  ...

=== modified file 'lib/lp/translations/stories/translations/43-distrorelease-translations.txt'
--- lib/lp/translations/stories/translations/43-distrorelease-translations.txt	2008-09-09 08:13:14 +0000
+++ lib/lp/translations/stories/translations/43-distrorelease-translations.txt	2009-09-09 12:41:48 +0000
@@ -43,7 +43,7 @@
   ...     'http://translations.launchpad.dev/ubuntu/hoary/+lang/hr?batch=2')
   >>> 'Croatian' in browser.contents
   True
-  >>> 'Programs you can translate' in browser.contents
+  >>> 'Translatable templates' in browser.contents
   True
   >>> print browser.getLink('evolution-2.2').url
   http://translations.launchpad.dev/ubuntu/hoary/+source/evolution/+pots/evolution-2.2/hr/+translate

=== removed file 'lib/lp/translations/templates/distroserieslanguage-portlet-stats.pt'
--- lib/lp/translations/templates/distroserieslanguage-portlet-stats.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/distroserieslanguage-portlet-stats.pt	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-<div
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  class="portlet" id="portlet-stats">
-
-  <h2><span tal:replace="context/language/englishname">French</span>
-      statistics in <span
-      tal:replace="context/distroseries/displayname">Hoary</span></h2>
-
-  <div class="portletBody portletContent">
-
-    <b>Translatable items:</b>
-    <span tal:replace="context/messageCount">N</span>
-    <br/>
-    <b>Untranslated:</b>
-    <span tal:replace="context/untranslatedCount">N</span>
-    <br />
-    <span style="white-space: nowrap"
-          tal:content="structure context/@@+barchart">--</span>
-    <br />
-
-  </div>
-
-</div>

=== renamed file 'lib/lp/translations/templates/distroserieslanguage-index.pt' => 'lib/lp/translations/templates/serieslanguage-index.pt'
--- lib/lp/translations/templates/distroserieslanguage-index.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/serieslanguage-index.pt	2009-09-09 18:52:48 +0000
@@ -2,27 +2,11 @@
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="context/@@main_template/master"
-  i18n:domain="rosetta"
+  metal:use-macro="view/macro:page/main_only"
 >
 
 <body>
 
-<metal:rightportlets fill-slot="portlets_one">
-  <div tal:replace="structure context/@@+portlet-stats" />
-</metal:rightportlets>
-
-<metal:heading fill-slot="pageheading">
-  <h1>
-    Programs you can translate into
-    <tal:language replace="context/language/englishname">Catalan</tal:language>
-  </h1>
-</metal:heading>
-
 <div metal:fill-slot="main">
   <tal:block condition="not:view/pofiles">
     <div class="documentDescription">
@@ -31,15 +15,43 @@
   </tal:block>
 
   <tal:block condition="view/pofiles">
-
-    <p>
-      Choose a template name to begin translating. Templates that are
-      considered more important for translation are listed first.
-    </p>
-
+    <h1>Translatable templates</h1>
+    <div class="top-portlet">
+      <tal:with_group condition="view/translation_group">
+        <p tal:condition="view/translation_team">
+          <tal:product replace="structure
+            view/parent/fmt:link">Evolution</tal:product>
+          is translated by
+          <tal:team replace="structure
+                             view/translation_team/translator/fmt:link">
+            Serbian translators</tal:team> — if you need help, or your
+          translations are not being reviewed, please get in touch with them.
+        </p>
+
+        <p tal:condition="not:view/translation_team">
+          There is no team to translate
+          <tal:product replace="structure
+            view/parent/fmt:link">Evolution</tal:product>
+          to
+          <a tal:attributes="href context/language/fmt:url"
+             tal:content="context/language/englishname">Serbian</a>.
+          To set one up, please get in touch with
+          <a tal:replace="structure view/translation_group/fmt:link"
+             >Launchpad Translators</a>
+          coordinator.
+        </p>
+      </tal:with_group>
+
+      <p>
+        Choose a template name to begin translating.
+        Templates which are more important to translate are listed first.
+      </p>
+    </div>
+
+    <div style="max-width:840px;">
     <tal:navigation replace="structure view/batchnav/@@+navigation-links-upper" />
 
-    <table class="listing sortable" width="100%" id="translationstatuses">
+    <table class="listing sortable" id="translationstatuses">
       <thead>
         <tr>
           <th>Template Name</th>
@@ -52,10 +64,10 @@
           <th>By</th>
         </tr>
       </thead>
-      <tbody>
+      <tbody class="translation-stats">
         <tr tal:repeat="entry view/pofiles"
             tal:attributes="id string:${entry/potemplate/name}">
-          <td>
+          <td class="template-name">
             <a tal:attributes="href string:${entry/fmt:url}/+translate"
                tal:content="entry/potemplate/name">
                apache2-dev
@@ -146,34 +158,31 @@
             </tal:block>
           </td>
         </tr>
+        <tfoot>
+          <tr class="overall-translation-stats">
+            <th>Overall statistics:</th>
+            <td><span tal:replace="context/messageCount">N</span></td>
+            <td>
+              <span style="white-space: nowrap"
+                    tal:content="structure context/@@+barchart">--</span>
+            </td>
+            <td><span tal:replace="context/untranslatedCount">N</span></td>
+            <td><span tal:replace="context/unreviewedCount">N</span></td>
+            <td><span tal:replace="context/updatesCount">N</span></td>
+            <td colspan="2"></td>
+          </tr>
+        </tfoot>
       </tbody>
     </table>
-
     <tal:navigation replace="structure view/batchnav/@@+navigation-links-lower" />
 
-    <div tal:replace="structure context/@@+rosetta-status-legend" />
-
+    <div class="translations-legend">
+      <div tal:replace="structure context/@@+rosetta-status-legend" />
+    </div>
+    </div><!-- max-width -->
   </tal:block>
 
 </div>
 
-<div metal:fill-slot="help">
-  <p>
-    This page shows each of the translation templates in each of the source
-    packages in the
-    <span tal:replace="context/distroseries/displayname">hoary</span>
-    series of
-    <span tal:replace="context/distroseries/distribution/displayname">Ubuntu
-    </span>. Select a template to start translating.
-  </p>
-  <ul class="info">
-    <li>
-      <a href="https://help.launchpad.net/RosettaFAQ"
-      >Frequently asked questions</a>
-    </li>
-  </ul>
-</div>
-
-
 </body>
 </html>