From 48794978279a6b0e6bf0383224b392ff74922c22 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 11 Apr 2019 13:35:22 +0100 Subject: [PATCH] Bug 21662: Use contributors.yaml for contributors list Content-Type: text/plain; charset=utf-8 Signed-off-by: Marcel de Rooy --- about.pl | 41 ++- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 419 +++-------------------- 2 files changed, 83 insertions(+), 377 deletions(-) diff --git a/about.pl b/about.pl index b5edf5689f..8b1a55bbf5 100755 --- a/about.pl +++ b/about.pl @@ -32,7 +32,7 @@ use XML::Simple; use Config; use Search::Elasticsearch; use Try::Tiny; -use YAML; +use YAML::XS qw/LoadFile/; use C4::Output; use C4::Auth; @@ -520,9 +520,7 @@ $template->param( table => $table ); ## ------------------------------------------ -## Koha time line code - -#get file location +## Koha contributions my $docdir; if ( defined C4::Context->config('docdir') ) { $docdir = C4::Context->config('docdir'); @@ -532,6 +530,41 @@ if ( defined C4::Context->config('docdir') ) { $docdir = C4::Context->config('intranetdir') . '/docs'; } +## Contributors +my $contributors = LoadFile("$docdir"."/contributors.yaml"); +my @people = map { + { + name => $_, + ( + exists( $contributors->{$_}->{openhub} ) + ? ( openhub => $contributors->{$_}->{openhub} ) + : () + ), + ( + exists( $contributors->{$_}->{roles} ) + ? ( roles => $contributors->{$_}->{roles} ) + : () + ), + ( + exists( $contributors->{$_}->{commits} ) + ? ( commits => $contributors->{$_}->{commits} ) + : () + ), + ( + exists( $contributors->{$_}->{notes} ) + ? ( notes => $contributors->{$_}->{notes} ) + : () + ) + } +} sort { + my ($alast) = $a =~ /(\S+)$/; + my ($blast) = $b =~ /(\S+)$/; + lc($alast) cmp lc($blast) +} keys %{$contributors}; + +$template->param( contributors => \@people ); + +## Timeline if ( open( my $file, "<:encoding(UTF-8)", "$docdir" . "/history.txt" ) ) { my $i = 0; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index 7aa2584066..72324903f8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -470,380 +470,12 @@

Koha development team

+
+

Contributing companies and institutions