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

Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: 13667
Proposed branch: lp:~jtv/launchpad/bug-812667
Merge into: lp:launchpad
Diff against target: 48 lines (+5/-5)
3 files modified
lib/lp/registry/stories/distroseries/xx-distroseries-index.txt (+1/-1)
lib/lp/registry/templates/distribution-series.pt (+1/-1)
lib/lp/registry/templates/distroseries-details.pt (+3/-3)
To merge this branch: bzr merge lp:~jtv/launchpad/bug-812667
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) Approve
Review via email: mp+71157@code.launchpad.net

Commit message

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

Description of the change

= 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

To post a comment you must log in.
Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

(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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
67 Project drivers: Jeff Waugh, Mark Shuttleworth67 Project drivers: Jeff Waugh, Mark Shuttleworth
68 Release manager: Jeff Waugh68 Release manager: Jeff Waugh
69 Status: Pre-release Freeze69 Status: Pre-release Freeze
70 Derives from: Woody (3.0)70 Successor to: Woody (3.0)
71 Source packages: No sources imported or published.71 Source packages: No sources imported or published.
72 Binary packages: No binaries imported or published.72 Binary packages: No binaries imported or published.
7373
7474
=== 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 @@
29 tal:content="series/named_version" /></strong>29 tal:content="series/named_version" /></strong>
30 <em><span tal:replace="series/status/title" /></em>30 <em><span tal:replace="series/status/title" /></em>
31 <tal:derives condition="series/previous_series">31 <tal:derives condition="series/previous_series">
32 <br />Derives from32 <br />Successor to
33 <a tal:attributes="href series/previous_series/fmt:url">33 <a tal:attributes="href series/previous_series/fmt:url">
34 <tal:distro34 <tal:distro
35 replace="series/previous_series/distribution/displayname" />35 replace="series/previous_series/distribution/displayname" />
3636
=== 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 @@
50 tal:condition="not:request/features/soyuz.derived_series_ui.enabled">50 tal:condition="not:request/features/soyuz.derived_series_ui.enabled">
5151
52 <dl>52 <dl>
53 <dt>Derives from:</dt>53 <dt>Successor to:</dt>
54 <dd>54 <dd>
55 <a55 <a
56 tal:condition="context/previous_series"56 tal:condition="context/previous_series"
57 tal:attributes="href context/previous_series/fmt:url"57 tal:attributes="href context/previous_series/fmt:url"
58 tal:content="context/previous_series/named_version" />58 tal:content="context/previous_series/named_version" />
59 <tal:none condition="not: context/previous_series">59 <tal:none condition="not: context/previous_series">
60 <tal:name replace="context/named_version"/> is not derived from60 <tal:name replace="context/named_version"/>
61 another series.61 did not succeed any earlier series.
62 </tal:none>62 </tal:none>
63 </dd>63 </dd>
64 </dl>64 </dl>