Merge ~ines-almeida/launchpad:update-copyright-date-across-launchpad into launchpad:master

Proposed by Ines Almeida
Status: Superseded
Proposed branch: ~ines-almeida/launchpad:update-copyright-date-across-launchpad
Merge into: launchpad:master
Diff against target: 210 lines (+17/-17)
16 files modified
LICENSE (+1/-1)
doc/conf.py (+1/-1)
lib/lp/app/stories/basics/copyright.rst (+2/-2)
lib/lp/app/templates/base-layout-macros.pt (+1/-1)
lib/lp/app/tour/api (+1/-1)
lib/lp/app/tour/branch-hosting-tracking (+1/-1)
lib/lp/app/tour/bugs (+1/-1)
lib/lp/app/tour/community (+1/-1)
lib/lp/app/tour/community-support (+1/-1)
lib/lp/app/tour/feature-tracking (+1/-1)
lib/lp/app/tour/index (+1/-1)
lib/lp/app/tour/join-launchpad (+1/-1)
lib/lp/app/tour/ppa (+1/-1)
lib/lp/app/tour/release-management (+1/-1)
lib/lp/app/tour/translation (+1/-1)
lib/lp/services/librarianserver/web.py (+1/-1)
Reviewer Review Type Date Requested Status
Launchpad code reviewers Pending
Review via email: mp+460927@code.launchpad.net

This proposal has been superseded by a proposal from 2024-02-21.

Commit message

Update Canonical Copyright message from 2004-2023 to 2004-2024 in the frontend

Description of the change

Note that in this MP we are not updating the copyright message in every code file, only the ones more user facing

To post a comment you must log in.

Unmerged commits

fd50903... by Ines Almeida

Update Canonical Copyright message from 2004-2023 to 2004-2024

Succeeded
[SUCCEEDED] docs:0 (build)
[SUCCEEDED] lint:0 (build)
[SUCCEEDED] mypy:0 (build)
13 of 3 results

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/LICENSE b/LICENSE
2index 2f2a36e..0eb4bd2 100644
3--- a/LICENSE
4+++ b/LICENSE
5@@ -1,4 +1,4 @@
6-Launchpad is Copyright 2004-2023 Canonical Ltd.
7+Launchpad is Copyright 2004-2024 Canonical Ltd.
8
9 Canonical Ltd ("Canonical") distributes the Launchpad source code
10 under the GNU Affero General Public License, version 3 ("AGPLv3").
11diff --git a/doc/conf.py b/doc/conf.py
12index 3f6130a..402b689 100644
13--- a/doc/conf.py
14+++ b/doc/conf.py
15@@ -38,7 +38,7 @@ master_doc = "index"
16
17 # General information about the project.
18 project = "Launchpad"
19-copyright = "2004-2023, Canonical Ltd."
20+copyright = "2004-2024, Canonical Ltd."
21
22 # The version info for the project you're documenting, acts as replacement for
23 # |version| and |release|, also used in various other places throughout the
24diff --git a/lib/lp/app/stories/basics/copyright.rst b/lib/lp/app/stories/basics/copyright.rst
25index 650ed8f..c1ca21e 100644
26--- a/lib/lp/app/stories/basics/copyright.rst
27+++ b/lib/lp/app/stories/basics/copyright.rst
28@@ -9,11 +9,11 @@ The tour pages.
29 ... find_tag_by_id(browser.contents, "footer-navigation")
30 ... )
31 ... )
32- Next...© 2004-2023 Canonical Ltd...
33+ Next...© 2004-2024 Canonical Ltd...
34
35 The main template.
36
37 >>> browser.open("http://launchpad.test")
38 >>> print(extract_text(find_tag_by_id(browser.contents, "footer")))
39- © 2004-2023 Canonical Ltd.
40+ © 2004-2024 Canonical Ltd.
41 ...
42diff --git a/lib/lp/app/templates/base-layout-macros.pt b/lib/lp/app/templates/base-layout-macros.pt
43index e9c2b1d..8286272 100644
44--- a/lib/lp/app/templates/base-layout-macros.pt
45+++ b/lib/lp/app/templates/base-layout-macros.pt
46@@ -285,7 +285,7 @@
47 </div>
48
49 <div class="colophon">
50- &copy; 2004-2023
51+ &copy; 2004-2024
52 <a href="http://canonical.com/">Canonical&nbsp;Ltd.</a>
53 &nbsp;&bull;&nbsp;
54 <a tal:attributes="href string:${rooturl}legal">Terms of use</a>
55diff --git a/lib/lp/app/tour/api b/lib/lp/app/tour/api
56index fbcf04f..66b1fed 100644
57--- a/lib/lp/app/tour/api
58+++ b/lib/lp/app/tour/api
59@@ -129,7 +129,7 @@ We've even done the hard work for you: use our LGPL Python library &mdash; <a hr
60 <a href="feature-tracking" accesskey="g" tabindex="5">Next</a>
61 </li>
62 <li class="copyright">
63- &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
64+ &copy; 2004-2024 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
65 </li>
66 </ul>
67 </div>
68diff --git a/lib/lp/app/tour/branch-hosting-tracking b/lib/lp/app/tour/branch-hosting-tracking
69index 4c96458..79342dc 100644
70--- a/lib/lp/app/tour/branch-hosting-tracking
71+++ b/lib/lp/app/tour/branch-hosting-tracking
72@@ -125,7 +125,7 @@ All team members can commit to a centrally hosted branch, while anyone can still
73 <a href="translation" accesskey="g" tabindex="5" title="Read about software translation in Launchpad">Next</a>
74 </li>
75 <li class="copyright">
76- &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
77+ &copy; 2004-2024 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
78 </li>
79 </ul>
80 </div>
81diff --git a/lib/lp/app/tour/bugs b/lib/lp/app/tour/bugs
82index 721d914..556af81 100644
83--- a/lib/lp/app/tour/bugs
84+++ b/lib/lp/app/tour/bugs
85@@ -132,7 +132,7 @@ And to help find low-hanging fruit, there&rsquo;s a &ldquo;Bugs fixed elsewhere&
86 <a href="branch-hosting-tracking" accesskey="g" tabindex="5" title="Read about code hosting and review in Launchpad">Next</a>
87 </li>
88 <li class="copyright">
89- &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a>
90+ &copy; 2004-2024 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a>
91 </li>
92 </ul>
93 </div>
94diff --git a/lib/lp/app/tour/community b/lib/lp/app/tour/community
95index 8ab7c15..5da7018 100644
96--- a/lib/lp/app/tour/community
97+++ b/lib/lp/app/tour/community
98@@ -111,7 +111,7 @@ Launchpad also helps you organise the social structure of your community with a
99 <a href="ppa" accesskey="g" tabindex="5" title="Read about building and distributing Ubuntu packages">Next</a>
100 </li>
101 <li class="copyright">
102- &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
103+ &copy; 2004-2024 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
104 </li>
105 </ul>
106 </div>
107diff --git a/lib/lp/app/tour/community-support b/lib/lp/app/tour/community-support
108index 3214d5e..6265998 100644
109--- a/lib/lp/app/tour/community-support
110+++ b/lib/lp/app/tour/community-support
111@@ -104,7 +104,7 @@
112 <a href="api" tabindex="5" accesskey="g">Next</a>
113 </li>
114 <li class="copyright">
115- &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
116+ &copy; 2004-2024 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
117 </li>
118 </ul>
119 </div>
120diff --git a/lib/lp/app/tour/feature-tracking b/lib/lp/app/tour/feature-tracking
121index b158f47..fd1210f 100644
122--- a/lib/lp/app/tour/feature-tracking
123+++ b/lib/lp/app/tour/feature-tracking
124@@ -86,7 +86,7 @@
125 <a href="release-management" accesskey="g" tabindex="5" title="Read about managing software releases">Next</a>
126 </li>
127 <li class="copyright">
128- &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
129+ &copy; 2004-2024 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
130 </li>
131 </ul>
132 </div>
133diff --git a/lib/lp/app/tour/index b/lib/lp/app/tour/index
134index 793348e..f0f9e6c 100644
135--- a/lib/lp/app/tour/index
136+++ b/lib/lp/app/tour/index
137@@ -172,7 +172,7 @@
138 <a href="bugs" accesskey="l" tabindex="10" title="Read about bug tracking in Launchpad">Next</a>
139 </li>
140 <li class="copyright">
141- &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a>
142+ &copy; 2004-2024 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a>
143 </li>
144 </ul>
145 </div>
146diff --git a/lib/lp/app/tour/join-launchpad b/lib/lp/app/tour/join-launchpad
147index c2ecae9..42b3d91 100644
148--- a/lib/lp/app/tour/join-launchpad
149+++ b/lib/lp/app/tour/join-launchpad
150@@ -107,7 +107,7 @@ Launchpad is free to use for <a href="https://help.launchpad.net/Legal/ProjectLi
151 <a href="index" title="Return to the start of the Launchpad tour" accesskey="g" tabindex="5">Start</a>
152 </li>
153 <li class="copyright">
154- &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
155+ &copy; 2004-2024 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
156 </li>
157 </ul>
158 </div>
159diff --git a/lib/lp/app/tour/ppa b/lib/lp/app/tour/ppa
160index d2a9f50..52e04e4 100644
161--- a/lib/lp/app/tour/ppa
162+++ b/lib/lp/app/tour/ppa
163@@ -111,7 +111,7 @@
164 <a href="community-support" accesskey="g" tabindex="5">Next</a>
165 </li>
166 <li class="copyright">
167- &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
168+ &copy; 2004-2024 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
169 </li>
170 </ul>
171 </div>
172diff --git a/lib/lp/app/tour/release-management b/lib/lp/app/tour/release-management
173index a6f04be..f691dff 100644
174--- a/lib/lp/app/tour/release-management
175+++ b/lib/lp/app/tour/release-management
176@@ -94,7 +94,7 @@ Launchpad calls these <em>series</em> and helps you to organise your work &mdash
177 <a href="join-launchpad" title="Read about commercial features and free access to Launchpad" accesskey="g" tabindex="5" title="Read about commercial features and free access to Launchpad">Next</a>
178 </li>
179 <li class="copyright">
180- &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
181+ &copy; 2004-2024 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
182 </li>
183 </ul>
184 </div>
185diff --git a/lib/lp/app/tour/translation b/lib/lp/app/tour/translation
186index d7f9c88..011c666 100644
187--- a/lib/lp/app/tour/translation
188+++ b/lib/lp/app/tour/translation
189@@ -111,7 +111,7 @@
190 <a href="community" accesskey="g" tabindex="5" title="Read about mailing lists and teams in Launchpad">Next</a>
191 </li>
192 <li class="copyright">
193- &copy; 2004-2023 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
194+ &copy; 2004-2024 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
195 </li>
196 </ul>
197 </div>
198diff --git a/lib/lp/services/librarianserver/web.py b/lib/lp/services/librarianserver/web.py
199index f027cfd..d017496 100644
200--- a/lib/lp/services/librarianserver/web.py
201+++ b/lib/lp/services/librarianserver/web.py
202@@ -31,7 +31,7 @@ defaultResource = static.Data(
203 file repository used by
204 <a href="https://launchpad.net/">Launchpad</a>.
205 </p>
206- <p><small>Copyright 2004-2023 Canonical Ltd.</small></p>
207+ <p><small>Copyright 2004-2024 Canonical Ltd.</small></p>
208 <!-- kthxbye. -->
209 </body></html>
210 """,

Subscribers

People subscribed via source and target branches

to status/vote changes: