Skip to content

Commit

Permalink
Merge pull request #437 from ikedas/issue-434 by ikedas
Browse files Browse the repository at this point in the history 
External module required during `make` #434
  • Loading branch information
@ikedas
ikedas authored Oct 15, 2018
2 parents 6e49079 + 2868a54 commit ebb7307
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 81 deletions.
7 changes: 6 additions & 1 deletion doc/list_config.podpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,12 @@ sub _format {
} elsif (ref $pinfo->{format} eq 'ARRAY') {
$parameters .= "=over\n\n";
foreach my $item (@{$pinfo->{format}}) {
my $desc = Sympa::ListOpt::get_option_description('*', $item);
my $desc =
($Sympa::ListOpt::list_option{$item} || {})->{gettext_id}
|| $item;
$desc =~ s/^\s+//;
$desc =~ s/\s+$//;

$parameters .= sprintf "=item C<%s> - %s\n\n", $item,
_escape_pod($desc);
}
Expand Down
88 changes: 10 additions & 78 deletions src/lib/Sympa/ListOpt.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
# Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
# 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
# Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
# Copyright 2017 The Sympa Community. See the AUTHORS.md file at the top-level
# directory of this distribution and at
# Copyright 2017, 2018 The Sympa Community. See the AUTHORS.md file at the
# top-level directory of this distribution and at
# <https://github.com/sympa-community/sympa.git>.
#
# This program is free software; you can redistribute it and/or modify
Expand All @@ -30,13 +30,8 @@ package Sympa::ListOpt;
use strict;
use warnings;

use Sympa::Language;
use Sympa::Robot;

my $language = Sympa::Language->instance;

# List parameter values except for parameters below.
my %list_option = (
our %list_option = (

# reply_to_header.apply
'forced' => {'gettext_id' => 'overwrite Reply-To: header field'},
Expand Down Expand Up @@ -231,7 +226,7 @@ my %list_option = (
);

# Values for subscriber reception mode.
my %reception_mode = (
our %reception_mode = (
'mail' => {'gettext_id' => 'standard (direct reception)'},
'digest' => {'gettext_id' => 'digest MIME format'},
'digestplain' => {'gettext_id' => 'digest plain text format'},
Expand All @@ -244,86 +239,22 @@ my %reception_mode = (
);

# Values for subscriber visibility mode.
my %visibility_mode = (
our %visibility_mode = (
'noconceal' => {'gettext_id' => 'listed in the list review page'},
'conceal' => {'gettext_id' => 'concealed'}
);

# Values for list status.
my %list_status = (
our %list_status = (
'open' => {'gettext_id' => 'in operation'},
'pending' => {'gettext_id' => 'list not yet activated'},
'error_config' => {'gettext_id' => 'erroneous configuration'},
'family_closed' => {'gettext_id' => 'closed family instance'},
'closed' => {'gettext_id' => 'closed list'},
);

# Old name: Sympa::List::get_option_title().
# Old name: Sympa::ListOpt::get_title().
sub get_option_description {
my $that = shift;
my $option = shift;
my $type = shift || '';
my $withval = shift || 0;

my $title = undef;

if ($type eq 'dayofweek') {
if ($option =~ /\A[0-9]+\z/) {
$title = [
split /:/,
$language->gettext(
'Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday'
)
]->[$option % 7];
}
} elsif ($type eq 'lang') {
$language->push_lang;
if ($language->set_lang($option)) {
$title = $language->native_name;
}
$language->pop_lang;
} elsif ($type eq 'listtopic' or $type eq 'listtopic:leaf') {
my $robot_id;
if (ref $that eq 'Sympa::List') {
$robot_id = $that->{'domain'};
} elsif ($that and $that ne '*') {
$robot_id = $that;
} else {
$robot_id = '*';
}
if ($type eq 'listtopic') {
$title = Sympa::Robot::topic_get_title($robot_id, $option);
} else {
$title =
[Sympa::Robot::topic_get_title($robot_id, $option)]->[-1];
}
} elsif ($type eq 'password') {
return '*' x length($option); # return
} elsif ($type eq 'unixtime') {
$title = $language->gettext_strftime('%d %b %Y at %H:%M:%S',
localtime $option);
} else {
my $map = {
'reception' => \%reception_mode,
'visibility' => \%visibility_mode,
'status' => \%list_status,
}->{$type}
|| \%list_option;
my $t = $map->{$option} || {};
if ($t->{gettext_id}) {
$title = $language->gettext($t->{gettext_id});
$title =~ s/^\s+//;
$title =~ s/\s+$//;
}
}

if (defined $title) {
return sprintf '%s (%s)', $title, $option if $withval;
return $title;
}
return $option;
}
# Deprecated: Moved to Sympa::Template::_get_option_description().
#sub get_option_description;

1;
__END__
Expand All @@ -345,6 +276,8 @@ configuration.
=item get_option_description ( $that, $value, [ $type, [ $withval ] ] )
B<Deprecated>.
I<Function>.
Gets i18n-ed title of option.
Language context must be set in advance (See L<Sympa::Language>).
Expand Down Expand Up @@ -381,7 +314,6 @@ I18n-ed title of option value.
=head1 SEE ALSO
L<Sympa::Language>,
L<Sympa::ListDef>.
=head1 HISTORY
Expand Down
72 changes: 70 additions & 2 deletions src/lib/Sympa/Template.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ use Conf;
use Sympa::HTMLDecorator;
use Sympa::Language;
use Sympa::ListOpt;
use Sympa::Robot;
use Sympa::Tools::Text;

my $language = Sympa::Language->instance;
Expand Down Expand Up @@ -261,12 +262,79 @@ sub _optdesc_func {
return undef unless $x =~ /\S/;
$x =~ s/^\s+//;
$x =~ s/\s+$//;
my $title = Sympa::ListOpt::get_option_description($that, $x, $type,
$withval);
my $title = _get_option_description($that, $x, $type, $withval);
$encode_html ? Sympa::Tools::Text::encode_html($title) : $title;
};
}

# Old name: Sympa::List::get_option_title().
# Old name: Sympa::ListOpt::get_title().
# Old name: Sympa::ListOpt::get_option_description().
sub _get_option_description {
my $that = shift;
my $option = shift;
my $type = shift || '';
my $withval = shift || 0;

my $title = undef;

if ($type eq 'dayofweek') {
if ($option =~ /\A[0-9]+\z/) {
$title = [
split /:/,
$language->gettext(
'Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday'
)
]->[$option % 7];
}
} elsif ($type eq 'lang') {
$language->push_lang;
if ($language->set_lang($option)) {
$title = $language->native_name;
}
$language->pop_lang;
} elsif ($type eq 'listtopic' or $type eq 'listtopic:leaf') {
my $robot_id;
if (ref $that eq 'Sympa::List') {
$robot_id = $that->{'domain'};
} elsif ($that and $that ne '*') {
$robot_id = $that;
} else {
$robot_id = '*';
}
if ($type eq 'listtopic') {
$title = Sympa::Robot::topic_get_title($robot_id, $option);
} else {
$title =
[Sympa::Robot::topic_get_title($robot_id, $option)]->[-1];
}
} elsif ($type eq 'password') {
return '*' x length($option); # return
} elsif ($type eq 'unixtime') {
$title = $language->gettext_strftime('%d %b %Y at %H:%M:%S',
localtime $option);
} else {
my $map = {
'reception' => \%Sympa::ListOpt::reception_mode,
'visibility' => \%Sympa::ListOpt::visibility_mode,
'status' => \%Sympa::ListOpt::list_status,
}->{$type}
|| \%Sympa::ListOpt::list_option;
my $t = $map->{$option} || {};
if ($t->{gettext_id}) {
$title = $language->gettext($t->{gettext_id});
$title =~ s/^\s+//;
$title =~ s/\s+$//;
}
}

if (defined $title) {
return sprintf '%s (%s)', $title, $option if $withval;
return $title;
}
return $option;
}

sub _url_func {
my $self = shift;
my $is_abs = shift;
Expand Down

0 comments on commit ebb7307

Please sign in to comment.