* Fix handling of discussion links on discussion pages when l10n is used.

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

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index a41349be518a648fa9f71cd5df83b4810a3ce98c..96b9dab6193f94cb07cc4f420288b33e93134640 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -45,8 +45,12 @@ sub page_locked ($$;$) { #{{{
                my $locked_pages=userinfo_get($admin, "locked_pages");
                if (pagespec_match($page, userinfo_get($admin, "locked_pages"))) {
                        return 1 if $nonfatal;
                my $locked_pages=userinfo_get($admin, "locked_pages");
                if (pagespec_match($page, userinfo_get($admin, "locked_pages"))) {
                        return 1 if $nonfatal;

-                       error(htmllink("", "", $page, 1)." is locked by ".
-                             userlink($admin)." and cannot be edited.");
+
+                       #translators: The first parameter is a page name,
+                       #translators: second is the user who locked it.
+                       error(sprintf(gettext("%s is locked by %s and cannot be edited"),
+                               htmllink("", "", $page, 1),
+                               userlink($admin)));

                }
        }
 
                }
        }
 


@@ -88,7 +92,7 @@ sub cgi_recentchanges ($) { #{{{
                delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
                $change->{pages} = [
                        map {
                delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
                $change->{pages} = [
                        map {

-                               $_->{link} = htmllink("", "", $_->{page}, 1);
+                               $_->{link} = htmllink("", "", $_->{page}, 1, 0, pagetitle($_->{page}));

                                $_;
                        } @{$change->{pages}}
                ];
                                $_;
                        } @{$change->{pages}}
                ];


@@ -125,8 +129,7 @@ sub cgi_signin ($$) { #{{{
                params => $q,
                action => $config{cgiurl},
                header => 0,
                params => $q,
                action => $config{cgiurl},
                header => 0,

-               template => (-e "$config{templatedir}/signin.tmpl" ?
-                            {template_params("signin.tmpl")} : ""),
+               template => scalar template_params("signin.tmpl"),

                stylesheet => baseurl()."style.css",
        );
        my $buttons=["Login"];
                stylesheet => baseurl()."style.css",
        );
        my $buttons=["Login"];


@@ -134,7 +137,7 @@ sub cgi_signin ($$) { #{{{
        $form->field(name => "do", type => "hidden");
        
        if ($q->param("do") ne "signin" && !$form->submitted) {
        $form->field(name => "do", type => "hidden");
        
        if ($q->param("do") ne "signin" && !$form->submitted) {

-               $form->text("You need to log in first.");
+               $form->text(gettext("You need to log in first."));

        }
        
        run_hooks(formbuilder_setup => sub {
        }
        
        run_hooks(formbuilder_setup => sub {


@@ -194,8 +197,7 @@ sub cgi_prefs ($$) { #{{{
                javascript => 0,
                params => $q,
                action => $config{cgiurl},
                javascript => 0,
                params => $q,
                action => $config{cgiurl},

-               template => (-e "$config{templatedir}/prefs.tmpl" ?
-                            {template_params("prefs.tmpl")} : ""),
+               template => scalar template_params("prefs.tmpl"),

                stylesheet => baseurl()."style.css",
        );
        my $buttons=["Save Preferences", "Logout", "Cancel"];
                stylesheet => baseurl()."style.css",
        );
        my $buttons=["Save Preferences", "Logout", "Cancel"];


@@ -242,7 +244,7 @@ sub cgi_prefs ($$) { #{{{
                redirect($q, $config{url});
                return;
        }
                redirect($q, $config{url});
                return;
        }

-       elsif ($form->submitted eq "Save Preferences" && $form->validate) {
+       elsif ($form->submitted eq 'Save Preferences' && $form->validate) {

                foreach my $field (qw(email subscriptions locked_pages)) {
                        if (defined $form->field($field) && length $form->field($field)) {
                                userinfo_set($user_name, $field, $form->field($field)) || error("failed to set $field");
                foreach my $field (qw(email subscriptions locked_pages)) {
                        if (defined $form->field($field) && length $form->field($field)) {
                                userinfo_set($user_name, $field, $form->field($field)) || error("failed to set $field");


@@ -252,7 +254,7 @@ sub cgi_prefs ($$) { #{{{
                        set_banned_users(grep { ! is_admin($_) }
                                        split(' ', $form->field("banned_users")));
                }
                        set_banned_users(grep { ! is_admin($_) }
                                        split(' ', $form->field("banned_users")));
                }

-               $form->text("Preferences saved.");
+               $form->text(gettext("Preferences saved."));

        }
        
        if (exists $hooks{formbuilder}) {
        }
        
        if (exists $hooks{formbuilder}) {


@@ -289,8 +291,7 @@ sub cgi_editpage ($$) { #{{{
                params => $q,
                action => $config{cgiurl},
                table => 0,
                params => $q,
                action => $config{cgiurl},
                table => 0,

-               template => (-e "$config{templatedir}/editpage.tmpl" ?
-                               {template_params("editpage.tmpl")} : ""),
+               template => scalar template_params("editpage.tmpl"),

        );
        
        run_hooks(formbuilder_setup => sub {
        );
        
        run_hooks(formbuilder_setup => sub {


@@ -403,7 +404,7 @@ sub cgi_editpage ($$) { #{{{
                                $dir=~s![^/]+/+$!!;
                                
                                if ((defined $form->field('subpage') && length $form->field('subpage')) ||
                                $dir=~s![^/]+/+$!!;
                                
                                if ((defined $form->field('subpage') && length $form->field('subpage')) ||

-                                   $page eq 'discussion') {
+                                   $page eq gettext('discussion')) {

                                        $best_loc="$from/$page";
                                }
                                else {
                                        $best_loc="$from/$page";
                                }
                                else {


@@ -417,6 +418,8 @@ sub cgi_editpage ($$) { #{{{
                                        push @page_locs, $dir.$page;
                                }
                        }
                                        push @page_locs, $dir.$page;
                                }
                        }

+                       push @page_locs, "$config{userdir}/$page"
+                               if length $config{userdir};

 
                        @page_locs = grep {
                                ! exists $pagecase{lc $_} &&
 
                        @page_locs = grep {
                                ! exists $pagecase{lc $_} &&


@@ -440,7 +443,7 @@ sub cgi_editpage ($$) { #{{{
                                options => \@page_locs, value => $best_loc);
                        $form->field(name => "type", type => 'select',
                                options => \@page_types);
                                options => \@page_locs, value => $best_loc);
                        $form->field(name => "type", type => 'select',
                                options => \@page_types);

-                       $form->title("creating ".pagetitle($page));
+                       $form->title(sprintf(gettext("creating %s"), pagetitle($page)));

                }
                elsif ($form->field("do") eq "edit") {
                        page_locked($page, $session);
                }
                elsif ($form->field("do") eq "edit") {
                        page_locked($page, $session);


@@ -457,7 +460,7 @@ sub cgi_editpage ($$) { #{{{
                        $form->tmpl_param("page_select", 0);
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->tmpl_param("page_select", 0);
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');

-                       $form->title("editing ".pagetitle($page));
+                       $form->title(sprintf(gettext("editing %s"), pagetitle($page)));

                }
                
                print $form->render(submit => \@buttons);
                }
                
                print $form->render(submit => \@buttons);


@@ -500,7 +503,7 @@ sub cgi_editpage ($$) { #{{{
                                $form->tmpl_param("page_select", 0);
                                $form->field(name => "page", type => 'hidden');
                                $form->field(name => "type", type => 'hidden');
                                $form->tmpl_param("page_select", 0);
                                $form->field(name => "page", type => 'hidden');
                                $form->field(name => "type", type => 'hidden');

-                               $form->title("editing $page");
+                               $form->title(sprintf(gettext("editing %s"), $page));

                                print $form->render(submit => \@buttons);
                                return;
                        }
                                print $form->render(submit => \@buttons);
                                return;
                        }


@@ -617,7 +620,7 @@ sub cgi (;$$) { #{{{
        if (defined $session->param("name") && userinfo_get($session->param("name"), "banned")) {
                print $q->header(-status => "403 Forbidden");
                $session->delete();
        if (defined $session->param("name") && userinfo_get($session->param("name"), "banned")) {
                print $q->header(-status => "403 Forbidden");
                $session->delete();

-               print "You are banned.";
+               print gettext("You are banned.");

                cgi_savesession($session);
                exit;
        }
                cgi_savesession($session);
                exit;
        }


@@ -630,6 +633,7 @@ sub cgi (;$$) { #{{{
        }
        elsif ($do eq 'blog') {
                my $page=titlepage(decode_utf8($q->param('title')));
        }
        elsif ($do eq 'blog') {
                my $page=titlepage(decode_utf8($q->param('title')));

+               $page=~s/(\/)/"__".ord($1)."__"/eg; # escape slashes too

                # if the page already exists, munge it to be unique
                my $from=$q->param('from');
                my $add="";
                # if the page already exists, munge it to be unique
                my $from=$q->param('from');
                my $add="";


@@ -642,6 +646,9 @@ sub cgi (;$$) { #{{{
                $q->param('do', 'create');
                cgi_editpage($q, $session);
        }
                $q->param('do', 'create');
                cgi_editpage($q, $session);
        }

+       elsif ($do eq 'postsignin') {
+               error(gettext("login failed, perhaps you need to turn on cookies?"));
+       }

        else {
                error("unknown do parameter");
        }
        else {
                error("unknown do parameter");
        }


@@ -661,6 +668,10 @@ sub userlink ($) { #{{{
                if ($display !~ /\[/) {
                        $display=~s/^(.*?)\.([^.]+\.[a-z]+)$/$1 [$2]/;
                }
                if ($display !~ /\[/) {
                        $display=~s/^(.*?)\.([^.]+\.[a-z]+)$/$1 [$2]/;
                }

+               # Convert "http://somehost.com/user" to "user [somehost.com]".
+               if ($display !~ /\[/) {
+                       $display=~s/^https?:\/\/(.+)\/([^\/]+)$/$2 [$1]/;
+               }

                $display=~s!^https?://!!; # make sure this is removed
                return "<a href=\"$user\">".escapeHTML($display)."</a>";
        }
                $display=~s!^https?://!!; # make sure this is removed
                return "<a href=\"$user\">".escapeHTML($display)."</a>";
        }