Merge commit 'smcv/master'

[ikiwiki.git] / IkiWiki / Plugin / mirrorlist.pm

diff --git a/IkiWiki/Plugin/mirrorlist.pm b/IkiWiki/Plugin/mirrorlist.pm
index 104587f3a881ab8526ce79ef9c762d3624fe32af..3997e6fefcd31c15a8fa6df7e559a6ffdf84e863 100644 (file)
--- a/IkiWiki/Plugin/mirrorlist.pm
+++ b/IkiWiki/Plugin/mirrorlist.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::mirrorlist;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
        hook(type => "pagetemplate", id => "mirrorlist", call => \&pagetemplate);
 
 sub import { #{{{
        hook(type => "pagetemplate", id => "mirrorlist", call => \&pagetemplate);


@@ -19,13 +19,13 @@ sub pagetemplate (@) { #{{{
 
 sub mirrorlist ($) { #{{{
        my $page=shift;
 
 sub mirrorlist ($) { #{{{
        my $page=shift;

-       return "<p>Mirror".
-               (keys %{$config{mirrorlist}} > 1 ? "s" : "").
+       return "<p>".
+               (keys %{$config{mirrorlist}} > 1 ? gettext("Mirrors") : gettext("Mirror")).

                ": ".
                join(", ",
                        map { 
                                qq{<a href="}.
                ": ".
                join(", ",
                        map { 
                                qq{<a href="}.

-                               $config{mirrorlist}->{$_}."/".$page.
+                               $config{mirrorlist}->{$_}."/".urlto($page, "").

                                qq{">$_</a>}
                        } keys %{$config{mirrorlist}}
                ).
                                qq{">$_</a>}
                        } keys %{$config{mirrorlist}}
                ).