From 197a7ae6776cc91f16d29937e270effc91af6266 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Tue, 12 Dec 2023 11:48:47 +0000
Subject: [PATCH] Bug 35504: Corrections to team

Correction of 'advocate' to 'advocates' to ensure they appear in the
team.

Addition of 'website' and 'wiki' handling to ensure they also appear
in the team.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 docs/teams.yaml                               |  2 +-
 .../prog/en/includes/about-team.inc           | 53 ++++++++++++++++---
 2 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/docs/teams.yaml b/docs/teams.yaml
index 7e875afffff..fc271aac03e 100644
--- a/docs/teams.yaml
+++ b/docs/teams.yaml
@@ -1336,7 +1336,7 @@ team:
         name: Matthias Meusburger
       - area: CAS
         name: Matthias Meusburger
-    accessibility_advocate:
+    accessibility_advocates:
       - name: Matt Blenkinsop
       - name: Lucas Gass
     bugwrangler:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
index f53c6794ebb..89ca110b1eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
@@ -69,8 +69,7 @@
 
       [% ELSE %]
             <p>This is the team who are responsible for the next release of Koha and the ongoing maintenance of your
-            currently installed Koha version. They will be in these roles up until <strong>[% t.release_date | $KohaDates %]</strong>, when the next
-            team will be elected.</p>
+            currently installed Koha version. They will be in these roles up until <strong>[% t.release_date | $KohaDates %]</strong>, when the next team will be elected.</p>
 
             [% FOREACH m IN t.maintainer %]
                 [% IF m.version == ( v ) %]
@@ -139,12 +138,6 @@
         </li>
         [% END %]
 
-        [% IF t.newsletter %]
-        <li><strong>Newsletter editor:</strong>
-            [% INCLUDE person p=t.newsletter %]
-        </li>
-        [% END %]
-
         [% IF t.translation %]
         <li><strong>Translation manager:</strong>
             [% INCLUDE person p=t.translation %]
@@ -177,6 +170,22 @@
             [% END %]
         [% END %]
 
+        [% IF t.packaging_assistant %]
+            [% IF t.packaging_assistant.size / 2 == 1 %]
+            <li><strong>Packaging assistant:</strong>
+                [% INCLUDE person p=t.packaging_assistant %]
+            </li>
+            [% ELSE %]
+            <li><strong>Packaging assistants:</strong>
+                <ul>
+                    [% FOREACH pa IN t.packaging_assistant %]
+                    <li>[% INCLUDE person p = pa %]</li>
+                    [% END %]
+                </ul>
+            </li>
+            [% END %]
+        [% END %]
+
         [% IF t.ci %]
             [% IF t.ci.size == 1 %]
             <li><strong>Jenkins maintainer:</strong>
@@ -217,6 +226,34 @@
         </li>
         [% END %]
 
+        [% IF t.newsletter %]
+        <li><strong>Newsletter editor:</strong>
+            [% INCLUDE person p=t.newsletter %]
+        </li>
+        [% END %]
+
+        [% IF t.website %]
+        <li><strong>Website maintainer:</strong>
+            [% INCLUDE person p=t.website %]
+        </li>
+        [% END %]
+
+        [% IF t.wiki %]
+            [% IF t.wiki.size == 1 %]
+            <li><strong>Wiki manager:</strong>
+                [% INCLUDE person p=t.wiki %]
+            </li>
+            [% ELSE %]
+            <li><strong>Wiki team:</strong>
+                <ul>
+                    [% FOREACH wi IN t.wiki %]
+                    <li>[% INCLUDE person p = wi %]</li>
+                    [% END %]
+                </ul>
+            </li>
+            [% END %]
+        [% END %]
+
       [% IF v != 'release' %]
 
         <li><strong>Release manager:</strong>
-- 
2.43.0