po/todo: first pass of robustness tests, added todo for remove/rename

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

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 42a125808addaa570f4157d2dfa2c089a7ecbfff..1212181ca39b5747cbc9ac635e66f1af6ea885c8 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -262,10 +262,14 @@ sub htmlize (@) { #{{{
 
        my $page = $params{page};
        my $content = $params{content};
 
        my $page = $params{page};
        my $content = $params{content};

-       my $masterfile = srcfile($pagesources{masterpage($page)});
+
+       # ignore PO files this plugin did not create
+       return $content unless istranslation($page);

 
        # force content to be htmlize'd as if it was the same type as the master page
 
        # force content to be htmlize'd as if it was the same type as the master page

-       return IkiWiki::htmlize($page, $page, pagetype($masterfile), $content);
+       return IkiWiki::htmlize($page, $page,
+                               pagetype(srcfile($pagesources{masterpage($page)})),
+                               $content);

 } #}}}
 
 sub pagetemplate (@) { #{{{
 } #}}}
 
 sub pagetemplate (@) { #{{{


@@ -285,6 +289,9 @@ sub pagetemplate (@) { #{{{
        if ($template->query(name => "istranslatable")) {
                $template->param(istranslatable => istranslatable($page));
        }
        if ($template->query(name => "istranslatable")) {
                $template->param(istranslatable => istranslatable($page));
        }

+       if ($template->query(name => "HOMEPAGEURL")) {
+               $template->param(homepageurl => homepageurl($page));
+       }

        if ($template->query(name => "otherlanguages")) {
                $template->param(otherlanguages => [otherlanguagesloop($page)]);
                map add_depends($page, $_), (values %{otherlanguages($page)});
        if ($template->query(name => "otherlanguages")) {
                $template->param(otherlanguages => [otherlanguagesloop($page)]);
                map add_depends($page, $_), (values %{otherlanguages($page)});


@@ -359,6 +366,10 @@ sub change(@) { #{{{
                resettranslationscache();
                # Trigger a wiki refresh.
                require IkiWiki::Render;
                resettranslationscache();
                # Trigger a wiki refresh.
                require IkiWiki::Render;

+               # without preliminary saveindex/loadindex, refresh()
+               # complains about a lot of uninitialized variables
+               IkiWiki::saveindex();
+               IkiWiki::loadindex();

                IkiWiki::refresh();
                IkiWiki::saveindex();
        }
                IkiWiki::refresh();
                IkiWiki::saveindex();
        }


@@ -378,14 +389,14 @@ sub editcontent () { #{{{
 # | Injected functions
 # `----
 
 # | Injected functions
 # `----
 

-# Implement po_link_to=current
+# Implement po_link_to 'current' and 'negotiated' settings.

 sub mybestlink ($$) { #{{{
        my $page=shift;
        my $link=shift;
 
 sub mybestlink ($$) { #{{{
        my $page=shift;
        my $link=shift;
 

-       my $res=$origsubs{'bestlink'}->($page, $link);
+       my $res=$origsubs{'bestlink'}->(masterpage($page), $link);

        if (length $res
        if (length $res

-           && $config{po_link_to} eq "current"
+           && ($config{po_link_to} eq "current" || $config{po_link_to} eq "negotiated")

            && istranslatable($res)
            && istranslation($page)) {
                return $res . "." . lang($page);
            && istranslatable($res)
            && istranslation($page)) {
                return $res . "." . lang($page);


@@ -399,6 +410,10 @@ sub mybeautify_urlpath ($) { #{{{
        my $res=$origsubs{'beautify_urlpath'}->($url);
        if ($config{po_link_to} eq "negotiated") {
                $res =~ s!/\Qindex.$config{po_master_language}{code}.$config{htmlext}\E$!/!;
        my $res=$origsubs{'beautify_urlpath'}->($url);
        if ($config{po_link_to} eq "negotiated") {
                $res =~ s!/\Qindex.$config{po_master_language}{code}.$config{htmlext}\E$!/!;

+               $res =~ s!/\Qindex.$config{htmlext}\E$!/!;
+               map {
+                       $res =~ s!/\Qindex.$_.$config{htmlext}\E$!/!;
+               } (keys %{$config{po_slave_languages}});

        }
        return $res;
 } #}}}
        }
        return $res;
 } #}}}


@@ -475,9 +490,18 @@ sub myurlto ($$;$) { #{{{
 # | Helper functions
 # `----
 
 # | Helper functions
 # `----
 

+sub maybe_add_leading_slash ($;$) { #{{{
+       my $str=shift;
+       my $add=shift;
+       $add=1 unless defined $add;
+       return '/' . $str if $add;
+       return $str;
+} #}}}
+

 sub istranslatable ($) { #{{{
        my $page=shift;
 
 sub istranslatable ($) { #{{{
        my $page=shift;
 

+       $page=~s#^/##;

        my $file=$pagesources{$page};
 
        return 0 unless defined $file;
        my $file=$pagesources{$page};
 
        return 0 unless defined $file;


@@ -489,8 +513,8 @@ sub istranslatable ($) { #{{{
 sub _istranslation ($) { #{{{
        my $page=shift;
 
 sub _istranslation ($) { #{{{
        my $page=shift;
 

+       my $hasleadingslash = ($page=~s#^/##);

        my $file=$pagesources{$page};
        my $file=$pagesources{$page};

-

        return 0 unless (defined $file
                         && defined pagetype($file)
                         && pagetype($file) eq 'po');
        return 0 unless (defined $file
                         && defined pagetype($file)
                         && pagetype($file) eq 'po');


@@ -502,15 +526,18 @@ sub _istranslation ($) { #{{{
                         && defined $pagesources{$masterpage}
                         && defined $config{po_slave_languages}{$lang});
 
                         && defined $pagesources{$masterpage}
                         && defined $config{po_slave_languages}{$lang});
 

-       return ($masterpage, $lang) if istranslatable($masterpage);
+       return (maybe_add_leading_slash($masterpage, $hasleadingslash), $lang)
+               if istranslatable($masterpage);

 } #}}}
 
 sub istranslation ($) { #{{{
        my $page=shift;
 
        if (1 < (my ($masterpage, $lang) = _istranslation($page))) {
 } #}}}
 
 sub istranslation ($) { #{{{
        my $page=shift;
 
        if (1 < (my ($masterpage, $lang) = _istranslation($page))) {

+               my $hasleadingslash = ($masterpage=~s#^/##);

                $translations{$masterpage}{$lang}=$page unless exists $translations{$masterpage}{$lang};
                $translations{$masterpage}{$lang}=$page unless exists $translations{$masterpage}{$lang};

-               return ($masterpage, $lang);
+               return (maybe_add_leading_slash($masterpage, $hasleadingslash), $lang)
+                       if istranslatable($masterpage);

        }
        return;
 } #}}}
        }
        return;
 } #}}}


@@ -544,7 +571,7 @@ sub otherlanguages($) { #{{{
 
        my %ret;
        if (istranslatable($page)) {
 
        my %ret;
        if (istranslatable($page)) {

-               %ret = %{$translations{$page}};
+               %ret = %{$translations{$page}} if defined $translations{$page};

        }
        elsif (istranslation($page)) {
                my $masterpage = masterpage($page);
        }
        elsif (istranslation($page)) {
                my $masterpage = masterpage($page);


@@ -691,7 +718,7 @@ sub otherlanguagesloop ($) { #{{{
                }
                else {
                        push @ret, {
                }
                else {
                        push @ret, {

-                               url => urlto($otherpage, $page),
+                               url => urlto_with_orig_beautiful_urlpath($otherpage, $page),

                                code => $lang,
                                language => languagename($lang),
                                percent => percenttranslated($otherpage),
                                code => $lang,
                                language => languagename($lang),
                                percent => percenttranslated($otherpage),


@@ -705,6 +732,11 @@ sub otherlanguagesloop ($) { #{{{
                } @ret;
 } #}}}
 
                } @ret;
 } #}}}
 

+sub homepageurl (;$) { #{{{
+       my $page=shift;
+
+       return urlto('', $page);
+} #}}}

 
 # ,----
 # | PageSpec's
 
 # ,----
 # | PageSpec's