Merge lp:~danilo/launchpad/bug-455771 into lp:launchpad

= Bug 455771 =

Do not try to link to translation focus series if it isn't defined.

= Demo & QA =

https://translations.edge.launchpad.net/debian/sid
https://translations.launchpad.dev/debian/sid

= Tests =

bin/test -vvt distroseries-translations.txt

= Lint =

No complaints.

Kudos for fixing this. Two points though:

1. You now have a conditional top-portlet div. Can that be fixed by creating a separate top-portlet and then putting the conditional div either below or inside it?

2. It's not clear what the additional test is testing. Always a problem with "look, it doesn't blow up" fixes. I'd suggest giving the div an HTML id and having the test show its absence.

Hope we can get through this soon, since I'm EOD and I'm sure you want this branch done.

1. There's nothing wrong with a conditional top-portlet div. If you think there is, you'll have to explain what it is :)

2. Yeah, test is problematic. I'll folow your advice.

> 1. There's nothing wrong with a conditional top-portlet div. If you think
> there is, you'll have to explain what it is :)

Frankly I don't really know what it is, but I'm assuming we wouldn't have top-portlet if it didn't do something desirable.

So I'll approve with a stern "put that in your pipe and smoke it, young man" look. :)

Incremental diff:

=== modified file 'lib/lp/translations/stories/distroseries/xx-distroseries-translations.txt'
--- lib/lp/translations/stories/distroseries/xx-distroseries-translations.txt 2009-10-21 07:42:20 +0000
+++ lib/lp/translations/stories/distroseries/xx-distroseries-translations.txt 2009-10-22 10:53:49 +0000
@@ -172,10 +172,30 @@
 just prevents that the translation import script, which is executed by cron,
 handle translation imports for this distro series.

+== Translation focus ==
+
+If translation focus is not set, there is no recommendation of what
+release series should be translated.
+
     >>> login('<email address hidden>')
     >>> distribution = factory.makeDistribution(name='earthian')
- >>> distroseries = factory.makeDistroRelease(name='1.4', distribution=distribution)
- >>> logout()
- >>> admin_browser.open('http://translations.launchpad.dev/earthian/1.4')
- >>> admin_browser.url
- 'http://translations.launchpad.dev/earthian/1.4'
+ >>> distroseries = factory.makeDistroRelease(
+ ... name='1.4', distribution=distribution)
+ >>> logout()
+ >>> print distribution.translation_focus
+ None
+ >>> admin_browser.open('http://translations.launchpad.dev/earthian/1.4')
+ >>> print find_tag_by_id(admin_browser.contents, 'translation-focus')
+ None
+
+If focus is set, nice explanatory text is displayed.
+
+ >>> login('<email address hidden>')
+ >>> focus_series = factory.makeDistroRelease(
+ ... name='1.6', distribution=distribution)
+ >>> distribution.translation_focus = focus_series
+ >>> logout()
+ >>> admin_browser.open('http://translations.launchpad.dev/earthian/1.4')
+ >>> print extract_text(
+ ... find_tag_by_id(admin_browser.contents, 'translation-focus'))
+ Launchpad currently recommends translating 1.6.

=== modified file 'lib/lp/translations/templates/distroseries-translations.pt'
--- lib/lp/translations/templates/distroseries-translations.pt 2009-10-21 07:42:20 +0000
+++ lib/lp/translations/templates/distroseries-translations.pt 2009-10-22 10:13:40 +0000
@@ -14,6 +14,7 @@
         <div></div><!-- to clear-up all floats -->
       </div>
       <div class="top-portlet"
+ id="translation-focus"
            tal:condition="context/distribution/translation_focus">
         <p tal:condition="not:view/is_translation_focus">
           Launchpad currently recommends translating