X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/aff9bf5a7ab21ea303c4882272e76630d05d40f2..190ea1d47fb03c640d3a244781901f349a53daee:/IkiWiki/Plugin/po.pm

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index b07384514..363720e1d 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -70,7 +70,7 @@ sub import {
 # 2. Injected functions
 # 3. Blackboxes for private data
 # 4. Helper functions
-# 5. PageSpec's
+# 5. PageSpecs
 
 
 # ,----
@@ -250,8 +250,8 @@ sub htmlize (@) {
 
 	# force content to be htmlize'd as if it was the same type as the master page
 	return IkiWiki::htmlize($page, $page,
-				pagetype(srcfile($pagesources{masterpage($page)})),
-				$content);
+		pagetype(srcfile($pagesources{masterpage($page)})),
+		$content);
 }
 
 sub pagetemplate (@) {
@@ -287,13 +287,13 @@ sub pagetemplate (@) {
 	# Known limitations are preferred to future random bugs.
 	if ($template->param('discussionlink') && istranslation($page)) {
 		$template->param('discussionlink' => htmllink(
-							$page,
-							$destpage,
-							$masterpage . '/' . gettext("Discussion"),
-							noimageinline => 1,
-							forcesubpage => 0,
-							linktext => gettext("Discussion"),
-							));
+			$page,
+			$destpage,
+			$masterpage . '/' . gettext("Discussion"),
+			noimageinline => 1,
+			forcesubpage => 0,
+			linktext => gettext("Discussion"),
+		));
 	}
 	# Remove broken parentlink to ./index.html on home page's translations.
 	# It works because this hook has the "last" parameter set, to ensure it
@@ -442,19 +442,19 @@ sub checkcontent (@) {
 	return undef;
 }
 
-sub canremove ($$$) {
-	my ($page, $cgi, $session) = (shift, shift, shift);
+sub canremove (@) {
+	my %params = @_;
 
-	if (istranslation($page)) {
+	if (istranslation($params{page})) {
 		return gettext("Can not remove a translation. Removing the master page, ".
 			       "though, removes its translations as well.");
 	}
 	return undef;
 }
 
-sub canrename ($$@) {
-	my ($cgi, $session) = (shift, shift);
+sub canrename (@) {
 	my %params = @_;
+	my $session = $params{session};
 
 	if (istranslation($params{src})) {
 		my $masterpage = masterpage($params{src});
@@ -535,11 +535,6 @@ sub formbuilder (@) {
 				my @types = grep { $_ ne 'po' } $field->options;
 				$field->options(\@types) if @types;
 			}
-			else {
-				# make sure the default value is not po;
-				# does this case actually happen?
-				debug "po(formbuilder) ".gettext("type field is not selected - not implemented yet");
-			}
 		}
 	}
 }
@@ -1116,13 +1111,10 @@ sub isvalidpo ($) {
 }
 
 # ,----
-# | PageSpec's
+# | PageSpecs
 # `----
 
 package IkiWiki::PageSpec;
-use warnings;
-use strict;
-use IkiWiki 2.00;
 
 sub match_istranslation ($;@) {
 	my $page=shift;