bugs with po and git plugins

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 04ad6ed2308526b47666ca2fe8db1ab1c199b6b4..3a2f4b7bc37caa0d52113ec30ddbcbc310314a82 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -254,7 +254,7 @@ sub preprocess_inline (@) {
        add_depends($params{page}, join(" or ", $#list >= $#feedlist ? @list : @feedlist));
        
        if ($feeds && exists $params{feedpages}) {
        add_depends($params{page}, join(" or ", $#list >= $#feedlist ? @list : @feedlist));
        
        if ($feeds && exists $params{feedpages}) {

-               @feedlist=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @feedlist;
+               @feedlist=pagespec_match_list(\@feedlist, $params{feedpages}, location => $params{page});

        }
 
        my ($feedbase, $feednum);
        }
 
        my ($feedbase, $feednum);


@@ -371,15 +371,14 @@ sub preprocess_inline (@) {
                                        my $file = $pagesources{$page};
                                        my $type = pagetype($file);
                                        if ($config{discussion}) {
                                        my $file = $pagesources{$page};
                                        my $type = pagetype($file);
                                        if ($config{discussion}) {

-                                               my $discussionlink=lc(gettext("Discussion"));
-                                               if ($page !~ /.*\/\Q$discussionlink\E$/ &&
+                                               if ($page !~ /.*\/\Q$config{discussionpage}\E$/ &&

                                                    (length $config{cgiurl} ||
                                                    (length $config{cgiurl} ||

-                                                    exists $links{$page."/".$discussionlink})) {
+                                                    exists $links{$page."/".$config{discussionpage}})) {

                                                        $template->param(have_actions => 1);
                                                        $template->param(discussionlink =>
                                                                htmllink($page,
                                                                        $params{destpage},
                                                        $template->param(have_actions => 1);
                                                        $template->param(discussionlink =>
                                                                htmllink($page,
                                                                        $params{destpage},

-                                                                       gettext("Discussion"),
+                                                                       $config{discussionpage},

                                                                        noimageinline => 1,
                                                                        forcesubpage => 1));
                                                }
                                                                        noimageinline => 1,
                                                                        forcesubpage => 1));
                                                }