Only store authorsort in meta pagestate if it differs from author

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

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 88d021388e48d712e5312dd83a88ceaeb851c315..2cbfb0a459a91c37469b3429d437cdae5433bbc1 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -61,6 +61,8 @@ sub import {
        inject(name => "IkiWiki::urlto", call => \&myurlto);
        $origsubs{'cgiurl'}=\&IkiWiki::cgiurl;
        inject(name => "IkiWiki::cgiurl", call => \&mycgiurl);
        inject(name => "IkiWiki::urlto", call => \&myurlto);
        $origsubs{'cgiurl'}=\&IkiWiki::cgiurl;
        inject(name => "IkiWiki::cgiurl", call => \&mycgiurl);

+       $origsubs{'rootpage'}=\&IkiWiki::rootpage;
+       inject(name => "IkiWiki::rootpage", call => \&myrootpage);

 }
 
 
 }
 
 


@@ -83,7 +85,8 @@ sub getsetup () {
        return
                plugin => {
                        safe => 0,
        return
                plugin => {
                        safe => 0,

-                       rebuild => 1,
+                       rebuild => 1, # format plugin
+                       section => "format",

                },
                po_master_language => {
                        type => "string",
                },
                po_master_language => {
                        type => "string",


@@ -204,10 +207,7 @@ sub scan (@) {
        if (istranslation($page)) {
                foreach my $destpage (@{$links{$page}}) {
                        if (istranslatable($destpage)) {
        if (istranslation($page)) {
                foreach my $destpage (@{$links{$page}}) {
                        if (istranslatable($destpage)) {

-                               # replace one occurence of $destpage in $links{$page}
-                               # (we only want to replace the one that was added by
-                               # IkiWiki::Plugin::link::scan, other occurences may be
-                               # there for other reasons)
+                               # replace the occurence of $destpage in $links{$page}

                                for (my $i=0; $i<@{$links{$page}}; $i++) {
                                        if (@{$links{$page}}[$i] eq $destpage) {
                                                @{$links{$page}}[$i] = $destpage . '.' . lang($page);
                                for (my $i=0; $i<@{$links{$page}}; $i++) {
                                        if (@{$links{$page}}[$i] eq $destpage) {
                                                @{$links{$page}}[$i] = $destpage . '.' . lang($page);


@@ -305,6 +305,9 @@ sub pagetemplate (@) {
            && $masterpage eq "index") {
                $template->param('parentlinks' => []);
        }
            && $masterpage eq "index") {
                $template->param('parentlinks' => []);
        }

+       if (ishomepage($page) && $template->query(name => "title")) {
+               $template->param(title => $config{wikiname});
+       }

 } # }}}
 
 # Add the renamed page translations to the list of to-be-renamed pages.
 } # }}}
 
 # Add the renamed page translations to the list of to-be-renamed pages.


@@ -384,31 +387,32 @@ sub change (@) {
                resetalreadyfiltered();
                require IkiWiki::Render;
                foreach my $file (@rendered) {
                resetalreadyfiltered();
                require IkiWiki::Render;
                foreach my $file (@rendered) {

-                       debug(sprintf(gettext("building %s"), $file));
-                       IkiWiki::render($file);
+                       IkiWiki::render($file, sprintf(gettext("building %s"), $file));

                }
        }
 
        my $updated_po_files=0;
 
        # Refresh/create POT and PO files as needed.
                }
        }
 
        my $updated_po_files=0;
 
        # Refresh/create POT and PO files as needed.

-       # (But avoid doing so if they are in an underlay directory.)

        foreach my $file (grep {istranslatablefile($_)} @rendered) {
                my $masterfile=srcfile($file);
                my $page=pagename($file);
                my $updated_pot_file=0;
        foreach my $file (grep {istranslatablefile($_)} @rendered) {
                my $masterfile=srcfile($file);
                my $page=pagename($file);
                my $updated_pot_file=0;

+
+               # Avoid touching underlay files.
+               next if $masterfile ne "$config{srcdir}/$file";
+

                # Only refresh POT file if it does not exist, or if
                # Only refresh POT file if it does not exist, or if

-               # $pagesources{$page} was changed: don't if only the HTML was
+               # the source was changed: don't if only the HTML was

                # refreshed, e.g. because of a dependency.
                # refreshed, e.g. because of a dependency.

-               if ($masterfile eq "$config{srcdir}/$file" &&
-                  ((grep { $_ eq $pagesources{$page} } @origneedsbuild)
-                   || ! -e potfile($masterfile))) {
+               if ((grep { $_ eq $pagesources{$page} } @origneedsbuild) ||
+                   ! -e potfile($masterfile)) {

                        refreshpot($masterfile);
                        $updated_pot_file=1;
                }
                my @pofiles;
                foreach my $po (pofiles($masterfile)) {
                        refreshpot($masterfile);
                        $updated_pot_file=1;
                }
                my @pofiles;
                foreach my $po (pofiles($masterfile)) {

-                       next if ! $updated_pot_file && ! -e $po;
+                       next if ! $updated_pot_file && -e $po;

                        next if grep { $po=~/\Q$_\E/ } @{$config{underlaydirs}};
                        push @pofiles, $po;
                }
                        next if grep { $po=~/\Q$_\E/ } @{$config{underlaydirs}};
                        push @pofiles, $po;
                }


@@ -529,10 +533,23 @@ sub formbuilder (@) {
        if ($form->field("do") eq "create") {
                foreach my $field ($form->field) {
                        next unless "$field" eq "type";
        if ($form->field("do") eq "create") {
                foreach my $field ($form->field) {
                        next unless "$field" eq "type";

-                       if ($field->type eq 'select') {
-                               # remove po from the list of types
-                               my @types = grep { $_ ne 'po' } $field->options;
-                               $field->options(\@types) if @types;
+                       next unless $field->type eq 'select';
+                       my $orig_value = $field->value;
+                       # remove po from the list of types
+                       my @types = grep { $_->[0] ne 'po' } $field->options;
+                       $field->options(\@types) if @types;
+                       # favor the type of linking page's masterpage
+                       if ($orig_value eq 'po') {
+                               my ($from, $type);
+                               if (defined $form->field('from')) {
+                                       ($from)=$form->field('from')=~/$config{wiki_file_regexp}/;
+                                       $from = masterpage($from);
+                               }
+                               if (defined $from && exists $pagesources{$from}) {
+                                       $type=pagetype($pagesources{$from});
+                               }
+                               $type=$config{default_pageext} unless defined $type;
+                               $field->value($type) ;

                        }
                }
        }
                        }
                }
        }


@@ -551,10 +568,12 @@ sub mybestlink ($$) {
                if $config{po_link_to} eq "default";
 
        my $res=$origsubs{'bestlink'}->(masterpage($page), $link);
                if $config{po_link_to} eq "default";
 
        my $res=$origsubs{'bestlink'}->(masterpage($page), $link);

+       my @caller = caller(1);

        if (length $res
        if (length $res

-           && ($config{po_link_to} eq "current" || $config{po_link_to} eq "negotiated")

            && istranslatable($res)
            && istranslatable($res)

-           && istranslation($page)) {
+           && istranslation($page)
+           &&  !(exists $caller[3] && defined $caller[3]
+                 && ($caller[3] eq "IkiWiki::PageSpec::match_link"))) {

                return $res . "." . lang($page);
        }
        return $res;
                return $res . "." . lang($page);
        }
        return $res;


@@ -637,6 +656,22 @@ sub mycgiurl (@) {
        return $origsubs{'cgiurl'}->(%params);
 }
 
        return $origsubs{'cgiurl'}->(%params);
 }
 

+sub myrootpage (@) {
+       my %params=@_;
+
+       my $rootpage;
+       if (exists $params{rootpage}) {
+               $rootpage=$origsubs{'bestlink'}->($params{page}, $params{rootpage});
+               if (!length $rootpage) {
+                       $rootpage=$params{rootpage};
+               }
+       }
+       else {
+               $rootpage=masterpage($params{page});
+       }
+       return $rootpage;
+}
+

 # ,----
 # | Blackboxes for private data
 # `----
 # ,----
 # | Blackboxes for private data
 # `----


@@ -963,6 +998,14 @@ sub homepageurl (;$) {
        return urlto('', $page);
 }
 
        return urlto('', $page);
 }
 

+sub ishomepage ($) {
+       my $page = shift;
+
+       return 1 if $page eq 'index';
+       map { return 1 if $page eq 'index.'.$_ } keys %{$config{po_slave_languages}};
+       return undef;
+}
+

 sub deletetranslations ($) {
        my $deletedmasterfile=shift;
 
 sub deletetranslations ($) {
        my $deletedmasterfile=shift;
 


@@ -1015,11 +1058,8 @@ sub commit_and_refresh ($$) {
        IkiWiki::saveindex();
 }
 
        IkiWiki::saveindex();
 }
 

-# on success, returns the filtered content.
-# on error, if $nonfatal, warn and return undef; else, error out.
-sub po_to_markup ($$;$) {
+sub po_to_markup ($$) {

        my ($page, $content) = (shift, shift);
        my ($page, $content) = (shift, shift);

-       my $nonfatal = shift;

 
        $content = '' unless defined $content;
        $content = decode_utf8(encode_utf8($content));
 
        $content = '' unless defined $content;
        $content = decode_utf8(encode_utf8($content));


@@ -1042,10 +1082,6 @@ sub po_to_markup ($$;$) {
 
        my $fail = sub ($) {
                my $msg = "po(po_to_markup) - $page : " . shift;
 
        my $fail = sub ($) {
                my $msg = "po(po_to_markup) - $page : " . shift;

-               if ($nonfatal) {
-                       warn $msg;
-                       return undef;
-               }

                error($msg, sub { unlink $infile, $outfile});
        };
 
                error($msg, sub { unlink $infile, $outfile});
        };
 


@@ -1066,8 +1102,7 @@ sub po_to_markup ($$;$) {
        $doc->write($outfile)
                or return $fail->(sprintf(gettext("failed to write %s"), $outfile));
 
        $doc->write($outfile)
                or return $fail->(sprintf(gettext("failed to write %s"), $outfile));
 

-       $content = readfile($outfile)
-               or return $fail->(sprintf(gettext("failed to read %s"), $outfile));
+       $content = readfile($outfile);

 
        # Unlinking should happen automatically, thanks to File::Temp,
        # but it does not work here, probably because of the way writefile()
 
        # Unlinking should happen automatically, thanks to File::Temp,
        # but it does not work here, probably because of the way writefile()