From: intrigeri <intrigeri@boum.org>
Date: Sat, 24 Jul 2010 09:19:28 +0000 (+0200)
Subject: Merge remote branch 'upstream/master' into prv/po
X-Git-Tag: 3.20100804~25^2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2f71e7f8f5a5c69753fb77c897d4446cdc23f856?hp=-c

Merge remote branch 'upstream/master' into prv/po
---

2f71e7f8f5a5c69753fb77c897d4446cdc23f856
diff --combined IkiWiki/Plugin/po.pm
index 0af47aad5,ad3fe9da8..6395ebdc2
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@@ -28,7 -28,7 +28,7 @@@ use UNIVERSAL
  my %translations;
  my @origneedsbuild;
  my %origsubs;
- my @slavelanguages; # languages codes ordered as in config po_slave_languages
+ my @slavelanguages; # language codes ordered as in config po_slave_languages
  
  memoize("istranslatable");
  memoize("_istranslation");
@@@ -109,7 -109,7 +109,7 @@@ sub getsetup () 
  				'fr|Français',
  				'es|Español',
  				'de|Deutsch'
-                             ],
+ 			],
  			description => "slave languages (PO files)",
  			safe => 1,
  			rebuild => 1,
@@@ -146,25 -146,25 +146,25 @@@ sub checkconfig () 
  			if (!defined $code || !defined $name) {
  				error(sprintf(gettext("%s has invalid syntax: must use CODE|NAME"),
  				              $pair));
-                         }
+ 			}
  			$slaves{$code} = $name;
  			push @slavelanguages, $code;
  
-                 }
+ 		}
  		$config{po_slave_languages} = \%slaves;
-         }
+ 	}
  	elsif (ref $config{po_slave_languages} eq 'HASH') {
  		@slavelanguages = sort {
  			$config{po_slave_languages}->{$a} cmp $config{po_slave_languages}->{$b};
  		} keys %{$config{po_slave_languages}};
-         }
+ 	}
  
  	delete $config{po_slave_languages}{$config{po_master_language}{code}};;
  
  	map {
  		islanguagecode($_)
  			or error(sprintf(gettext("%s is not a valid language code"), $_));
 -	} ($config{po_master_language}{code}, keys %{$config{po_slave_languages}});
 +	} ($config{po_master_language}{code}, @slavelanguages);
  
  	if (! exists $config{po_translatable_pages} ||
  	    ! defined $config{po_translatable_pages}) {
@@@ -193,7 -193,7 +193,7 @@@
  		next if $underlay=~/^locale\//;
  
  		# Underlays containing the po files for slave languages.
 -		foreach my $ll (keys %{$config{po_slave_languages}}) {
 +		foreach my $ll (@slavelanguages) {
  			add_underlay("po/$ll/$underlay")
  				if -d "$config{underlaydirbase}/po/$ll/$underlay";
  		}
@@@ -558,7 -558,7 +558,7 @@@ sub formbuilder (@) 
  	# This cannot be done in the formbuilder_setup hook as the list of types is
  	# computed later.
  	if ($form->field("do") eq "create") {
- 	        foreach my $field ($form->field) {
+ 		foreach my $field ($form->field) {
  			next unless "$field" eq "type";
  			next unless $field->type eq 'select';
  			my $orig_value = $field->value;
@@@ -615,7 -615,7 +615,7 @@@ sub mybeautify_urlpath ($) 
  		$res =~ s!/\Qindex.$config{htmlext}\E$!/!;
  		map {
  			$res =~ s!/\Qindex.$_.$config{htmlext}\E$!/!;
 -		} (keys %{$config{po_slave_languages}});
 +		} @slavelanguages;
  	}
  	return $res;
  }
@@@ -706,7 -706,7 +706,7 @@@ sub myisselflink ($$) 
  	return 1 if $origsubs{'isselflink'}->($page, $link);
  	if (istranslation($page)) {
  		return $origsubs{'isselflink'}->(masterpage($page), $link);
-         }
+ 	}
  	return;
  }
  
@@@ -852,7 -852,7 +852,7 @@@ sub otherlanguages_codes ($) 
  	return \@ret unless istranslation($page) || istranslatable($page);
  	my $curlang=lang($page);
  	foreach my $lang
 -		($config{po_master_language}{code}, keys %{$config{po_slave_languages}}) {
 +		($config{po_master_language}{code}, @slavelanguages) {
  		next if $lang eq $curlang;
  		push @ret, $lang;
  	}
@@@ -862,7 -862,7 +862,7 @@@
  sub otherlanguages_pages ($) {
  	my $page=shift;
  
-         my %ret;
+ 	my %ret;
  	map {
  		$ret{$_} = otherlanguage_page($page, $_)
  	} @{otherlanguages_codes($page)};
@@@ -890,7 -890,7 +890,7 @@@ sub pofile ($$) 
  sub pofiles ($) {
  	my $masterfile=shift;
  
 -	return map pofile($masterfile, $_), (keys %{$config{po_slave_languages}});
 +	return map pofile($masterfile, $_), @slavelanguages;
  }
  
  sub refreshpot ($) {
@@@ -1048,7 -1048,7 +1048,7 @@@ sub ishomepage ($) 
  	my $page = shift;
  
  	return 1 if $page eq 'index';
 -	map { return 1 if $page eq 'index.'.$_ } keys %{$config{po_slave_languages}};
 +	map { return 1 if $page eq 'index.'.$_ } @slavelanguages;
  	return undef;
  }
  
@@@ -1063,7 -1063,7 +1063,7 @@@ sub deletetranslations ($) 
  		if (-e $absfile && ! -l $absfile && ! -d $absfile) {
  			push @todelete, $file;
  		}
 -	} keys %{$config{po_slave_languages}};
 +	} @slavelanguages;
  
  	map {
  		if ($config{rcs}) {
@@@ -1194,7 -1194,7 +1194,7 @@@ sub isvalidpo ($) 
  	unlink $infile;
  
  	if ($res) {
- 	    return IkiWiki::SuccessReason->new("valid gettext data");
+ 		return IkiWiki::SuccessReason->new("valid gettext data");
  	}
  	return IkiWiki::FailReason->new(gettext("invalid gettext data, go back ".
  					"to previous page to continue edit"));
@@@ -1206,7 -1206,7 +1206,7 @@@ sub po4a_type ($) 
  	my $pagetype = pagetype($file);
  	if ($pagetype eq 'html') {
  		return 'xhtml';
-         }
+ 	}
  	return 'text';
  }
  
@@@ -1220,13 -1220,13 +1220,13 @@@ sub po4a_options($) 
  		# how to disable options is not consistent across po4a modules
  		$options{includessi} = '';
  		$options{includeexternal} = 0;
-         }
+ 	}
  	elsif ($pagetype eq 'mdwn') {
  		$options{markdown} = 1;
-         }
-         else {
+ 	}
+ 	else {
  		$options{markdown} = 0;
-         }
+ 	}
  
  	return %options;
  }
@@@ -1301,11 -1301,11 +1301,11 @@@ sub match_needstranslation ($$;@) 
  		}
  		elsif ($wanted > 100) {
  			return IkiWiki::FailReason->new("parameter is greater than 100");
-                 }
-         }
-         else {
+ 		}
+ 	}
+ 	else {
  		$wanted=100;
-         }
+ 	}
  
  	my $percenttranslated=IkiWiki::Plugin::po::percenttranslated($page);
  	if ($percenttranslated eq 'N/A') {
@@@ -1313,7 -1313,7 +1313,7 @@@
  	}
  	elsif ($percenttranslated < $wanted) {
  		return IkiWiki::SuccessReason->new("file has $percenttranslated translated");
-         }
+ 	}
  	else {
  		return IkiWiki::FailReason->new("file is translated enough");
  	}