po plugin: do not trust po4a functions return value

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index cb92d1ade947290edef6afd14636fd4d15c8ca63..8385c1aff7daed52013361e75c4d38fce77dace2 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -63,7 +63,8 @@ sub genpage ($$) { #{{{
        my $actions=0;
 
        if (length $config{cgiurl}) {
        my $actions=0;
 
        if (length $config{cgiurl}) {

-               $template->param(editurl => cgiurl(do => "edit", page => $page));
+               $template->param(editurl => cgiurl(do => "edit", page => $page))
+                       if IkiWiki->can("cgi_editpage");

                $template->param(prefsurl => cgiurl(do => "prefs"));
                $actions++;
        }
                $template->param(prefsurl => cgiurl(do => "prefs"));
                $actions++;
        }


@@ -108,7 +109,9 @@ sub genpage ($$) { #{{{
                backlinks => $backlinks,
                more_backlinks => $more_backlinks,
                mtime => displaytime($pagemtime{$page}),
                backlinks => $backlinks,
                more_backlinks => $more_backlinks,
                mtime => displaytime($pagemtime{$page}),

+               mtime_raw => scalar localtime($pagemtime{$page}),

                ctime => displaytime($pagectime{$page}),
                ctime => displaytime($pagectime{$page}),

+               ctime_raw => scalar localtime($pagectime{$page}),

                baseurl => baseurl($page),
        );
 
                baseurl => baseurl($page),
        );
 


@@ -249,7 +252,7 @@ sub refresh () { #{{{
        my $test=$config{srcdir};
        while (length $test) {
                if (-l $test && ! $config{allow_symlinks_before_srcdir}) {
        my $test=$config{srcdir};
        while (length $test) {
                if (-l $test && ! $config{allow_symlinks_before_srcdir}) {

-                       error("symlink found in srcdir path ($test) -- set allow_symlinks_before_srcdir to allow this");
+                       error(sprintf(gettext("symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to allow this")), $test);

                }
                unless ($test=~s/\/+$//) {
                        $test=dirname($test);
                }
                unless ($test=~s/\/+$//) {
                        $test=dirname($test);


@@ -278,7 +281,11 @@ sub refresh () { #{{{
                                else {
                                        $f=~s/^\Q$config{srcdir}\E\/?//;
                                        push @files, $f;
                                else {
                                        $f=~s/^\Q$config{srcdir}\E\/?//;
                                        push @files, $f;

-                                       $exists{pagename($f)}=1;
+                                       my $pagename = pagename($f);
+                                       if ($exists{$pagename}) {
+                                               debug(sprintf(gettext("%s has multiple possible source pages"), $pagename));
+                                       }
+                                       $exists{$pagename}=1;

                                }
                        }
                },
                                }
                        }
                },