Merge branch 'main' into erral-sponsorship-levels

Author: erral

CHANGELOG.md

@@ -1,6 +1,11 @@
-## 1.0.21 (unreleased)
+## 1.0.22 (unreleased)
 
 - Add new sponsorship level
+
+
+## 1.0.21 (2026-01-19)
+
+- Update frontend base image to 20-bookworm slim because Node 18 version is EOL and was removed. [frevdvd]
 - Fix event info block: Move Website URL to separate section with its own heading. [#175]
 - Update to Relstorage 4.2.1
 - Simplify and make mxdev config explicit

frontend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-bookwork-slim as base
+FROM node:20-bookworm-slim as base
 FROM base as builder
 
 RUN apt-get update \

frontend/src/components/layout/Footer/SiteFooter.jsx

@@ -49,7 +49,7 @@ const messages = defineMessages({
   footerInfos: {
     id: 'Footer infos',
     defaultMessage:
-      'The text and illustrations in this website are licensed by the Plone Foundation under a Creative Commons Attribution-ShareAlike 4.0 International license. Plone and the Plone® logo are registered trademarks of the Plone Foundation, registered in the United States and other countries. For guidelines on the permitted uses of the Plone trademarks, see https://plone.org/foundation/logo. All other trademarks are owned by their respective owners.',
+      'The text and illustrations in this website are licensed by the Plone Foundation under a Creative Commons Attribution-ShareAlike 4.0 International license. Plone and the Plone® logo are registered trademarks of the Plone Foundation, registered in the United States and other countries. For guidelines on the permitted uses of the Plone trademarks, see <a href="https://plone.org/foundation/logo">https://plone.org/foundation/logo</a>. All other trademarks are owned by their respective owners.',
   },
 });
 
@@ -163,9 +163,12 @@ const Footer = ({ pathanme }) => {
             <div className="logo">
               <Logo />
             </div>
-            <div className="address">
-              {intl.formatMessage(messages.footerInfos)}
-            </div>
+            <div
+              className="address"
+              dangerouslySetInnerHTML={{
+                __html: intl.formatMessage(messages.footerInfos),
+              }}
+            />
           </div>
         </Container>
       </div>

frontend/src/customizations/volto/components/theme/Footer/Footer.jsx

@@ -20,7 +20,7 @@ const messages = defineMessages({
   footerInfos: {
     id: 'Footer infos',
     defaultMessage:
-      'The text and illustrations in this website are licensed by the Plone Foundation under a Creative Commons Attribution-ShareAlike 4.0 International license. Plone and the Plone® logo are registered trademarks of the Plone Foundation, registered in the United States and other countries. For guidelines on the permitted uses of the Plone trademarks, see https://plone.org/foundation/logo. All other trademarks are owned by their respective owners.',
+      'The text and illustrations in this website are licensed by the Plone Foundation under a Creative Commons Attribution-ShareAlike 4.0 International license. Plone and the Plone® logo are registered trademarks of the Plone Foundation, registered in the United States and other countries. For guidelines on the permitted uses of the Plone trademarks, see <a href="https://plone.org/foundation/logo">https://plone.org/foundation/logo</a>. All other trademarks are owned by their respective owners.',
   },
   cookieSettings: {
     id: 'Cookie settings',
@@ -127,6 +127,11 @@ const Footer = ({ intl }) => {
                   <List.Item>
                     <Link to="/foundation/sponsorship">Sponsors</Link>
                   </List.Item>
+                  <List.Item>
+                    <Link to="/foundation/event-sponsorship">
+                      Apply for Event and Sprint Funds
+                    </Link>
+                  </List.Item>
                   <List.Item>
                     <Link to="/foundation/materials/foundation-resolutions/code-of-conduct">
                       Code of conduct
@@ -219,9 +224,12 @@ const Footer = ({ intl }) => {
             <div className="logo">
               <Logo />
             </div>
-            <div className="address">
-              {intl.formatMessage(messages.footerInfos)}
-            </div>
+            <div
+              className="address"
+              dangerouslySetInnerHTML={{
+                __html: intl.formatMessage(messages.footerInfos),
+              }}
+            />
           </div>
         </Container>
       </div>

version.txt

@@ -1 +1 @@
-1.0.21.dev0
+1.0.22.dev0