Attachment 160754 Details for Bug 35504 – Bug 35504: Corrections to team

[patch] Bug 35504: Corrections to team

Bug-35504-Corrections-to-team.patch (text/plain), 3.93 KB, created by Martin Renvoize (ashimema) on 2024-01-10 11:44:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-01-10 11:44:55 UTC

Size: 3.93 KB

patch

obsolete

>From 0a3a6b4349d2631278d50461c6860fa76bdf52c5 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>
>Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
>---
> 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 %]
> 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 @@
> </li>
> [% END %]
> 
>- [% IF t.newsletter %]
>- <li>Newsletter editor:
>- [% INCLUDE person p=t.newsletter %]
>- </li>
>- [% END %]
>-
> [% IF t.translation %]
> <li>Translation manager:
> [% INCLUDE person p=t.translation %]
>@@ -177,6 +170,22 @@
> [% END %]
> [% END %]
> 
>+ [% IF t.packaging_assistant %]
>+ [% IF t.packaging_assistant.size / 2 == 1 %]
>+ <li>Packaging assistant:
>+ [% INCLUDE person p=t.packaging_assistant %]
>+ </li>
>+ [% ELSE %]
>+ <li>Packaging assistants:
>+ <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>Jenkins maintainer:
>@@ -217,6 +226,34 @@
> </li>
> [% END %]
> 
>+ [% IF t.newsletter %]
>+ <li>Newsletter editor:
>+ [% INCLUDE person p=t.newsletter %]
>+ </li>
>+ [% END %]
>+
>+ [% IF t.website %]
>+ <li>Website maintainer:
>+ [% INCLUDE person p=t.website %]
>+ </li>
>+ [% END %]
>+
>+ [% IF t.wiki %]
>+ [% IF t.wiki.size == 1 %]
>+ <li>Wiki manager:
>+ [% INCLUDE person p=t.wiki %]
>+ </li>
>+ [% ELSE %]
>+ <li>Wiki team:
>+ <ul>
>+ [% FOREACH wi IN t.wiki %]
>+ <li>[% INCLUDE person p = wi %]</li>
>+ [% END %]
>+ </ul>
>+ </li>
>+ [% END %]
>+ [% END %]
>+
> [% IF v != 'release' %]
> 
> <li>Release manager:
>-- 
>2.43.0

Actions: View | Diff | Splinter Review

Attachments on bug 35504: 159624 | 159726 | 159727 | 159730 | 159731 | 159732 | 159733 | 159915 | 159916 | 159917 | 159918 | 160463 | 160464 | 160465 | 160466 | 160752 | 160753 | 160754 | 160755 | 160756 | 160757 | 160758 | 160764 | 160765 | 160766