Merge lp:~jtv/launchpad/bug-812667 into lp:launchpad

[Jeroen T. Vermeulen]

[r=jtv][bug=812667] Don't say a distroseries "derives from" its previous_series.

= Summary =

The DistroSeries listings still say that a series "derives from" its previous_series. But distro derivation now assigns a very specific meaning to that term that has nothing to do with previous_series.

== Proposed fix ==

Say "successor to" instead of "derives from."

== Pre-implementation notes ==

StevenK did not like this wording: it "doesn't really do it for" him. Alternatives that have been considered:

 * "Based on" — too generic, would cover derivation just as well.
 * "Previous release" — in this context, makes it look like a previous release _of the series_.
 * "Supersede" — but is that always accurate?

We do need to get away from "derives from," however.

== Implementation details ==

We may still choose to change the wording. It's pretty much a copy-paste job to this branch. There is one other place where the wording will be affected once we retire the feature flag for the distro-derivation UI.

== Tests ==

{{{
./bin/test lp.registry -t xx-distroseries-index
}}}

== Demo and Q/A ==

Browse to /ubuntu/+series and look at the series descriptions. There should now be a clear, sensible distinction between succession and derivation.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/registry/templates/distroseries-details.pt
  lib/lp/registry/stories/distroseries/xx-distroseries-index.txt
  lib/lp/registry/templates/distribution-series.pt

[Jeroen T. Vermeulen (jtv)]

(17:51:14) bigjools: jtv: I am +1 on successor
(17:51:22) jtv: Great, thanks.
(17:51:24) bigjools: just self-review your branch and land it
(17:51:29) jtv: OK

review: Approve

=== modified file 'lib/lp/registry/stories/distroseries/xx-distroseries-index.txt'
--- lib/lp/registry/stories/distroseries/xx-distroseries-index.txt	2011-06-07 13:41:39 +0000
+++ lib/lp/registry/stories/distroseries/xx-distroseries-index.txt	2011-08-11 06:53:28 +0000
@@ -67,7 +67,7 @@
     Project drivers: Jeff Waugh, Mark Shuttleworth
     Release manager: Jeff Waugh
     Status: Pre-release Freeze
-    Derives from: Woody (3.0)
+    Successor to: Woody (3.0)
     Source packages: No sources imported or published.
     Binary packages: No binaries imported or published.
 
 
=== modified file 'lib/lp/registry/templates/distribution-series.pt'
--- lib/lp/registry/templates/distribution-series.pt	2011-05-14 15:02:13 +0000
+++ lib/lp/registry/templates/distribution-series.pt	2011-08-11 06:53:28 +0000
@@ -29,7 +29,7 @@
              tal:content="series/named_version" /></strong>
             <em><span tal:replace="series/status/title" /></em>
             <tal:derives condition="series/previous_series">
-              <br />Derives from
+              <br />Successor to
               <a tal:attributes="href series/previous_series/fmt:url">
                 <tal:distro
                   replace="series/previous_series/distribution/displayname" />
 
=== modified file 'lib/lp/registry/templates/distroseries-details.pt'
--- lib/lp/registry/templates/distroseries-details.pt	2011-06-07 13:41:39 +0000
+++ lib/lp/registry/templates/distroseries-details.pt	2011-08-11 06:53:28 +0000
@@ -50,15 +50,15 @@
         tal:condition="not:request/features/soyuz.derived_series_ui.enabled">
 
     <dl>
-      <dt>Derives from:</dt>
+      <dt>Successor to:</dt>
       <dd>
         <a
           tal:condition="context/previous_series"
           tal:attributes="href context/previous_series/fmt:url"
           tal:content="context/previous_series/named_version" />
         <tal:none condition="not: context/previous_series">
-          <tal:name replace="context/named_version"/> is not derived from
-          another series.
+          <tal:name replace="context/named_version"/>
+          did not succeed any earlier series.
         </tal:none>
       </dd>
     </dl>