unfuzzy

[git.ikiwiki.info.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 47fbe7a61083eba6cb0f0bd08efe8623ddb0745a..7ca9a38208aef4d141f629943ce32d10f388ee20 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -93,8 +93,9 @@ sub genpage ($$$) { #{{{
                $template->param(historyurl => $u);
                $actions++;
        }
                $template->param(historyurl => $u);
                $actions++;
        }

-       if ($config{discussion}) {
-               $template->param(discussionlink => htmllink($page, $page, "Discussion", 1, 1));
+       if ($config{discussion} && $page !~ /.*\/discussion$/ &&
+           (length $config{cgiurl} || exists $links{$page."/".gettext("discussion")})) {
+               $template->param(discussionlink => htmllink($page, $page, gettext("Discussion"), 1, 1));

                $actions++;
        }
 
                $actions++;
        }
 


@@ -155,9 +156,9 @@ sub scan ($) { #{{{
                        push @links, titlepage($2);
                }
                if ($config{discussion}) {
                        push @links, titlepage($2);
                }
                if ($config{discussion}) {

-                       # Discussion links are a special case since they're not in the
-                       # text of the page, but on its template.
-                       push @links, "$page/discussion";
+                       # Discussion links are a special case since they're
+                       # not in the text of the page, but on its template.
+                       push @links, $page."/".gettext("discussion");

                }
                $links{$page}=\@links;
                
                }
                $links{$page}=\@links;
                


@@ -218,13 +219,13 @@ sub refresh () { #{{{
                no_chdir => 1,
                wanted => sub {
                        $_=decode_utf8($_);
                no_chdir => 1,
                wanted => sub {
                        $_=decode_utf8($_);

-                       if (/$config{wiki_file_prune_regexp}/) {
+                       if (file_pruned($_, $config{srcdir})) {

                                $File::Find::prune=1;
                        }
                        elsif (! -d $_ && ! -l $_) {
                                my ($f)=/$config{wiki_file_regexp}/; # untaint
                                if (! defined $f) {
                                $File::Find::prune=1;
                        }
                        elsif (! -d $_ && ! -l $_) {
                                my ($f)=/$config{wiki_file_regexp}/; # untaint
                                if (! defined $f) {

-                                       warn("skipping bad filename $_\n");
+                                       warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");

                                }
                                else {
                                        $f=~s/^\Q$config{srcdir}\E\/?//;
                                }
                                else {
                                        $f=~s/^\Q$config{srcdir}\E\/?//;


@@ -238,22 +239,25 @@ sub refresh () { #{{{
                no_chdir => 1,
                wanted => sub {
                        $_=decode_utf8($_);
                no_chdir => 1,
                wanted => sub {
                        $_=decode_utf8($_);

-                       if (/$config{wiki_file_prune_regexp}/) {
+                       if (file_pruned($_, $config{underlaydir})) {

                                $File::Find::prune=1;
                        }
                        elsif (! -d $_ && ! -l $_) {
                                my ($f)=/$config{wiki_file_regexp}/; # untaint
                                if (! defined $f) {
                                $File::Find::prune=1;
                        }
                        elsif (! -d $_ && ! -l $_) {
                                my ($f)=/$config{wiki_file_regexp}/; # untaint
                                if (! defined $f) {

-                                       warn("skipping bad filename $_\n");
+                                       warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");

                                }
                                else {
                                }
                                else {

-                                       # Don't add files that are in the
+                                       # Don't add pages that are in the

                                        # srcdir.
                                        $f=~s/^\Q$config{underlaydir}\E\/?//;
                                        if (! -e "$config{srcdir}/$f" && 
                                            ! -l "$config{srcdir}/$f") {
                                        # srcdir.
                                        $f=~s/^\Q$config{underlaydir}\E\/?//;
                                        if (! -e "$config{srcdir}/$f" && 
                                            ! -l "$config{srcdir}/$f") {

-                                               push @files, $f;
-                                               $exists{pagename($f)}=1;
+                                               my $page=pagename($f);
+                                               if (! $exists{$page}) {
+                                                       push @files, $f;
+                                                       $exists{$page}=1;
+                                               }

                                        }
                                }
                        }
                                        }
                                }
                        }


@@ -266,10 +270,10 @@ sub refresh () { #{{{
        my @add;
        foreach my $file (@files) {
                my $page=pagename($file);
        my @add;
        foreach my $file (@files) {
                my $page=pagename($file);

+               $pagesources{$page}=$file;

                if (! $oldpagemtime{$page}) {
                        push @add, $file;
                        $pagecase{lc $page}=$page;
                if (! $oldpagemtime{$page}) {
                        push @add, $file;
                        $pagecase{lc $page}=$page;

-                       $pagesources{$page}=$file;

                        if ($config{getctime} && -e "$config{srcdir}/$file") {
                                $pagectime{$page}=rcs_getctime("$config{srcdir}/$file");
                        }
                        if ($config{getctime} && -e "$config{srcdir}/$file") {
                                $pagectime{$page}=rcs_getctime("$config{srcdir}/$file");
                        }


@@ -281,7 +285,7 @@ sub refresh () { #{{{
        my @del;
        foreach my $page (keys %oldpagemtime) {
                if (! $exists{$page}) {
        my @del;
        foreach my $page (keys %oldpagemtime) {
                if (! $exists{$page}) {

-                       debug("removing old page $page");
+                       debug(sprintf(gettext("removing old page %s"), $page));

                        push @del, $pagesources{$page};
                        $links{$page}=[];
                        $renderedfiles{$page}=[];
                        push @del, $pagesources{$page};
                        $links{$page}=[];
                        $renderedfiles{$page}=[];


@@ -300,7 +304,7 @@ sub refresh () { #{{{
                if (! exists $oldpagemtime{$page} ||
                    mtime(srcfile($file)) > $oldpagemtime{$page} ||
                    $forcerebuild{$page}) {
                if (! exists $oldpagemtime{$page} ||
                    mtime(srcfile($file)) > $oldpagemtime{$page} ||
                    $forcerebuild{$page}) {

-                       debug("scanning $file");
+                       debug(sprintf(gettext("scanning %s"), $file));

                        push @changed, $file;
                        scan($file);
                }
                        push @changed, $file;
                        scan($file);
                }


@@ -309,7 +313,7 @@ sub refresh () { #{{{
 
        # render changed and new pages
        foreach my $file (@changed) {
 
        # render changed and new pages
        foreach my $file (@changed) {

-               debug("rendering $file");
+               debug(sprintf(gettext("rendering %s"), $file));

                render($file);
                $rendered{$file}=1;
        }
                render($file);
                $rendered{$file}=1;
        }


@@ -321,7 +325,7 @@ sub refresh () { #{{{
                        foreach my $page (keys %{$backlinks{$p}}) {
                                my $file=$pagesources{$page};
                                next if $rendered{$file};
                        foreach my $page (keys %{$backlinks{$p}}) {
                                my $file=$pagesources{$page};
                                next if $rendered{$file};

-                               debug("rendering $file, which links to $p");
+                               debug(sprintf(gettext("rendering %s, which links to %s"), $file, $p));

                                render($file);
                                $rendered{$file}=1;
                        }
                                render($file);
                                $rendered{$file}=1;
                        }


@@ -338,7 +342,7 @@ sub refresh () { #{{{
                                        next if $f eq $file;
                                        my $page=pagename($file);
                                        if (pagespec_match($page, $depends{$p})) {
                                        next if $f eq $file;
                                        my $page=pagename($file);
                                        if (pagespec_match($page, $depends{$p})) {

-                                               debug("rendering $f, which depends on $page");
+                                               debug(sprintf(gettext("rendering %s, which depends on %s"), $f, $page));

                                                render($f);
                                                $rendered{$f}=1;
                                                last;
                                                render($f);
                                                $rendered{$f}=1;
                                                last;


@@ -376,7 +380,7 @@ sub refresh () { #{{{
                        my $linkfile=$pagesources{$link};
                        if (defined $linkfile) {
                                next if $rendered{$linkfile};
                        my $linkfile=$pagesources{$link};
                        if (defined $linkfile) {
                                next if $rendered{$linkfile};

-                               debug("rendering $linkfile, to update its backlinks");
+                               debug(sprintf(gettext("rendering %s, to update its backlinks"), $linkfile));

                                render($linkfile);
                                $rendered{$linkfile}=1;
                        }
                                render($linkfile);
                                $rendered{$linkfile}=1;
                        }


@@ -388,7 +392,7 @@ sub refresh () { #{{{
                my $page=pagename($src);
                foreach my $file (@{$oldrenderedfiles{$page}}) {
                        if (! grep { $_ eq $file } @{$renderedfiles{$page}}) {
                my $page=pagename($src);
                foreach my $file (@{$oldrenderedfiles{$page}}) {
                        if (! grep { $_ eq $file } @{$renderedfiles{$page}}) {

-                               debug("removing $file, no longer rendered by $page");
+                               debug(sprintf(gettext("removing %s, no longer rendered by %s"), $file, $page));

                                prune($config{destdir}."/".$file);
                        }
                }
                                prune($config{destdir}."/".$file);
                        }
                }


@@ -414,7 +418,7 @@ sub commandline_render () { #{{{
        $file=~s/\Q$config{srcdir}\E\/?//;
 
        my $type=pagetype($file);
        $file=~s/\Q$config{srcdir}\E\/?//;
 
        my $type=pagetype($file);

-       die "ikiwiki: cannot render $srcfile\n" unless defined $type;
+       die sprintf(gettext("ikiwiki: cannot render %s"), $srcfile)."\n" unless defined $type;

        my $content=readfile($srcfile);
        my $page=pagename($file);
        $pagesources{$page}=$file;
        my $content=readfile($srcfile);
        my $page=pagename($file);
        $pagesources{$page}=$file;