more unnecessary parens

[git.ikiwiki.info.git] / IkiWiki / Plugin / po.pm

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 3837ca15e66b39142f4459a23cca91fe16d2d72c..b073845146aa72a4584d94392ec81671cf69a06f 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -10,16 +10,7 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 use Encode;
 use strict;
 use IkiWiki 3.00;
 use Encode;

-BEGIN {
-       eval 'use Locale::Po4a::Common qw(nowrapi18n)';
-       if ($@) {
-               warning(sprintf(gettext('%s is too old, can not disable %s; '.
-                                       'a denial of service can thus be '.
-                                       'triggered by malicious content'),
-                               'Locale::Po4a', 'Text::WrapI18N'));
-               eval 'use Locale::Po4a::Common';
-       }
-}
+use Locale::Po4a::Common qw(nowrapi18n);

 use Locale::Po4a::Chooser;
 use Locale::Po4a::Po;
 use File::Basename;
 use Locale::Po4a::Chooser;
 use Locale::Po4a::Po;
 use File::Basename;


@@ -275,7 +266,7 @@ sub pagetemplate (@) {
                $template->param(percenttranslated => percenttranslated($page));
        }
        if ($template->query(name => "istranslation")) {
                $template->param(percenttranslated => percenttranslated($page));
        }
        if ($template->query(name => "istranslation")) {

-               $template->param(istranslation => scalar istranslation($page));
+               $template->param(istranslation => istranslation($page));

        }
        if ($template->query(name => "istranslatable")) {
                $template->param(istranslatable => istranslatable($page));
        }
        if ($template->query(name => "istranslatable")) {
                $template->param(istranslatable => istranslatable($page));


@@ -388,7 +379,7 @@ sub change(@) {
        # at once. As this more or less doubles the time needed to rebuild the
        # wiki, we do so only when really needed.
 
        # at once. As this more or less doubles the time needed to rebuild the
        # wiki, we do so only when really needed.
 

-       if (scalar @rendered
+       if (@rendered

            && exists $config{rebuild} && defined $config{rebuild} && $config{rebuild}
            && UNIVERSAL::can("IkiWiki::Plugin::meta", "getsetup")
            && exists $config{meta_overrides_page_title}
            && exists $config{rebuild} && defined $config{rebuild} && $config{rebuild}
            && UNIVERSAL::can("IkiWiki::Plugin::meta", "getsetup")
            && exists $config{meta_overrides_page_title}


@@ -474,7 +465,7 @@ sub canrename ($$@) {
                # by looking for the master page in the list of to-be-renamed pages we
                # saved early in the renaming process.
                my $orig_torename = $session->param("po_orig_torename");
                # by looking for the master page in the list of to-be-renamed pages we
                # saved early in the renaming process.
                my $orig_torename = $session->param("po_orig_torename");

-               unless (scalar grep { $_->{src} eq $masterpage } @{$orig_torename}) {
+               unless (grep { $_->{src} eq $masterpage } @{$orig_torename}) {

                        return gettext("Can not rename a translation. Renaming the master page, ".
                                       "though, renames its translations as well.");
                }
                        return gettext("Can not rename a translation. Renaming the master page, ".
                                       "though, renames its translations as well.");
                }


@@ -542,7 +533,7 @@ sub formbuilder (@) {
                        if ($field->type eq 'select') {
                                # remove po from the list of types
                                my @types = grep { $_ ne 'po' } $field->options;
                        if ($field->type eq 'select') {
                                # remove po from the list of types
                                my @types = grep { $_ ne 'po' } $field->options;

-                               $field->options(\@types) if scalar @types;
+                               $field->options(\@types) if @types;

                        }
                        else {
                                # make sure the default value is not po;
                        }
                        else {
                                # make sure the default value is not po;


@@ -668,8 +659,8 @@ sub mycgiurl (@) {
                my $page=shift;
                my $destpage=shift;
 
                my $page=shift;
                my $destpage=shift;
 

-               return ( exists $filtered{$page}{$destpage}
-                        && $filtered{$page}{$destpage} eq 1 );
+               return exists $filtered{$page}{$destpage}
+                        && $filtered{$page}{$destpage} eq 1;

        }
 
        sub setalreadyfiltered($$) {
        }
 
        sub setalreadyfiltered($$) {


@@ -709,7 +700,7 @@ sub istranslatablefile ($) {
        my $file=shift;
 
        return 0 unless defined $file;
        my $file=shift;
 
        return 0 unless defined $file;

-       return 0 if (defined pagetype($file) && pagetype($file) eq 'po');
+       return 0 if defined pagetype($file) && pagetype($file) eq 'po';

        return 0 if $file =~ /\.pot$/;
        return 0 unless -e "$config{srcdir}/$file"; # underlay dirs may be read-only
        return 1 if pagespec_match(pagename($file), $config{po_translatable_pages});
        return 0 if $file =~ /\.pot$/;
        return 0 unless -e "$config{srcdir}/$file"; # underlay dirs may be read-only
        return 1 if pagespec_match(pagename($file), $config{po_translatable_pages});


@@ -727,19 +718,19 @@ sub istranslatable ($) {
 sub _istranslation ($) {
        my $page=shift;
 
 sub _istranslation ($) {
        my $page=shift;
 

-       $page='' unless (defined $page && length $page);
+       $page='' unless defined $page && length $page;

        my $hasleadingslash = ($page=~s#^/##);
        my $file=$pagesources{$page};
        my $hasleadingslash = ($page=~s#^/##);
        my $file=$pagesources{$page};

-       return 0 unless (defined $file
+       return 0 unless defined $file

                         && defined pagetype($file)
                         && defined pagetype($file)

-                        && pagetype($file) eq 'po');
+                        && pagetype($file) eq 'po';

        return 0 if $file =~ /\.pot$/;
 
        my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
        return 0 if $file =~ /\.pot$/;
 
        my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);

-       return 0 unless (defined $masterpage && defined $lang
+       return 0 unless defined $masterpage && defined $lang

                         && length $masterpage && length $lang
                         && defined $pagesources{$masterpage}
                         && length $masterpage && length $lang
                         && defined $pagesources{$masterpage}

-                        && defined $config{po_slave_languages}{$lang});
+                        && defined $config{po_slave_languages}{$lang};

 
        return (maybe_add_leading_slash($masterpage, $hasleadingslash), $lang)
                if istranslatable($masterpage);
 
        return (maybe_add_leading_slash($masterpage, $hasleadingslash), $lang)
                if istranslatable($masterpage);


@@ -753,7 +744,7 @@ sub istranslation ($) {
                $translations{$masterpage}{$lang}=$page unless exists $translations{$masterpage}{$lang};
                return (maybe_add_leading_slash($masterpage, $hasleadingslash), $lang);
        }
                $translations{$masterpage}{$lang}=$page unless exists $translations{$masterpage}{$lang};
                return (maybe_add_leading_slash($masterpage, $hasleadingslash), $lang);
        }

-       return;
+       return "";

 }
 
 sub masterpage ($) {
 }
 
 sub masterpage ($) {


@@ -777,7 +768,7 @@ sub lang ($) {
 sub islanguagecode ($) {
        my $code=shift;
 
 sub islanguagecode ($) {
        my $code=shift;
 

-       return ($code =~ /^[a-z]{2}$/);
+       return $code =~ /^[a-z]{2}$/;

 }
 
 sub otherlanguage ($$) {
 }
 
 sub otherlanguage ($$) {


@@ -792,7 +783,7 @@ sub otherlanguages ($) {
        my $page=shift;
 
        my %ret;
        my $page=shift;
 
        my %ret;

-       return \%ret unless (istranslation($page) || istranslatable($page));
+       return \%ret unless istranslation($page) || istranslatable($page);

        my $curlang=lang($page);
        foreach my $lang
                ($config{po_master_language}{code}, keys %{$config{po_slave_languages}}) {
        my $curlang=lang($page);
        foreach my $lang
                ($config{po_master_language}{code}, keys %{$config{po_slave_languages}}) {


@@ -989,7 +980,7 @@ sub deletetranslations ($) {
                }
        } @todelete;
 
                }
        } @todelete;
 

-       if (scalar @todelete) {
+       if (@todelete) {

                commit_and_refresh(
                        gettext("removed obsolete PO files"),
                        "IkiWiki::Plugin::po::deletetranslations");
                commit_and_refresh(
                        gettext("removed obsolete PO files"),
                        "IkiWiki::Plugin::po::deletetranslations");


@@ -1161,7 +1152,7 @@ sub match_lang ($$;@) {
 
        my $regexp=IkiWiki::glob2re($wanted);
        my $lang=IkiWiki::Plugin::po::lang($page);
 
        my $regexp=IkiWiki::glob2re($wanted);
        my $lang=IkiWiki::Plugin::po::lang($page);

-       if ($lang!~/^$regexp$/i) {
+       if ($lang !~ /^$regexp$/i) {

                return IkiWiki::FailReason->new("file language is $lang, not $wanted");
        }
        else {
                return IkiWiki::FailReason->new("file language is $lang, not $wanted");
        }
        else {