From 3e12965a6526a4a1edb2720931bd5e06f95e60f4 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Fri, 3 May 2019 11:56:48 +0100
Subject: [PATCH] Bug 21626: Add release dates to team

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 about.pl                                       |  5 ++++-
 docs/teams.yaml                                | 18 ++++++++++++++++++
 .../prog/en/includes/about-team.inc            |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/about.pl b/about.pl
index 894999b959..970761eba4 100755
--- a/about.pl
+++ b/about.pl
@@ -557,7 +557,7 @@ for my $version ( sort { $a <=> $b } keys %{$teams->{team}} ) {
                 }
             }
         }
-        else {
+        elsif ( $role ne 'release_date' ) {
             my $name = $teams->{team}->{$version}->{$role}->{name};
             # Add role to contributors
             push @{ $contributors->{$name}->{roles}->{$normalized_role} },
@@ -568,6 +568,9 @@ for my $version ( sort { $a <=> $b } keys %{$teams->{team}} ) {
                   $contributors->{$name}->{openhub};
             }
         }
+        else {
+            $teams->{team}->{$version}->{$role} = DateTime->from_epoch( epoch => $teams->{team}->{$version}->{$role});
+        }
     }
 }
 
diff --git a/docs/teams.yaml b/docs/teams.yaml
index 690d1c35c4..29f88c9769 100644
--- a/docs/teams.yaml
+++ b/docs/teams.yaml
@@ -26,6 +26,7 @@ team:
       - version: 2.2
         name: Paul Poulain
   3.02:
+    release_date: 1287705600
     manager:
       name: Galen Charlton
     documetation:
@@ -36,6 +37,7 @@ team:
       - version: 3.00
         name: Henri-Damien Laurent
   3.04:
+    release_date: 1271894400
     manager:
       name: Chris Cormack
     qa_manager:
@@ -53,6 +55,7 @@ team:
       - version: 3.02
         name: Chris Nighswonger
   3.06:
+    release_date: 1287705600
     manager:
       name: Chris Cormack
     qa_manager:
@@ -70,6 +73,7 @@ team:
       - version: 3.04
         name: Chris Nighswonger
   3.08:
+    release_date: 1335139200
     manager:
       name: Paul Poulain
     qa_manager:
@@ -97,6 +101,7 @@ team:
     chairperson:
       - name: Brooke Johnson
   3.10:
+    release_date: 1353628800
     manager:
       name: Paul Poulain
     qa_manager:
@@ -132,6 +137,7 @@ team:
     chairperson:
       - name: Brooke Johnson
   3.12:
+    release_date: 1368921600
     manager:
       name: Jared Camins-Esakov
     qa_manager:
@@ -166,6 +172,7 @@ team:
     live_cd:
       name: Vimal Kumar Vazhappally
   3.14:
+    release_date: 1385164800
     manager:
       name: Galen Charlton
     qa_manager:
@@ -207,6 +214,7 @@ team:
     vm:
       name: Samuel Desseaux
   3.16:
+    release_date: 1400716800
     manager:
       name: Galen Charlton
     qa_manager:
@@ -245,6 +253,7 @@ team:
     vm:
       name: Samuel Desseaux
   3.18:
+    release_date: 1417132800
     manager:
       name: Tomás Cohen Arazi
     qa_manager:
@@ -277,6 +286,7 @@ team:
       - version: 3.14
         name: Fridolin Somers
   3.20:
+    release_date: 1432252800
     manager:
       name: Tomás Cohen Arazi
     qa_manager:
@@ -304,6 +314,7 @@ team:
       - version: 3.14
         name: Fridolin Somers
   3.22:
+    release_date: 1448496000
     manager:
       name: Tomás Cohen Arazi
     qa_manager:
@@ -344,6 +355,7 @@ team:
       - version: 3.14
         name: Fridolin Somers
   16.05:
+    release_date: 1464220800
     manager:
       name: Brendan Gallagher
     qa_manager:
@@ -385,6 +397,7 @@ team:
       - version: 3.18
         name: Liz Rea
   16.11:
+    release_date: 1479859200
     manager:
       name: Brendan Gallagher
     manager_assistant:
@@ -424,6 +437,7 @@ team:
       - version: 3.22
         name: Julian Maurice
   17.05:
+    release_date: 1496188800
     manager:
       name: Kyle Hall
     manager_assistant:
@@ -462,6 +476,7 @@ team:
       - version: 3.22
         name: Julian Maurice
   17.11:
+    release_date: 1511827200
     manager:
       name: Jonathan Druart
     qa:
@@ -497,6 +512,7 @@ team:
       - version: 17.05
         name: Fridolin Somers
   18.05:
+    release_date: 1527206400
     manager:
       name: Jonathan Druart
     manager_assistant:
@@ -534,6 +550,7 @@ team:
       - version: 17.05
         name: Fridolin Somers
   18.11:
+    release_date: 1543449600
     manager:
       name: Nick Clemens
     manager_assistants:
@@ -581,6 +598,7 @@ team:
       - version: 17.05
         name: Fridolin Somers
   19.05:
+    release_date: 1558483200
     manager:
       name: Nick Clemens
     manager_assistants:
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 b80182b649..94636470db 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
@@ -64,7 +64,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>DATE</strong>, when the next
+            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>
 
             <li><strong>Release maintainer:</strong>
-- 
2.20.1