Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 32775: (QA follow-up) Fix tab and indenting issues

Browse source 
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 27dc268af3)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
This commit is contained in:
Martin Renvoize 2023-02-02 12:44:44 +00:00 committed by Pedro Amorim
parent 7cd7495f0d
commit 1c4586c7ea
1 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
C4/Languages.pm
View file

@ -376,33 +376,37 @@ sub _build_languages_arrayref {
my %idx = map { $enabled_languages->[$_] => $_ } reverse 0 .. @$enabled_languages-1; my %idx = map { $enabled_languages->[$_] => $_ } reverse 0 .. @$enabled_languages-1;
my @ordered_keys = sort { my @ordered_keys = sort {
my $aa = ''; my $aa = '';
my $bb = ''; my $bb = '';
my $acount = @{$language_groups->{$a}}; my $acount = @{ $language_groups->{$a} };
my $bcount = @{$language_groups->{$b}}; my $bcount = @{ $language_groups->{$b} };
if ( $language_groups->{$a}->[0]->{enabled} ) { if ( $language_groups->{$a}->[0]->{enabled} ) {
$aa = $language_groups->{$a}->[0]->{rfc4646_subtag}; $aa = $language_groups->{$a}->[0]->{rfc4646_subtag};
} elsif ( $acount > 1 ) { }
for ( my $i=1;$i<$acount;$i++ ) { elsif ( $acount > 1 ) {
for ( my $i = 1 ; $i < $acount ; $i++ ) {
if ( $language_groups->{$a}->[$i]->{enabled} ) { if ( $language_groups->{$a}->[$i]->{enabled} ) {
$aa = $language_groups->{$a}->[$i]->{rfc4646_subtag}; $aa = $language_groups->{$a}->[$i]->{rfc4646_subtag};
last; last;
} }
} }
} }
if ( $language_groups->{$b}->[0]->{enabled} ) { if ( $language_groups->{$b}->[0]->{enabled} ) {
$bb = $language_groups->{$b}->[0]->{rfc4646_subtag}; $bb = $language_groups->{$b}->[0]->{rfc4646_subtag};
} elsif ( $bcount > 1 ) { }
for ( my $i=1;$i<$bcount;$i++ ) { elsif ( $bcount > 1 ) {
if ($language_groups->{$b}->[$i]->{enabled} ) { for ( my $i = 1 ; $i < $bcount ; $i++ ) {
if ( $language_groups->{$b}->[$i]->{enabled} ) {
$bb = $language_groups->{$b}->[$i]->{rfc4646_subtag}; $bb = $language_groups->{$b}->[$i]->{rfc4646_subtag};
last; last;
} }
} }
} }
( exists $idx{$aa} and exists $idx{$bb} and ( $idx{$aa} cmp $idx{$bb} ) ) ( exists $idx{$aa}
|| ( exists $idx{$aa} and exists $idx{$bb} ) and exists $idx{$bb}
|| exists $idx{$bb} and ( $idx{$aa} cmp $idx{$bb} ) )
|| ( exists $idx{$aa} and exists $idx{$bb} )
|| exists $idx{$bb}
} keys %$language_groups; } keys %$language_groups;
for my $key ( @ordered_keys ) { for my $key ( @ordered_keys ) {