urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unnecessary parens

master
Joey Hess 2009-01-26 13:24:33 -05:00
parent c5642119f7
commit 98f0d672df
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
IkiWiki/Plugin/po.pm
View File

@ -709,7 +709,7 @@ sub istranslatablefile ($) {
my $file=shift; my $file=shift;
return 0 unless defined $file; 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 if $file =~ /\.pot$/;
return 0 unless -e "$config{srcdir}/$file"; # underlay dirs may be read-only 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 1 if pagespec_match(pagename($file), $config{po_translatable_pages});
@ -727,19 +727,19 @@ sub istranslatable ($) {
sub _istranslation ($) { sub _istranslation ($) {
my $page=shift; my $page=shift;
$page='' unless (defined $page && length $page); $page='' unless defined $page && length $page;
my $hasleadingslash = ($page=~s#^/##); my $hasleadingslash = ($page=~s#^/##);
my $file=$pagesources{$page}; 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$/; return 0 if $file =~ /\.pot$/;
my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/); 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 && length $masterpage && length $lang
&& defined $pagesources{$masterpage} && defined $pagesources{$masterpage}
&& defined $config{po_slave_languages}{$lang}); && defined $config{po_slave_languages}{$lang};
return (maybe_add_leading_slash($masterpage, $hasleadingslash), $lang) return (maybe_add_leading_slash($masterpage, $hasleadingslash), $lang)
if istranslatable($masterpage); if istranslatable($masterpage);
@ -792,7 +792,7 @@ sub otherlanguages ($) {
my $page=shift; my $page=shift;
my %ret; my %ret;
return \%ret unless (istranslation($page) || istranslatable($page)); return \%ret unless istranslation($page) || istranslatable($page);
my $curlang=lang($page); my $curlang=lang($page);
foreach my $lang foreach my $lang
($config{po_master_language}{code}, keys %{$config{po_slave_languages}}) { ($config{po_master_language}{code}, keys %{$config{po_slave_languages}}) {
@ -1161,7 +1161,7 @@ sub match_lang ($$;@) {
my $regexp=IkiWiki::glob2re($wanted); my $regexp=IkiWiki::glob2re($wanted);
my $lang=IkiWiki::Plugin::po::lang($page); 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"); return IkiWiki::FailReason->new("file language is $lang, not $wanted");
} }
else { else {