View | Details | Raw Unified | Return to bug 35504
Collapse All | Expand All

(-)a/about.pl (-7 / +24 lines)
Lines 767-779 my $contributors = Link Here
767
delete $contributors->{_others_};
767
delete $contributors->{_others_};
768
for my $version ( sort { $a <=> $b } keys %{$teams->{team}} ) {
768
for my $version ( sort { $a <=> $b } keys %{$teams->{team}} ) {
769
    for my $role ( keys %{ $teams->{team}->{$version} } ) {
769
    for my $role ( keys %{ $teams->{team}->{$version} } ) {
770
        my $detail = $teams->{team}->{$version}->{$role};
770
        my $normalized_role = "$role";
771
        my $normalized_role = "$role";
771
        $normalized_role =~ s/s$//;
772
        $normalized_role =~ s/s$//;
772
        if ( ref( $teams->{team}->{$version}->{$role} ) eq 'ARRAY' ) {
773
        if ( ref( $detail ) eq 'ARRAY' ) {
773
            for my $contributor ( @{ $teams->{team}->{$version}->{$role} } ) {
774
            for my $contributor ( @{ $detail } ) {
775
776
                my $localized_role = $normalized_role;
777
                if ( my $subversion = $contributor->{version} ) {
778
                    $localized_role .= ':' . $subversion;
779
                }
780
                if ( my $area = $contributor->{area} ) {
781
                    $localized_role .= ':' . $area;
782
                }
783
774
                my $name = $contributor->{name};
784
                my $name = $contributor->{name};
775
                # Add role to contributors
785
                # Add role to contributors
776
                push @{ $contributors->{$name}->{roles}->{$normalized_role} },
786
                push @{ $contributors->{$name}->{roles}->{$localized_role} },
777
                  $version;
787
                  $version;
778
                # Add openhub to teams
788
                # Add openhub to teams
779
                if ( exists( $contributors->{$name}->{openhub} ) ) {
789
                if ( exists( $contributors->{$name}->{openhub} ) ) {
Lines 782-803 for my $version ( sort { $a <=> $b } keys %{$teams->{team}} ) { Link Here
782
            }
792
            }
783
        }
793
        }
784
        elsif ( $role eq 'release_date' ) {
794
        elsif ( $role eq 'release_date' ) {
785
            $teams->{team}->{$version}->{$role} = DateTime->from_epoch( epoch => $teams->{team}->{$version}->{$role});
795
            $teams->{team}->{$version}->{$role} = DateTime->from_epoch( epoch => $teams->{team}->{$version}->{$role} );
786
        }
796
        }
787
        elsif ( $role eq 'codename' ) {
797
        elsif ( $role eq 'codename' ) {
788
            if ( $version == $short_version ) {
798
            if ( $version == $short_version ) {
789
                $codename = $teams->{team}->{$version}->{$role};
799
                $codename = $detail;
790
            }
800
            }
791
            next;
801
            next;
792
        }
802
        }
793
        else {
803
        else {
794
            my $name = $teams->{team}->{$version}->{$role}->{name};
804
            if ( my $subversion = $detail->{version} ) {
805
                $normalized_role .= ':' . $subversion;
806
            }
807
            if ( my $area = $detail->{area} ) {
808
                $normalized_role .= ':' . $area;
809
            }
810
811
            my $name = $detail->{name};
795
            # Add role to contributors
812
            # Add role to contributors
796
            push @{ $contributors->{$name}->{roles}->{$normalized_role} },
813
            push @{ $contributors->{$name}->{roles}->{$normalized_role} },
797
              $version;
814
              $version;
798
            # Add openhub to teams
815
            # Add openhub to teams
799
            if ( exists( $contributors->{$name}->{openhub} ) ) {
816
            if ( exists( $contributors->{$name}->{openhub} ) ) {
800
                $teams->{team}->{$version}->{$role}->{openhub} =
817
                $detail->{openhub} =
801
                  $contributors->{$name}->{openhub};
818
                  $contributors->{$name}->{openhub};
802
            }
819
            }
803
        }
820
        }
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc (-2 / +8 lines)
Lines 1-5 Link Here
1
[%- BLOCK role -%]
1
[%- BLOCK role -%]
2
  [%- SWITCH role.key -%]
2
  [% matches = role.key.match('(\w+):?(.*)?') %]
3
  [% ro = matches.0 %]
4
  [% ex = matches.1 %]
5
  [%- SWITCH ro -%]
3
    [%- CASE 'manager'               -%]<span>Release manager</span>
6
    [%- CASE 'manager'               -%]<span>Release manager</span>
4
    [%- CASE 'manager_assistant'     -%]<span>Release manager assistant</span>
7
    [%- CASE 'manager_assistant'     -%]<span>Release manager assistant</span>
5
    [%- CASE 'manager_mentor'        -%]<span>Release manager mentor</span>
8
    [%- CASE 'manager_mentor'        -%]<span>Release manager mentor</span>
Lines 27-33 Link Here
27
    [%- CASE 'live_cd'               -%]<span>Live CD maintainer</span>
30
    [%- CASE 'live_cd'               -%]<span>Live CD maintainer</span>
28
    [%- CASE 'accessibility_advocate'-%]<span>Accessibility advocate</span>
31
    [%- CASE 'accessibility_advocate'-%]<span>Accessibility advocate</span>
29
    [%- CASE 'meeting_facilitator'   -%]<span>Meeting facilitator</span>
32
    [%- CASE 'meeting_facilitator'   -%]<span>Meeting facilitator</span>
33
    [%- CASE 'ktd'                   -%]<span>Developer tooling</span>
34
    [%- CASE 'website'               -%]<span>Website administrator</span>
35
    [%- CASE -%]<span>MISSING MAP FOR ROLE: [% role.key | html %]</span>
30
  [%- END -%]
36
  [%- END -%]
37
  [%- IF ex %] - [% ex | html %][% END -%]
31
[%- END -%]
38
[%- END -%]
32
39
33
[%- BLOCK person -%]
40
[%- BLOCK person -%]
34
- 

Return to bug 35504