Merge lp:~sinzui/launchpad/distroseries-breadcrumb-bug-400643 into lp:launchpad

[Curtis Hovey]

[Curtis Hovey (sinzui)]

This is my branch to switch the distroseries breadcrumb and all displays
of version to display as Lucid (10.04).

    lp:~sinzui/launchpad/distroseries-breadcrumb-bug-400643
    Diff size: 842 (500 lines are mechanical changes)
    Launchpad bug: https://bugs.launchpad.net/bugs/400643
    Test command: ./bin/test -vv
        -t "reg.*(doc/distroseries|test_breadcrumbs)"
        -t "xx-product-package-pages"
        -t "xx-rosetta-homepage|xx-distribution-translations"
    Pre-implementation: beuno, barry
    Target release: 3.1.11

= Switch the distroseries breadcrumb from a version or a code name =

When browsing Debian packaging branches Launchpad shows a numeric identifier
in the quick menu at the top of the page.

E.g. <https://launchpad.net/debian/sid/+source/bzr> shows
Launchpad > Debian > 98 > “bzr” package

After discussing the issue with Martin and Barry, it was decided that we
want to show the association between the version and the commonly used code
name, and we want to fix all the callsites.

== Rules ==

    * The code name should be shown with the version. Since both they are
      interchangable, they should be show together and shown consistently
      in this format: Codename (n.nn)
    * Add named_version to the Distroseries object to ensure consistent
      presentation.
    * Update all places that show just the version to also show the codename
    * Update places that use quotes or place the codename in parentheses to
      use named_version

== QA ==

Breadcrumbs and title:
    * Visit https://edge.launchpad.net/ubuntu/lucid/+source/bzr
    * Verify the breadcrumbs are:
      Ubuntu >> Lucid (10.04) >> "bzr" source package

Product packaging version:
    * Visit https://edge.launchpad.net/bzr/+packages
    * Verify the distroseries is listed as Lucid (10.04)

Translations version:
    * Visit http://edge.translations.launchpad.net/
    * Verify the distroseries is listed as Lucid (10.04)
    * Visit http://edge.translations.launchpad.net/ubuntu/lucid/+lang/pt_BR
    * Verify the distroseries is listed as Lucid (10.04)

Soyuz PPA version:
    * Visit https://edge.launchpad.net/ubuntu/+ppas
    * Verify the distroseries is listed as Lucid (10.04)

== Lint ==

Linting changed files:
  lib/lp/answers/stories/question-answers-vhost.txt
  lib/lp/answers/stories/question-overview.txt
  lib/lp/registry/browser/configure.zcml
  lib/lp/registry/browser/distroseries.py
  lib/lp/registry/browser/tests/test_breadcrumbs.py
  lib/lp/registry/doc/distroseries.txt
  lib/lp/registry/interfaces/distroseries.py
  lib/lp/registry/model/distroseries.py
  lib/lp/registry/stories/distribution/xx-distribution-packages.txt
  lib/lp/registry/stories/distroseries/xx-distroseries-index.txt
  lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt
  lib/lp/registry/stories/product/xx-product-package-pages.txt
  lib/lp/registry/templates/distribution-series.pt
  lib/lp/registry/templates/distroseries-details.pt
  lib/lp/registry/templates/product-distros.pt
  lib/lp/registry/templates/product-packages.pt
  lib/lp/soyuz/stories/distroseries/add-architecture.txt
  lib/lp/soyuz/stories/packaging/package-pages-navigation.txt
  lib/lp/so...

[Graham Binns (gmb)]

Curtis, I'm going to leave this branch for now, as I'd rather have you available to answer questions when I look at it (someone else who has more brain power than I is welcome to take a look at it before then).

[Brad Crittenden (bac)]

Curtis these changes look very good and thorough. Thanks for taking the time to clean this up. The presentation is much better now.

review: Approve (code)

=== modified file 'lib/lp/answers/stories/question-answers-vhost.txt'
--- lib/lp/answers/stories/question-answers-vhost.txt	2009-09-23 14:40:53 +0000
+++ lib/lp/answers/stories/question-answers-vhost.txt	2009-11-09 18:05:29 +0000
@@ -21,12 +21,13 @@
     >>> anon_browser.open(
     ...     'http://answers.launchpad.dev/ubuntu/+source/mozilla-firefox')
     >>> print anon_browser.title
-    Questions : “mozilla-firefox” package : Ubuntu
+    Questions : ...mozilla-firefox... package : Ubuntu
 
     >>> anon_browser.open(
-    ...     'http://answers.launchpad.dev/ubuntu/hoary/+source/mozilla-firefox')
+    ...     'http://answers.launchpad.dev'
+    ...     '/ubuntu/hoary/+source/mozilla-firefox')
     >>> print anon_browser.title
-    Questions : “mozilla-firefox” source package : 5.04 : Ubuntu
+    Questions : ...mozilla-firefox... source package : Hoary (5.04) : Ubuntu
 
 == Project ==
 

=== modified file 'lib/lp/answers/stories/question-overview.txt'
--- lib/lp/answers/stories/question-overview.txt	2009-10-31 15:42:37 +0000
+++ lib/lp/answers/stories/question-overview.txt	2009-11-09 18:05:29 +0000
@@ -103,8 +103,8 @@
     >>> browser.getLink('Answers').url
     'http://answers.launchpad.dev/ubuntu/hoary/+source/evolution'
     >>> browser.getLink('Answers').click()
-    >>> browser.title
-    'Questions : \xe2\x80\x9cevolution\xe2\x80\x9d source package : 5.04 : Ubuntu'
+    >>> print browser.title
+    Questions : ...evolution... source package : Hoary (5.04) : Ubuntu
     >>> browser.getLink('Ask a question').url
     '.../ubuntu/hoary/+source/evolution/+addquestion'
 

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2009-10-26 19:47:59 +0000
+++ lib/lp/registry/browser/configure.zcml	2009-11-09 18:05:29 +0000
@@ -1876,9 +1876,6 @@
             name="+portlet-lifecycle"
             template="../templates/distribution-portlet-lifecycle.pt"/>
         <browser:page
-            name="+portlet-series"
-            template="../templates/distribution-portlet-series.pt"/>
-        <browser:page
             name="+portlet-milestones"
             template="../templates/object-portlet-milestones.pt"/>
     </browser:pages>

=== modified file 'lib/lp/registry/browser/distroseries.py'
--- lib/lp/registry/browser/distroseries.py	2009-10-08 12:50:25 +0000
+++ lib/lp/registry/browser/distroseries.py	2009-11-09 18:05:29 +0000
@@ -133,7 +133,7 @@
     """Builds a breadcrumb for an `IDistroSeries`."""
     @property
     def text(self):
-        return self.context.version
+        return self.context.named_version
 
 
 class DistroSeriesFacets(StandardLaunchpadFacets):

=== added file 'lib/lp/registry/browser/tests/test_breadcrumbs.py'
--- lib/lp/registry/browser/tests/test_breadcrumbs.py	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/browser/tests/test_breadcrumbs.py	2009-11-09 18:05:29 +0000
@@ -0,0 +1,34 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+
+import unittest
+
+from canonical.launchpad.webapp.publisher import canonical_url
+from canonical.launchpad.webapp.tests.breadcrumbs import (
+    BaseBreadcrumbTestCase)
+
+
+class TestDistroseriesBreadcrumb(BaseBreadcrumbTestCase):
+    """Test breadcrumbs for an `IDistroseries`."""
+
+    def setUp(self):
+        super(TestDistroseriesBreadcrumb, self).setUp()
+        self.distribution = self.factory.makeDistribution(
+            name='youbuntu', displayname='Youbuntu')
+        self.distroseries = self.factory.makeDistroRelease(
+            name='groovy', version="1.06", distribution=self.distribution)
+        self.distroseries_url = canonical_url(self.distroseries)
+
+    def test_distroseries(self):
+        crumbs = self._getBreadcrumbs(
+            self.distroseries_url,
+            [self.root, self.distribution, self.distroseries])
+        last_crumb = crumbs[-1]
+        self.assertEquals(
+            last_crumb.text, self.distroseries.named_version)
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/registry/doc/distroseries.txt'
--- lib/lp/registry/doc/distroseries.txt	2009-09-19 08:14:43 +0000
+++ lib/lp/registry/doc/distroseries.txt	2009-11-09 18:05:29 +0000
@@ -85,6 +85,49 @@
     >>> all_ubuntu_releases.count()
     4
 
+
+Distroseries identifying attributes
+-----------------------------------
+
+A distroseries has a set of attributes that identify it. The launchpad id is
+the name attribute.
+
+    >>> print warty.name
+    warty
+
+It has a title for heading and titles...
+
+    >>> print warty.title
+    The Warty Warthog Release
+
+And a displayname for referring to it in a sentence.
+
+    >>> print warty.displayname
+    Warty
+
+The fullseriesname attribute is used when the context of the series name
+can be confused. Note that the value is created from the launchpad id names
+of the distribution and the series, though it may look like the displayname
+attributes were used.
+
+    >>> print warty.fullseriesname
+    Ubuntu Warty
+
+The version attribute holds the debversion of the series.
+
+    >>> print warty.version
+    4.10
+
+The named_version attribute is used is used to present the series displayname
+and version values consistently.
+
+    >>> print warty.named_version
+    Warty (4.10)
+
+
+Published releases
+------------------
+
 DistroSeries.getPublishedReleases:
 
     >>> from lp.registry.model.distroseries import DistroSeries

=== modified file 'lib/lp/registry/interfaces/distroseries.py'
--- lib/lp/registry/interfaces/distroseries.py	2009-10-26 18:40:04 +0000
+++ lib/lp/registry/interfaces/distroseries.py	2009-11-09 18:05:29 +0000
@@ -264,6 +264,7 @@
             Interface, # Really IDistribution, see circular import fix below.
             title=_("Distribution"), required=True,
             description=_("The distribution for which this is a series.")))
+    named_version =  Attribute('The combined display name and version.')
     parent = Attribute('The structural parent of this series - the distro')
     components = Attribute("The series components.")
     upload_components = Attribute("The series components that can be "

=== modified file 'lib/lp/registry/model/distroseries.py'
--- lib/lp/registry/model/distroseries.py	2009-10-26 18:40:04 +0000
+++ lib/lp/registry/model/distroseries.py	2009-11-09 18:05:29 +0000
@@ -194,6 +194,10 @@
         intermediateTable='SectionSelection')
 
     @property
+    def named_version(self):
+        return '%s (%s)' % (self.displayname, self.version)
+
+    @property
     def upload_components(self):
         """See `IDistroSeries`."""
         return Component.select("""

=== modified file 'lib/lp/registry/stories/distribution/xx-distribution-packages.txt'
--- lib/lp/registry/stories/distribution/xx-distribution-packages.txt	2009-11-09 13:01:13 +0000
+++ lib/lp/registry/stories/distribution/xx-distribution-packages.txt	2009-11-09 18:05:29 +0000
@@ -47,7 +47,7 @@
     ...     'http://localhost'
     ...     '/ubuntu/breezy-autotest/+package/mozilla-firefox')
     >>> print browser.title
-    mozilla-firefox : 6.6.6 : Ubuntu
+    mozilla-firefox : Breezy Badger Autotest (6.6.6) : Ubuntu
 
 Now run a search for mozilla-firefox and check that it is found:
 

=== modified file 'lib/lp/registry/stories/distroseries/xx-distroseries-index.txt'
--- lib/lp/registry/stories/distroseries/xx-distroseries-index.txt	2009-09-23 10:17:34 +0000
+++ lib/lp/registry/stories/distroseries/xx-distroseries-index.txt	2009-11-09 18:05:29 +0000
@@ -7,7 +7,7 @@
     >>> user_browser.open('http://launchpad.dev/ubuntu/hoary')
     >>> user_browser.getLink('Help translate').click()
     >>> print user_browser.title
-    Translations : 5.04 : Ubuntu
+    Translations : Hoary (5.04) : Ubuntu
 
 
 Registering information
@@ -40,11 +40,11 @@
     ...     find_portlet(anon_browser.contents, 'Series information'))
     Series information
     Distribution: Ubuntu
-    Series: Warty
+    Series: Warty (4.10)
     Project drivers: Ubuntu Team
     Release manager: None
     Status: Current Stable Release
-    Derives from: Warty is not derived from another series.
+    Derives from: Warty (4.10) is not derived from another series.
     Source packages: 3
     Binary packages: 4
 
@@ -56,11 +56,11 @@
     ...     find_portlet(anon_browser.contents, 'Series information'))
     Series information
     Distribution: Debian
-    Series: Sarge
+    Series: Sarge (3.1)
     Project drivers: Jeff Waugh, Mark Shuttleworth
     Release manager: Jeff Waugh
     Status: Pre-release Freeze
-    Derives from: Woody
+    Derives from: Woody (3.0)
     Source packages: No sources imported or published.
     Binary packages: No binaries imported or published.
 

=== modified file 'lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt'
--- lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt	2009-10-16 15:00:55 +0000
+++ lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt	2009-11-09 18:05:29 +0000
@@ -7,7 +7,8 @@
   ...     "http://launchpad.dev/ubuntu/warty/+source/mozilla/+packaging")
 
   >>> print_location(user_browser.contents)
-  Hierarchy: Ubuntu > 4.10 > ...mozilla... source package > Upstream links
+  Hierarchy: Ubuntu > Warty (4.10) >
+    ...mozilla... source package > Upstream links
   Tabs:
   * Overview (selected) - http://launchpad.dev/ubuntu/warty/+source/mozilla
   * Branches - http://code.launchpad.dev/ubuntu/warty/+source/mozilla

=== modified file 'lib/lp/registry/stories/product/xx-product-package-pages.txt'
--- lib/lp/registry/stories/product/xx-product-package-pages.txt	2009-10-26 19:09:39 +0000
+++ lib/lp/registry/stories/product/xx-product-package-pages.txt	2009-11-09 18:05:29 +0000
@@ -13,7 +13,7 @@
     >>> print extract_text(
     ...     find_tag_by_id(anon_browser.contents, 'distribution-series'))
     Distribution  Series     Source Package          Upstream Series  Pack...
-    4.10 (Warty)  evolution  Evolution trunk series ...
+    Warty (4.10)  evolution  Evolution trunk series ...
 
     >>> anon_browser.getLink(url='/ubuntu/warty/+source/evolution').click()
     >>> print extract_text(
@@ -32,8 +32,8 @@
     >>> print extract_text(find_tag_by_id(
     ...     evo_owner.contents, 'packages-trunk'))
     Distribution  Series        Source Package  Version
-    Ubuntu        4.10 (Warty)  evolution
-    Ubuntu        5.04 (Hoary)  evolution       1.0
+    Ubuntu        Warty (4.10)  evolution
+    Ubuntu        Hoary (5.04)  evolution       1.0
 
     >>> evo_owner.getLink(url='/ubuntu/hoary/+source/evolution') is not None
     True
@@ -67,4 +67,4 @@
     >>> print extract_text(find_tag_by_id(
     ...     evo_owner.contents, 'packages-trunk'))
     Distribution  Series        Source Package  Version
-    Ubuntu        5.04 (Hoary)  evolution       1.0
+    Ubuntu        Hoary (5.04)  evolution       1.0

=== removed file 'lib/lp/registry/templates/distribution-portlet-series.pt'
--- lib/lp/registry/templates/distribution-portlet-series.pt	2009-10-26 18:40:04 +0000
+++ lib/lp/registry/templates/distribution-portlet-series.pt	1970-01-01 00:00:00 +0000
@@ -1,22 +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-series"
-  tal:condition="context/series">
-  <h2>Major current versions</h2>
-  <div class="portletBody portletContent">
-    <ul class="distroseries">
-      <tal:per_series repeat="series context/series">
-        <li tal:condition="series/active">
-          <a tal:attributes="href series/fmt:url">
-            <tal:version replace="series/version" />
-            "<tal:codename replace="series/displayname" />"
-          </a>
-          - <tal:status replace="series/status/name/fmt:lower" />
-        </li>
-      </tal:per_series>
-    </ul>
-    <a href="+series">&raquo; See all versions...</a>
-  </div>
-</div>

=== modified file 'lib/lp/registry/templates/distribution-series.pt'
--- lib/lp/registry/templates/distribution-series.pt	2009-10-26 18:40:04 +0000
+++ lib/lp/registry/templates/distribution-series.pt	2009-11-09 18:05:29 +0000
@@ -25,16 +25,15 @@
           tal:define="series a_styled_series/series"
           tal:attributes="class string:${a_styled_series/css_class} series;
                           id series/name/fmt:css-id/series-;">
-            <strong><a tal:attributes="href series/fmt:url">
-              <tal:version replace="series/version" />
-              "<tal:codename replace="series/displayname" />"</a></strong>
+            <strong><a tal:attributes="href series/fmt:url"
+             tal:content="series/named_version" /></strong>
             <em><span tal:replace="series/status/title" /></em>
             <tal:derives condition="series/parent_series">
               <br />Derives from
               <a tal:attributes="href series/parent_series/fmt:url">
                 <tal:distro
                   replace="series/parent_series/distribution/displayname" />
-                <tal:distroseries replace="series/parent_series/version" /></a>
+                <tal:distroseries replace="series/parent_series/named_version" /></a>
             </tal:derives>
             <tal:milestones
               define="milestones series/all_milestones"

=== modified file 'lib/lp/registry/templates/distroseries-details.pt'
--- lib/lp/registry/templates/distroseries-details.pt	2009-09-15 22:12:44 +0000
+++ lib/lp/registry/templates/distroseries-details.pt	2009-11-09 18:05:29 +0000
@@ -14,7 +14,7 @@
 
     <dl id="series-name">
       <dt>Series:</dt>
-      <dd><tal:name replace="context/displayname" /></dd>
+      <dd><tal:name replace="context/named_version" /></dd>
     </dl>
 
     <dl id="series-drivers">
@@ -52,9 +52,9 @@
         <a
           tal:condition="context/parent_series"
           tal:attributes="href context/parent_series/fmt:url"
-          tal:content="context/parent_series/displayname" />
+          tal:content="context/parent_series/named_version" />
         <tal:none condition="not: context/parent_series">
-          <tal:name replace="context/displayname"/> is not derived from
+          <tal:name replace="context/named_version"/> is not derived from
           another series.
         </tal:none>
       </dd>

=== modified file 'lib/lp/registry/templates/product-distros.pt'
--- lib/lp/registry/templates/product-distros.pt	2009-10-26 18:40:04 +0000
+++ lib/lp/registry/templates/product-distros.pt	2009-11-09 18:05:29 +0000
@@ -39,9 +39,8 @@
       <tbody>
         <tr tal:repeat="pkging distro/packagings">
           <td>
-            <a tal:attributes="href pkging/distroseries/fmt:url"><tal:version
-              replace="pkging/distroseries/version" />
-              (<tal:name replace="pkging/distroseries/displayname" />)</a>
+            <a tal:attributes="href pkging/distroseries/fmt:url"
+                tal:replace="pkging/distroseries/named_version" />
           </td>
             
           <td>

=== modified file 'lib/lp/registry/templates/product-packages.pt'
--- lib/lp/registry/templates/product-packages.pt	2009-11-06 21:06:38 +0000
+++ lib/lp/registry/templates/product-packages.pt	2009-11-09 18:05:29 +0000
@@ -60,9 +60,8 @@
             </td>
 
             <td>
-              <a tal:attributes="href packaging/distroseries/fmt:url"><tal:version
-                replace="packaging/distroseries/version" />
-                (<tal:name replace="packaging/distroseries/displayname" />)</a>
+              <a tal:attributes="href packaging/distroseries/fmt:url"
+                tal:replace="packaging/distroseries/named_version" />
             </td>
 
             <td>

=== modified file 'lib/lp/soyuz/stories/distroseries/add-architecture.txt'
--- lib/lp/soyuz/stories/distroseries/add-architecture.txt	2009-09-18 15:42:19 +0000
+++ lib/lp/soyuz/stories/distroseries/add-architecture.txt	2009-11-09 18:05:29 +0000
@@ -25,7 +25,7 @@
     >>> admin_browser.getControl('PPA support available').selected = True
     >>> admin_browser.getControl('Continue').click()
     >>> print admin_browser.title
-    ia64 : 5.04 : Ubuntu
+    ia64 : Hoary (5.04) : Ubuntu
 
 Other users won't see the link nor the page where a new port can be
 registered.

=== modified file 'lib/lp/soyuz/stories/packaging/package-pages-navigation.txt'
--- lib/lp/soyuz/stories/packaging/package-pages-navigation.txt	2009-09-28 12:59:33 +0000
+++ lib/lp/soyuz/stories/packaging/package-pages-navigation.txt	2009-11-09 18:05:29 +0000
@@ -93,7 +93,7 @@
     >>> anon_browser.open(
     ...     'http://launchpad.dev/ubuntu/hoary/+source/alsa-utils')
     >>> print_location(anon_browser.contents)
-    Hierarchy: Ubuntu > 5.04 > ?alsa-utils? source package
+    Hierarchy: Ubuntu > Hoary (5.04) > ?alsa-utils? source package
     Tabs:
     * Overview (selected) - not linked
     * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/alsa-utils
@@ -109,7 +109,7 @@
     >>> anon_browser.open(
     ...     'http://answers.launchpad.dev/ubuntu/hoary/+source/alsa-utils')
     >>> print_location(anon_browser.contents)
-    Hierarchy: Ubuntu > 5.04 > ?alsa-utils? source package > Questions
+    Hierarchy: Ubuntu > Hoary (5.04) > ?alsa-utils? source package > Questions
     Tabs:
     * Overview - http://launchpad.dev/ubuntu/hoary/+source/alsa-utils
     * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/alsa-utils
@@ -131,7 +131,7 @@
     ...     'http://launchpad.dev/ubuntu/hoary/'
     ...     '+source/alsa-utils/1.0.9a-4ubuntu1')
     >>> print_location(anon_browser.contents)
-    Hierarchy: Ubuntu > 5.04 > ?alsa-utils? source package
+    Hierarchy: Ubuntu > Hoary (5.04) > ?alsa-utils? source package
     Tabs:
     * Overview (selected) - http://launchpad.dev/ubuntu/hoary/+source/alsa-utils
     * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/alsa-utils
@@ -150,7 +150,7 @@
 
     >>> anon_browser.open('http://launchpad.dev/ubuntu/hoary/i386')
     >>> print_location(anon_browser.contents)
-    Hierarchy: Ubuntu > 5.04 > i386
+    Hierarchy: Ubuntu > Hoary (5.04) > i386
     Tabs:
     * Overview (selected) - http://launchpad.dev/ubuntu/hoary
     * Branches - http://code.launchpad.dev/ubuntu/hoary
@@ -168,7 +168,7 @@
 
     >>> anon_browser.open('http://launchpad.dev/ubuntu/hoary/i386/pmount')
     >>> print_location(anon_browser.contents)
-    Hierarchy: Ubuntu > 5.04 > i386 > pmount
+    Hierarchy: Ubuntu > Hoary (5.04) > i386 > pmount
     Tabs:
     * Overview (selected) - http://launchpad.dev/ubuntu/hoary
     * Branches - http://code.launchpad.dev/ubuntu/hoary
@@ -187,7 +187,7 @@
     >>> anon_browser.open(
     ...     'http://launchpad.dev/ubuntu/hoary/i386/pmount/0.1-1')
     >>> print_location(anon_browser.contents)
-    Hierarchy: Ubuntu > 5.04 > i386 > pmount > 0.1-1
+    Hierarchy: Ubuntu > Hoary (5.04) > i386 > pmount > 0.1-1
     Tabs:
     * Overview (selected) - http://launchpad.dev/ubuntu/hoary
     * Branches - http://code.launchpad.dev/ubuntu/hoary

=== modified file 'lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt'
--- lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt	2009-10-16 11:28:58 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt	2009-11-09 18:05:29 +0000
@@ -27,16 +27,8 @@
     ...    find_tag_by_id(anon_browser.contents,
     ...                   'supports_virtualized_architectures'))
     PPA supported series
-    5.04
-    "Hoary"
-    - development
-    i386
-    (official)
-    4.10
-    "Warty"
-    - current
-    i386
-    (official)
+    Hoary (5.04) - development i386 (official)
+    Warty (4.10) - current i386 (official)
 
 The sample data contains three PPAs.  Only Celso's and Mark's have
 packages (the active ones). Altogether there 4 sources and 4 binaries
@@ -95,9 +87,8 @@
     ...    find_tag_by_id(anon_browser.contents,
     ...                   'supports_virtualized_architectures'))
     PPA supported series
-    3.1 "Sarge" - frozen
-    3.0 "Woody" - current
-      i386 (official)
+    Sarge (3.1) - frozen
+    Woody (3.0) - current i386 (official)
 
 Archive and package counter are empty.
 

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-distroarchseries-binpackages.txt'
--- lib/lp/soyuz/stories/soyuz/xx-distroarchseries-binpackages.txt	2009-09-18 21:00:18 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-distroarchseries-binpackages.txt	2009-11-09 18:05:29 +0000
@@ -34,7 +34,7 @@
 
     >>> browser.getLink("0.9").click()
     >>> print browser.title
-    0.9 : mozilla-firefox : i386 : 4.10 : Ubuntu
+    0.9 : mozilla-firefox : i386 : Warty (4.10) : Ubuntu
 
 As well as a link to the related distribution source package:
 
@@ -43,7 +43,7 @@
     >>> browser.getLink(id="source_package").click()
     >>> print browser.title.decode('ascii', 'ignore')
     iceweasel package : Ubuntu
-    
+
 If the binary distribution does not have a current release, then the
 link to the source package will not be present:
 
@@ -82,7 +82,7 @@
 
     >>> browser.getLink(url="mozilla-firefox/0.9").click()
     >>> print browser.title
-    0.9 : mozilla-firefox : i386 : 4.10 : Ubuntu
+    0.9 : mozilla-firefox : i386 : Warty (4.10) : Ubuntu
 
 This page represents an IDistroArchSeriesBinaryPackageRelease and is
 able to point the user to the IDistroSeriesSourcePackageRelease which
@@ -146,7 +146,7 @@
 
     >>> browser.getLink("1.0-1").click()
     >>> print browser.title
-    1.0-1 : commercialpackage : i386 : 6.6.6 : Ubuntu
+    1.0-1 : commercialpackage : i386 : Breezy Badger Autotest (6.6.6) : Ubuntu
 
 A BinaryPackageRelease once published in a DistroArchSeries is
 represented by a DistroArchSeriesBinaryPackageRelease and easily
@@ -177,7 +177,7 @@
 
     >>> browser.getLink("commercialpackage").click()
     >>> print browser.title
-    1.0-1 : commercialpackage : i386 : 6.6.6 : Ubuntu
+    1.0-1 : commercialpackage : i386 : Breezy Badger Autotest (6.6.6) : Ubuntu
 
 This page represents an IDistroArchSeriesBinaryPackageRelease and is
 able to point the user to the IDistroSeriesSourcePackageRelease which

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-distroarchseries.txt'
--- lib/lp/soyuz/stories/soyuz/xx-distroarchseries.txt	2009-09-18 15:42:19 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-distroarchseries.txt	2009-11-09 18:05:29 +0000
@@ -16,7 +16,7 @@
     >>> anon_browser.getLink('i386').click()
 
     >>> print anon_browser.title
-    i386 : 4.10 : Ubuntu
+    i386 : Warty (4.10) : Ubuntu
 
 We present only minimal information in this page, its main feature is
 to allow binary package searching.
@@ -247,7 +247,7 @@
 administrator.
 
     >>> print admin_browser.title
-    amd64 : 5.04 : Ubuntu
+    amd64 : Hoary (5.04) : Ubuntu
 
 And other users can see the just-created architecture listed in the
 distroseries page.

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-distroseries-binary-packages.txt'
--- lib/lp/soyuz/stories/soyuz/xx-distroseries-binary-packages.txt	2009-09-18 21:00:18 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-distroseries-binary-packages.txt	2009-11-09 18:05:29 +0000
@@ -6,12 +6,12 @@
     >>> browser.open(
     ...     'http://launchpad.dev/ubuntu/warty/+package/mozilla-firefox')
     >>> print browser.title
-    mozilla-firefox : 4.10 : Ubuntu
+    mozilla-firefox : Warty (4.10) : Ubuntu
 
     >>> main_content = find_main_content(browser.contents)
     >>> print extract_text(main_content)
     Binary package “mozilla-firefox” in ubuntu warty
-    Ubuntu 4.10 mozilla-firefox
+    Ubuntu Warty (4.10) mozilla-firefox
     Mozilla Firefox Web Browser
     Mozilla Firefox Web Browser is .....
     Source package
@@ -36,7 +36,7 @@
 
     >>> browser.getLink(id="source_package").click()
     >>> browser.title
-    '\xe2\x80\x9ciceweasel\xe2\x80\x9d source package : 4.10 : Ubuntu'
+    '...iceweasel... source package : Warty (4.10) : Ubuntu'
 
 Some DistroSeriesBinaryPackages are unpublished, in this case there is
 no link to any source package:
@@ -44,12 +44,12 @@
     >>> browser.open(
     ...     'http://launchpad.dev/ubuntu/hoary/+package/mozilla-firefox')
     >>> print browser.title
-    mozilla-firefox : 5.04 : Ubuntu
+    mozilla-firefox : Hoary (5.04) : Ubuntu
 
     >>> main_content = find_main_content(browser.contents)
     >>> print extract_text(main_content)
     Binary package “mozilla-firefox” in ubuntu hoary
-    Ubuntu 5.04 mozilla-firefox
+    Ubuntu Hoary (5.04) mozilla-firefox
     No summary available for mozilla-firefox in ubuntu hoary.
     No description available for mozilla-firefox in ubuntu hoary.
     Published versions

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-person-packages.txt'
--- lib/lp/soyuz/stories/soyuz/xx-person-packages.txt	2009-10-20 02:24:44 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-person-packages.txt	2009-11-09 18:05:29 +0000
@@ -70,7 +70,7 @@
     <Link text='Ubuntu Hoary' url='http://launchpad.dev/ubuntu/hoary/+source/cnews'>
     >>> link.click()
     >>> browser.title
-    '...cnews... package : 5.04 : Ubuntu'
+    '...cnews... package : Hoary (5.04) : Ubuntu'
 
 Same again for the third column should take us to a distribution source
 package release page:

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt'
--- lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt	2009-09-28 12:59:33 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt	2009-11-09 18:05:29 +0000
@@ -5,7 +5,7 @@
   >>> user_browser.open(
   ...     "http://launchpad.dev/ubuntu/hoary/+source/pmount/+changelog")
   >>> print_location(user_browser.contents)
-  Hierarchy: Ubuntu > 5.04 > ...pmount... source package > Change log
+  Hierarchy: Ubuntu > Hoary (5.04) > ...pmount... source package > Change log
   Tabs:
   * Overview (selected) - http://launchpad.dev/ubuntu/hoary/+source/pmount
   * Branches - http://code.launchpad.dev/ubuntu/hoary/+source/pmount

=== modified file 'lib/lp/soyuz/templates/distribution-portlet-ppa-architectures.pt'
--- lib/lp/soyuz/templates/distribution-portlet-ppa-architectures.pt	2009-10-26 18:40:04 +0000
+++ lib/lp/soyuz/templates/distribution-portlet-ppa-architectures.pt	2009-11-09 18:05:29 +0000
@@ -12,12 +12,9 @@
       <tal:per_series repeat="series series">
         <li tal:condition="series/active">
           <a class="sprite distribution"
-             tal:attributes="href series/fmt:url">
-             <tal:version replace="series/version" />
-             "<tal:codename replace="series/displayname" />"
-          </a>
+             tal:attributes="href series/fmt:url"
+             tal:content="series/named_version" />
           - <tal:status replace="series/status/name/fmt:lower" />
-
           <ul tal:define="archs series/virtualized_architectures"
               tal:condition="archs">
             <li class="sprite" tal:repeat="arch archs">

=== modified file 'lib/lp/translations/browser/tests/test_breadcrumbs.py'
--- lib/lp/translations/browser/tests/test_breadcrumbs.py	2009-09-17 19:05:29 +0000
+++ lib/lp/translations/browser/tests/test_breadcrumbs.py	2009-11-09 18:05:29 +0000
@@ -81,7 +81,7 @@
             ['http://launchpad.dev/crumb-tester',
              'http://launchpad.dev/crumb-tester/test',
              'http://translations.launchpad.dev/crumb-tester/test'],
-            ["Crumb Tester", "1.0", "Translations"])
+            ["Crumb Tester", "Test (1.0)", "Translations"])
 
     def test_project(self):
         project = self.factory.makeProject(
@@ -142,7 +142,7 @@
              "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)"])
+            ["Crumb Tester", "Test (1.0)", "Translations", "Serbian (sr)"])
 
     def test_productserieslanguage(self):
         product = self.factory.makeProduct(

=== modified file 'lib/lp/translations/stories/distribution/xx-distribution-translations.txt'
--- lib/lp/translations/stories/distribution/xx-distribution-translations.txt	2009-09-15 05:45:10 +0000
+++ lib/lp/translations/stories/distribution/xx-distribution-translations.txt	2009-11-09 18:05:29 +0000
@@ -56,18 +56,18 @@
     Other versions of Ubuntu
 
     >>> print extract_text(content.find(id='distroseries-list'))
-    6.6.6 Breezy Badger Autotest
-    5.10 The Grumpy Groundhog Release
-    4.10 The Warty Warthog Release
+    Breezy Badger Autotest (6.6.6)
+    Grumpy (5.10)
+    Warty (4.10)
 
 We are not showing its translation status here, so we should have
 links to their particular translation status.
 
-    >>> print browser.getLink('6.6.6 Breezy Badger Autotest').url
+    >>> print browser.getLink('Breezy Badger Autotest (6.6.6)').url
     http://translations.launchpad.dev/ubuntu/breezy-autotest
-    >>> print browser.getLink('5.10 The Grumpy Groundhog Release').url
+    >>> print browser.getLink('Grumpy (5.10)').url
     http://translations.launchpad.dev/ubuntu/grumpy
-    >>> print browser.getLink('4.10 The Warty Warthog Release').url
+    >>> print browser.getLink('Warty (4.10)').url
     http://translations.launchpad.dev/ubuntu/warty
 
 But we are already showing the status for the translation focus one,
@@ -98,15 +98,15 @@
     Other versions of Debian
 
     >>> print extract_text(content.find(id='distroseries-list'))
-    3.2 Sid
-    3.0 WOODY
+    Sid (3.2)
+    Woody (3.0)
 
 We are not showing its translation status here, so we should have
 links to their particular translation status.
 
-    >>> print browser.getLink('3.2 Sid').url
+    >>> print browser.getLink('Sid (3.2)').url
     http://translations.launchpad.dev/debian/sid
-    >>> print browser.getLink('3.0 WOODY').url
+    >>> print browser.getLink('Woody (3.0)').url
     http://translations.launchpad.dev/debian/woody
 
 But we are already showing the status for the translation focus one,

=== modified file 'lib/lp/translations/stories/standalone/xx-pofile-translate-message-filtering.txt'
--- lib/lp/translations/stories/standalone/xx-pofile-translate-message-filtering.txt	2009-09-17 10:25:48 +0000
+++ lib/lp/translations/stories/standalone/xx-pofile-translate-message-filtering.txt	2009-11-09 18:05:29 +0000
@@ -45,7 +45,7 @@
     ...     '+source/evolution/+pots/evolution-2.2/es/+translate')
     >>> print user_browser.title
     Spanish (es) : Template ...evolution-2.2... : ...evolution... package :
-    Translations : 5.04 : Ubuntu
+    Translations : Hoary (5.04) : Ubuntu
 
 He can see that there are 22 messages.
 
@@ -121,7 +121,7 @@
     >>> user_browser.getControl('Change').click()
     >>> print user_browser.title
     English (Australia) (en_AU) : Template ...evolution-2.2... :
-    ...evolution... package : Translations : 5.04 : Ubuntu
+    ...evolution... package : Translations : Hoary (5.04) : Ubuntu
 
     >>> contents = find_main_content(user_browser.contents)
     >>> print_batch_header(contents)

=== modified file 'lib/lp/translations/stories/standalone/xx-rosetta-homepage.txt'
--- lib/lp/translations/stories/standalone/xx-rosetta-homepage.txt	2009-09-11 16:40:52 +0000
+++ lib/lp/translations/stories/standalone/xx-rosetta-homepage.txt	2009-11-09 18:05:29 +0000
@@ -11,7 +11,7 @@
     ...     browser.contents, 'three column left')[0]
     >>> print extract_text(left_column)
     Translatable operating systems
-    Ubuntu 5.04
+    Ubuntu Hoary (5.04)
 
 The middle lists translatable products, Evolution is one of most
 translated projects.

=== modified file 'lib/lp/translations/stories/standalone/xx-rosetta-pofile-export.txt'
--- lib/lp/translations/stories/standalone/xx-rosetta-pofile-export.txt	2009-09-18 15:42:19 +0000
+++ lib/lp/translations/stories/standalone/xx-rosetta-pofile-export.txt	2009-11-09 18:05:29 +0000
@@ -17,9 +17,9 @@
     ...     '/+source/evolution/+pots/evolution-2.2/es')
     >>> user_browser.getLink('Download').click()
 
-    >>> user_browser.title
-    'Download translation : Spanish (es)...
-    ...evolution... package : Translations : 5.04 : Ubuntu'
+    >>> print user_browser.title
+    Download translation : Spanish (es)...
+    ...evolution... package : Translations : Hoary (5.04) : Ubuntu
 
     >>> print find_main_content(user_browser.contents)
     <...

=== modified file 'lib/lp/translations/stories/standalone/xx-rosetta-potemplate-index.txt'
--- lib/lp/translations/stories/standalone/xx-rosetta-potemplate-index.txt	2009-09-17 10:22:14 +0000
+++ lib/lp/translations/stories/standalone/xx-rosetta-potemplate-index.txt	2009-11-09 18:05:29 +0000
@@ -6,8 +6,9 @@
 
     >>> anon_browser.open("http://translations.launchpad.dev/"
     ...     "ubuntu/hoary/+source/evolution/+pots/evolution-2.2/")
-    >>> anon_browser.title
-    'Template ...evolution-2.2... : ...evolution... package : Translations : 5.04 : Ubuntu'
+    >>> print anon_browser.title
+    Template ...evolution-2.2... :
+    ...evolution... package : Translations : Hoary (5.04) : Ubuntu
 
 The owner of the template is diplayed.
 

=== modified file 'lib/lp/translations/stories/standalone/xx-rosetta-sourcepackage-list.txt'
--- lib/lp/translations/stories/standalone/xx-rosetta-sourcepackage-list.txt	2009-09-17 21:36:38 +0000
+++ lib/lp/translations/stories/standalone/xx-rosetta-sourcepackage-list.txt	2009-11-09 18:05:29 +0000
@@ -8,7 +8,7 @@
     ...     'http://translations.launchpad.dev/ubuntu/hoary/'
     ...     '+source/evolution')
     >>> anon_browser.title
-    '...evolution...package : Translations : 5.04 : Ubuntu'
+    '...evolution...package : Translations : Hoary (5.04) : Ubuntu'
 
     >>> content = find_main_content(anon_browser.contents)
     >>> print extract_text(content.findAll('h1')[0]).encode(

=== modified file 'lib/lp/translations/templates/distribution-translations.pt'
--- lib/lp/translations/templates/distribution-translations.pt	2009-10-26 18:40:04 +0000
+++ lib/lp/translations/templates/distribution-translations.pt	2009-11-09 18:05:29 +0000
@@ -73,9 +73,7 @@
     <ul id="distroseries-list">
       <li tal:repeat="distroseries view/secondary_translatable_series">
         <a tal:attributes="href distroseries/fmt:url"
-                 tal:content=
-                    "string: ${distroseries/version} ${distroseries/title}"
-                >5.04 The Hoary Hedgehog Release</a>
+          tal:content="distroseries/named_version">Hoary (5.04)</a>
       </li>
     </ul>
   </tal:secondary>

=== modified file 'lib/lp/translations/templates/rosetta-index.pt'
--- lib/lp/translations/templates/rosetta-index.pt	2009-09-11 16:40:52 +0000
+++ lib/lp/translations/templates/rosetta-index.pt	2009-11-09 18:05:29 +0000
@@ -43,15 +43,7 @@
             <li tal:repeat="distroseries context/translatable_distroseriess">
               <a tal:attributes="href string:/${distroseries/distribution/name}/${distroseries/name}/+translations">
                 <tal:distroname replace="distroseries/distribution/displayname" />
-                <tal:version
-                  condition="distroseries/version"
-                  replace="distroseries/version"
-                />
-                <tal:codename
-                  condition="not:distroseries/version"
-                  replace="distroseries/title"
-                />
-              </a>
+                <tal:version replace="distroseries/named_version" /></a>
             </li>
           </ul>
         </div>