move wrapper building loop into Wrapper.pm

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

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 9cb047992e724d88eb6d68a339c3e06d435c14ec..6395ebdc2f99f91e3316b89cb017d157e895f81b 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -28,7 +28,7 @@ use UNIVERSAL;
 my %translations;
 my @origneedsbuild;
 my %origsubs;
 my %translations;
 my @origneedsbuild;
 my %origsubs;

-my @slavelanguages; # orderer as in config po_slave_languages
+my @slavelanguages; # language codes ordered as in config po_slave_languages

 
 memoize("istranslatable");
 memoize("_istranslation");
 
 memoize("istranslatable");
 memoize("_istranslation");


@@ -106,9 +106,9 @@ sub getsetup () {
                po_slave_languages => {
                        type => "string",
                        example => [
                po_slave_languages => {
                        type => "string",
                        example => [

-                               'fr' => 'Français',
-                               'es' => 'Español',
-                               'de' => 'Deutsch'
+                               'fr|Français',
+                               'es|Español',
+                               'de|Deutsch'

                        ],
                        description => "slave languages (PO files)",
                        safe => 1,
                        ],
                        description => "slave languages (PO files)",
                        safe => 1,


@@ -141,24 +141,30 @@ sub checkconfig () {
 
        if (ref $config{po_slave_languages} eq 'ARRAY') {
                my %slaves;
 
        if (ref $config{po_slave_languages} eq 'ARRAY') {
                my %slaves;

-               for (my $i=0; $i<@{$config{po_slave_languages}}; $i = $i + 2) {
-                       $slaves{$config{po_slave_languages}->[$i]} = $config{po_slave_languages}->[$i + 1];
-                       push @slavelanguages, $config{po_slave_languages}->[$i];
-                }
+               foreach my $pair (@{$config{po_slave_languages}}) {
+                       my ($code, $name) = ( $pair =~ /^([a-z]{2})\|(.+)$/ );
+                       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;
                $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}};
        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"), $_));
 
        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}) {
 
        if (! exists $config{po_translatable_pages} ||
            ! defined $config{po_translatable_pages}) {


@@ -187,7 +193,7 @@ sub checkconfig () {
                next if $underlay=~/^locale\//;
 
                # Underlays containing the po files for slave languages.
                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";
                }
                        add_underlay("po/$ll/$underlay")
                                if -d "$config{underlaydirbase}/po/$ll/$underlay";
                }


@@ -552,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") {
        # 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;
                        next unless "$field" eq "type";
                        next unless $field->type eq 'select';
                        my $orig_value = $field->value;


@@ -609,7 +615,7 @@ sub mybeautify_urlpath ($) {
                $res =~ s!/\Qindex.$config{htmlext}\E$!/!;
                map {
                        $res =~ s!/\Qindex.$_.$config{htmlext}\E$!/!;
                $res =~ s!/\Qindex.$config{htmlext}\E$!/!;
                map {
                        $res =~ s!/\Qindex.$_.$config{htmlext}\E$!/!;

-               } (keys %{$config{po_slave_languages}});
+               } @slavelanguages;

        }
        return $res;
 }
        }
        return $res;
 }


@@ -700,7 +706,7 @@ sub myisselflink ($$) {
        return 1 if $origsubs{'isselflink'}->($page, $link);
        if (istranslation($page)) {
                return $origsubs{'isselflink'}->(masterpage($page), $link);
        return 1 if $origsubs{'isselflink'}->($page, $link);
        if (istranslation($page)) {
                return $origsubs{'isselflink'}->(masterpage($page), $link);

-        }
+       }

        return;
 }
 
        return;
 }
 


@@ -856,7 +862,7 @@ sub otherlanguages_codes ($) {
 sub otherlanguages_pages ($) {
        my $page=shift;
 
 sub otherlanguages_pages ($) {
        my $page=shift;
 

-        my %ret;
+       my %ret;

        map {
                $ret{$_} = otherlanguage_page($page, $_)
        } @{otherlanguages_codes($page)};
        map {
                $ret{$_} = otherlanguage_page($page, $_)
        } @{otherlanguages_codes($page)};


@@ -884,7 +890,7 @@ sub pofile ($$) {
 sub pofiles ($) {
        my $masterfile=shift;
 
 sub pofiles ($) {
        my $masterfile=shift;
 

-       return map pofile($masterfile, $_), (keys %{$config{po_slave_languages}});
+       return map pofile($masterfile, $_), @slavelanguages;

 }
 
 sub refreshpot ($) {
 }
 
 sub refreshpot ($) {


@@ -1042,7 +1048,7 @@ sub ishomepage ($) {
        my $page = shift;
 
        return 1 if $page eq 'index';
        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;
 }
 
        return undef;
 }
 


@@ -1057,7 +1063,7 @@ sub deletetranslations ($) {
                if (-e $absfile && ! -l $absfile && ! -d $absfile) {
                        push @todelete, $file;
                }
                if (-e $absfile && ! -l $absfile && ! -d $absfile) {
                        push @todelete, $file;
                }

-       } keys %{$config{po_slave_languages}};
+       } @slavelanguages;

 
        map {
                if ($config{rcs}) {
 
        map {
                if ($config{rcs}) {


@@ -1188,7 +1194,7 @@ sub isvalidpo ($) {
        unlink $infile;
 
        if ($res) {
        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"));
        }
        return IkiWiki::FailReason->new(gettext("invalid gettext data, go back ".
                                        "to previous page to continue edit"));


@@ -1200,7 +1206,7 @@ sub po4a_type ($) {
        my $pagetype = pagetype($file);
        if ($pagetype eq 'html') {
                return 'xhtml';
        my $pagetype = pagetype($file);
        if ($pagetype eq 'html') {
                return 'xhtml';

-        }
+       }

        return 'text';
 }
 
        return 'text';
 }
 


@@ -1214,13 +1220,13 @@ sub po4a_options($) {
                # how to disable options is not consistent across po4a modules
                $options{includessi} = '';
                $options{includeexternal} = 0;
                # how to disable options is not consistent across po4a modules
                $options{includessi} = '';
                $options{includeexternal} = 0;

-        }
+       }

        elsif ($pagetype eq 'mdwn') {
                $options{markdown} = 1;
        elsif ($pagetype eq 'mdwn') {
                $options{markdown} = 1;

-        }
-        else {
+       }
+       else {

                $options{markdown} = 0;
                $options{markdown} = 0;

-        }
+       }

 
        return %options;
 }
 
        return %options;
 }


@@ -1295,11 +1301,11 @@ sub match_needstranslation ($$;@) {
                }
                elsif ($wanted > 100) {
                        return IkiWiki::FailReason->new("parameter is greater than 100");
                }
                elsif ($wanted > 100) {
                        return IkiWiki::FailReason->new("parameter is greater than 100");

-                }
-        }
-        else {
+               }
+       }
+       else {

                $wanted=100;
                $wanted=100;

-        }
+       }

 
        my $percenttranslated=IkiWiki::Plugin::po::percenttranslated($page);
        if ($percenttranslated eq 'N/A') {
 
        my $percenttranslated=IkiWiki::Plugin::po::percenttranslated($page);
        if ($percenttranslated eq 'N/A') {


@@ -1307,7 +1313,7 @@ sub match_needstranslation ($$;@) {
        }
        elsif ($percenttranslated < $wanted) {
                return IkiWiki::SuccessReason->new("file has $percenttranslated translated");
        }
        elsif ($percenttranslated < $wanted) {
                return IkiWiki::SuccessReason->new("file has $percenttranslated translated");

-        }
+       }

        else {
                return IkiWiki::FailReason->new("file is translated enough");
        }
        else {
                return IkiWiki::FailReason->new("file is translated enough");
        }