From 624a2658c34f44bb9d2e099387ba75fbe0bcafd4 Mon Sep 17 00:00:00 2001 From: Martin Renvoize 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. --- 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 b3412672bcc..1cc2921c67b 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 %]

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 [% t.release_date | $KohaDates %], when the next - team will be elected.

+ currently installed Koha version. They will be in these roles up until [% t.release_date | $KohaDates %], when the next team will be elected.

[% FOREACH m IN t.maintainer %] [% IF m.version == ( v ) %] @@ -139,12 +138,6 @@ [% END %] - [% IF t.newsletter %] -
  • Newsletter editor: - [% INCLUDE person p=t.newsletter %] -
  • - [% END %] - [% IF t.translation %]
  • Translation manager: [% INCLUDE person p=t.translation %] @@ -177,6 +170,22 @@ [% END %] [% END %] + [% IF t.packaging_assistant %] + [% IF t.packaging_assistant.size / 2 == 1 %] +
  • Packaging assistant: + [% INCLUDE person p=t.packaging_assistant %] +
  • + [% ELSE %] +
  • Packaging assistants: + +
  • + [% END %] + [% END %] + [% IF t.ci %] [% IF t.ci.size == 1 %]
  • Jenkins maintainer: @@ -217,6 +226,34 @@
  • [% END %] + [% IF t.newsletter %] +
  • Newsletter editor: + [% INCLUDE person p=t.newsletter %] +
  • + [% END %] + + [% IF t.website %] +
  • Website maintainer: + [% INCLUDE person p=t.website %] +
  • + [% END %] + + [% IF t.wiki %] + [% IF t.wiki.size == 1 %] +
  • Wiki manager: + [% INCLUDE person p=t.wiki %] +
  • + [% ELSE %] +
  • Wiki team: + +
  • + [% END %] + [% END %] + [% IF v != 'release' %]
  • Release manager: -- 2.43.0