X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/4558457402a4ab6bc795589a2e400fa66144f76e..53b1c6f559c1d09fbdbc28c8e4d5090dd455cd26:/IkiWiki/Plugin/po.pm

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 3503fabc4..d26c4ab4e 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -32,7 +32,7 @@ sub import {
 	hook(type => "getsetup", id => "po", call => \&getsetup);
 	hook(type => "checkconfig", id => "po", call => \&checkconfig);
 	hook(type => "needsbuild", id => "po", call => \&needsbuild);
-	hook(type => "scan", id => "po", call => \&scan, last =>1);
+	hook(type => "scan", id => "po", call => \&scan, last => 1);
 	hook(type => "filter", id => "po", call => \&filter);
 	hook(type => "htmlize", id => "po", call => \&htmlize);
 	hook(type => "pagetemplate", id => "po", call => \&pagetemplate, last => 1);
@@ -141,9 +141,7 @@ sub checkconfig () {
 	    ! defined $config{po_link_to}) {
 		$config{po_link_to}='default';
 	}
-	elsif (! grep {
-			$config{po_link_to} eq $_
-		} ('default', 'current', 'negotiated')) {
+	elsif ($config{po_link_to} !~ /^(default|current|negotiated)$/) {
 		warn(sprintf(gettext('%s is not a valid value for po_link_to, falling back to po_link_to=default'),
 			     $config{po_link_to}));
 		$config{po_link_to}='default';
@@ -290,7 +288,7 @@ sub pagetemplate (@) {
 } # }}}
 
 # Add the renamed page translations to the list of to-be-renamed pages.
-sub renamepages(@) {
+sub renamepages (@) {
 	my %params = @_;
 
 	my %torename = %{$params{torename}};
@@ -326,13 +324,13 @@ sub renamepages(@) {
 	return @ret;
 }
 
-sub mydelete(@) {
+sub mydelete (@) {
 	my @deleted=@_;
 
 	map { deletetranslations($_) } grep istranslatablefile($_), @deleted;
 }
 
-sub change(@) {
+sub change (@) {
 	my @rendered=@_;
 
 	# All meta titles are first extracted at scan time, i.e. before we turn
@@ -340,14 +338,14 @@ sub change(@) {
 	# PO files breaks the meta plugin's parsing enough to save ugly titles
 	# to %pagestate at this time.
 	#
-	# Then, at render time, every page's passes on row through the Great
+	# Then, at render time, every page passes in turn through the Great
 	# Rendering Chain (filter->preprocess->linkify->htmlize), and the meta
 	# plugin's preprocess hook is this time in a position to correctly
 	# extract the titles from slave pages.
 	#
-	# This is, unfortunately, too late: if the page A, linking to the page B,
-	# is rendered before B, it will display the wrongly-extracted meta title
-	# as the link text to B.
+	# This is, unfortunately, too late: if the page A, linking to the page
+	# B, is rendered before B, it will display the wrongly-extracted meta
+	# title as the link text to B.
 	#
 	# On the one hand, such a corner case only happens on rebuild: on
 	# refresh, every rendered page is fixed to contain correct meta titles.
@@ -786,9 +784,10 @@ sub refreshpot ($) {
 	$doc->{TT}{file_in_charset} = 'utf-8';
 	$doc->{TT}{file_out_charset} = 'utf-8';
 	$doc->read($masterfile);
-	# let's cheat a bit to force porefs option to be passed to Locale::Po4a::Po;
-	# this is undocument use of internal Locale::Po4a::TransTractor's data,
-	# compulsory since this module prevents us from using the porefs option.
+	# let's cheat a bit to force porefs option to be passed to
+	# Locale::Po4a::Po; this is undocument use of internal
+	# Locale::Po4a::TransTractor's data, compulsory since this module
+	# prevents us from using the porefs option.
 	$doc->{TT}{po_out}=Locale::Po4a::Po->new({ 'porefs' => 'none' });
 	$doc->{TT}{po_out}->set_charset('utf-8');
 	# do the actual work