From be601d944ec4eb6a88a3f65a45717dcbb9dd1603 Mon Sep 17 00:00:00 2001
From: Victor Grousset/tuxayo <victor@tuxayo.net>
Date: Thu, 24 Jun 2021 15:47:57 +0200
Subject: [PATCH] Bug 28442: REVERT ALL due to string freeze

Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
---
 docs/teams.yaml                               | 94 +++----------------
 .../prog/en/includes/about-team.inc           | 34 +++----
 2 files changed, 28 insertions(+), 100 deletions(-)

diff --git a/docs/teams.yaml b/docs/teams.yaml
index 2676d64af2..b4aa6a11a5 100644
--- a/docs/teams.yaml
+++ b/docs/teams.yaml
@@ -859,44 +859,44 @@ team:
     manager:
       name: Jonathan Druart
     manager_assistants:
-      - name: Tomás Cohen Arazi
       - name: Martin Renvoize
+      - name: Tomás Cohen Arazi
     qa_manager:
       name: Katrin Fischer
     qa:
-      - name: Tomás Cohen Arazi
-      - name: Nick Clemens
       - name: David Cook
-      - name: Victor Grousset
-      - name: Kyle M Hall
-      - name: Joonas Kylmälä
-      - name: Julian Maurice
-      - name: Josef Moravec
       - name: Agustín Moyano
       - name: Martin Renvoize
       - name: Marcel de Rooy
+      - name: Joonas Kylmälä
+      - name: Julian Maurice
+      - name: Tomás Cohen Arazi
+      - name: Josef Moravec
+      - name: Nick Clemens
+      - name: Kyle M Hall
+      - name: Victor Grousset
     te:
-      - area: REST API
-        name: Tomás Cohen Arazi
       - area: UI Design
         name: Owen Leonard
-      - area: Accounts
-        name: Martin Renvoize
+      - area: REST API
+        name: Tomás Cohen Arazi
       - area: Zebra
         name: Fridolin Somers
+      - area: Accounts
+        name: Martin Renvoize
     accessibility_advocate:
       name: Henry Bolshaw
     bugwrangler:
       - name: Amit Gupta
-      - name: Indranil Das Gupta
       - name: Mengü Yazıcıoğlu
+      - name: Indranil Das Gupta
     documentation:
       name: Caroline Cyr La Rose
     documentation_team:
-      - name: Henry Bolshaw
       - name: Marie-Luce Laflamme
-      - name: David Nind
       - name: Lucy Vaux-Harvey
+      - name: Henry Bolshaw
+      - name: David Nind
     translations:
       - name: Indranil Das Gupta
       - name: Bernardo González Kriegel
@@ -915,67 +915,3 @@ team:
         name: Andrew Fuerste-Henry
       - version: 19.11
         name: Victor Grousset
-  21.11:
-    release_date: 1637539201
-    manager:
-      name: Jonathan Druart
-    manager_assistants:
-      - name: Tomás Cohen Arazi
-      - name: Martin Renvoize
-    maintainer:
-      - version: 21.05
-        name: Kyle M Hall
-      - version: 20.11
-        name: Fridolin Somers
-      - version: 20.05
-        name: Victor Grousset
-      - version: 19.11
-        name: Wainui Witika-Park
-    maintainer_mentors:
-      - version: 19.11
-        name: Aleisha Amohia
-    maintainer_assistants:
-      - version: 21.05
-        name: Nick Clemens
-    qa_manager:
-      name: Katrin Fischer
-    qa:
-      - name: Tomás Cohen Arazi
-      - name: Nick Clemens
-      - name: David Cook
-      - name: Victor Grousset
-      - name: Kyle M Hall
-      - name: Joonas Kylmälä
-      - name: Julian Maurice
-      - name: Agustín Moyano
-      - name: Andrew Nugged
-      - name: Martin Renvoize
-      - name: Marcel de Rooy
-      - name: Petro Vashchuk
-    te:
-      - area: REST API
-        name: Tomás Cohen Arazi
-      - area: UI Design
-        name: Owen Leonard
-      - area: Accounts
-        name: Martin Renvoize
-      - area: Zebra
-        name: Fridolin Somers
-    bugwrangler:
-      - name: Sally Healey
-    documentation:
-      name: David Nind
-    documentation_team:
-      - name: David Nind
-      - name: Lucy Vaux-Harvey
-    meeting_facilitator:
-      - name: Martin Renvoize
-    translations:
-      - name: Bernardo González Kriegel
-    packaging:
-      - name: Mason James
-    ci:
-      - name: Mason James
-    accessibility_advocates:
-      - name: Henry Bolshaw
-      - name: Wainui Witika-Park
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 f0574958e7..0352bc0592 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
@@ -26,7 +26,6 @@
     [%- CASE 'database'              -%]Documentation specialist
     [%- CASE 'live_cd'               -%]Live CD maintainer
     [%- CASE 'accessibility_advocate'-%]Accessibility advocate
-    [%- CASE 'meeting_facilitator'   -%]Meeting facilitator
   [%- END -%]
 [%- END -%]
 
@@ -46,7 +45,7 @@
 [%- BLOCK team -%]
     <ul>
 
-      [% IF v == 'release' %]
+        [% IF v == 'release' %]
             <p>This is the team who were responsible for the initial release of your currently installed Koha version.</p>
 
             <li><strong>Release manager:</strong>
@@ -67,7 +66,7 @@
             </li>
             [% END %]
 
-      [% ELSE %]
+        [% 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>
@@ -95,7 +94,7 @@
                 [% END %]
               [% END %]
             [% END %]
-      [% END %]
+        [% END %]
 
         [% IF t.qa_manager %]
         <li><strong>Quality assurance manager:</strong>
@@ -197,21 +196,7 @@
         </li>
         [% END %]
 
-        [% IF t.accessibility_advocates %]
-        <li><strong>Accessibility advocates:</strong>
-            <ul>
-                [% FOREACH a IN t.accessibility_advocates %]
-                <li>[% INCLUDE person p=a %]</li>
-                [% END %]
-            </ul>
-        </li>
-        [% ELSIF t.accessibility_advocate %]
-        <li><strong>Accessibility advocate:</strong>
-           [% INCLUDE person p=t.accessibility_advocate %]
-        </li>
-        [% END %]
-
-      [% IF v != 'release' %]
+        [% IF v != 'release' %]
 
         <li><strong>Release manager:</strong>
             [% INCLUDE person p=t.manager %]
@@ -231,7 +216,14 @@
         </li>
         [% END %]
 
-      [% ELSE %]
+        [% IF t.accessibility_advocate %]
+        <li><strong>Accessibility advocate:</strong>
+           [% INCLUDE person p=t.accessibility_advocate %]
+        </li>
+        [% END %]
+
+
+        [% ELSE %]
         <li><strong>Release maintainers:</strong>
             <ul>
                 [% FOREACH m IN t.maintainer %]
@@ -254,6 +246,6 @@
                 [% END %]
             </ul>
         </li>
-      [% END %]
+        [% END %]
     </ul>
 [%- END -%]
-- 
2.39.5