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 8ea852d04f56f8cbc7f72293c276a655d21bd8c7..1212181ca39b5747cbc9ac635e66f1af6ea885c8 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -21,17 +21,10 @@ use UNIVERSAL;
 
 my %translations;
 my @origneedsbuild;
 
 my %translations;
 my @origneedsbuild;

-our %filtered;
+my %origsubs;

 
 memoize("_istranslation");
 memoize("percenttranslated");
 
 memoize("_istranslation");
 memoize("percenttranslated");

-# FIXME: memoizing istranslatable() makes some test cases fail once every
-# two tries; this may be related to the artificial way the testsuite is
-# run, or not.
-# memoize("istranslatable");
-
-# backup references to subs that will be overriden
-my %origsubs;

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


@@ -54,11 +47,27 @@ sub import { #{{{
        inject(name => "IkiWiki::urlto", call => \&myurlto);
 } #}}}
 
        inject(name => "IkiWiki::urlto", call => \&myurlto);
 } #}}}
 

+
+# ,----
+# | Table of contents
+# `----
+
+# 1. Hooks
+# 2. Injected functions
+# 3. Blackboxes for private data
+# 4. Helper functions
+# 5. PageSpec's
+
+
+# ,----
+# | Hooks
+# `----
+

 sub getsetup () { #{{{
        return
                plugin => {
                        safe => 0,
 sub getsetup () { #{{{
        return
                plugin => {
                        safe => 0,

-                       rebuild => 1, # format plugin & changes html filenames
+                       rebuild => 1,

                },
                po_master_language => {
                        type => "string",
                },
                po_master_language => {
                        type => "string",


@@ -98,11 +107,6 @@ sub getsetup () { #{{{
                },
 } #}}}
 
                },
 } #}}}
 

-sub islanguagecode ($) { #{{{
-    my $code=shift;
-    return ($code =~ /^[a-z]{2}$/);
-} #}}}
-

 sub checkconfig () { #{{{
        foreach my $field (qw{po_master_language po_slave_languages}) {
                if (! exists $config{$field} || ! defined $config{$field}) {
 sub checkconfig () { #{{{
        foreach my $field (qw{po_master_language po_slave_languages}) {
                if (! exists $config{$field} || ! defined $config{$field}) {


@@ -138,97 +142,6 @@ sub checkconfig () { #{{{
        push @{$config{wiki_file_prune_regexps}}, qr/\.pot$/;
 } #}}}
 
        push @{$config{wiki_file_prune_regexps}}, qr/\.pot$/;
 } #}}}
 

-sub otherlanguages($) { #{{{
-       my $page=shift;
-
-       my %ret;
-       if (istranslatable($page)) {
-               %ret = %{$translations{$page}};
-       }
-       elsif (istranslation($page)) {
-               my ($masterpage, $curlang) = ($page =~ /(.*)[.]([a-z]{2})$/);
-               $ret{$config{po_master_language}{code}} = $masterpage;
-               foreach my $lang (sort keys %{$translations{$masterpage}}) {
-                       next if $lang eq $curlang;
-                       $ret{$lang} = $translations{$masterpage}{$lang};
-               }
-       }
-       return \%ret;
-} #}}}
-
-sub potfile ($) { #{{{
-       my $masterfile=shift;
-
-       (my $name, my $dir, my $suffix) = fileparse($masterfile, qr/\.[^.]*/);
-       $dir='' if $dir eq './';
-       return File::Spec->catpath('', $dir, $name . ".pot");
-} #}}}
-
-sub pofile ($$) { #{{{
-       my $masterfile=shift;
-       my $lang=shift;
-
-       (my $name, my $dir, my $suffix) = fileparse($masterfile, qr/\.[^.]*/);
-       $dir='' if $dir eq './';
-       return File::Spec->catpath('', $dir, $name . "." . $lang . ".po");
-} #}}}
-
-sub pofiles ($) { #{{{
-       my $masterfile=shift;
-       return map pofile($masterfile, $_), (keys %{$config{po_slave_languages}});
-} #}}}
-
-sub refreshpot ($) { #{{{
-       my $masterfile=shift;
-
-       my $potfile=potfile($masterfile);
-       my %options = ("markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0);
-       my $doc=Locale::Po4a::Chooser::new('text',%options);
-       $doc->{TT}{utf_mode} = 1;
-       $doc->{TT}{file_in_charset} = 'utf-8';
-       $doc->{TT}{file_out_charset} = 'utf-8';
-       $doc->read($masterfile);
-       # let's cheat a bit to force porefs option to be passed to Locale::Po4a::Po;
-       # this is undocument use of internal Locale::Po4a::TransTractor's data,
-       # compulsory since this module prevents us from using the porefs option.
-       my %po_options = ('porefs' => 'none');
-       $doc->{TT}{po_out}=Locale::Po4a::Po->new(\%po_options);
-       $doc->{TT}{po_out}->set_charset('utf-8');
-       # do the actual work
-       $doc->parse;
-       IkiWiki::prep_writefile(basename($potfile),dirname($potfile));
-       $doc->writepo($potfile);
-} #}}}
-
-sub refreshpofiles ($@) { #{{{
-       my $masterfile=shift;
-       my @pofiles=@_;
-
-       my $potfile=potfile($masterfile);
-       error("[po/refreshpofiles] POT file ($potfile) does not exist") unless (-e $potfile);
-
-       foreach my $pofile (@pofiles) {
-               IkiWiki::prep_writefile(basename($pofile),dirname($pofile));
-               if (-e $pofile) {
-                       system("msgmerge", "-U", "--backup=none", $pofile, $potfile) == 0
-                               or error("[po/refreshpofiles:$pofile] failed to update");
-               }
-               else {
-                       File::Copy::syscopy($potfile,$pofile)
-                               or error("[po/refreshpofiles:$pofile] failed to copy the POT file");
-               }
-       }
-} #}}}
-
-sub buildtranslationscache() { #{{{
-       # use istranslation's side-effect
-       map istranslation($_), (keys %pagesources);
-} #}}}
-
-sub resettranslationscache() { #{{{
-       undef %translations;
-} #}}}
-

 sub needsbuild () { #{{{
        my $needsbuild=shift;
 
 sub needsbuild () { #{{{
        my $needsbuild=shift;
 


@@ -244,6 +157,10 @@ sub needsbuild () { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

+# Massage the recorded state of internal links so that:
+# - it matches the actually generated links, rather than the links as written
+#   in the pages' source
+# - backlinks are consistent in all cases

 sub scan (@) { #{{{
        my %params=@_;
        my $page=$params{page};
 sub scan (@) { #{{{
        my %params=@_;
        my $page=$params{page};


@@ -252,7 +169,6 @@ sub scan (@) { #{{{
        return unless UNIVERSAL::can("IkiWiki::Plugin::link", "import");
 
        if (istranslation($page)) {
        return unless UNIVERSAL::can("IkiWiki::Plugin::link", "import");
 
        if (istranslation($page)) {

-               my ($masterpage, $curlang) = ($page =~ /(.*)[.]([a-z]{2})$/);

                foreach my $destpage (@{$links{$page}}) {
                        if (istranslatable($destpage)) {
                                # replace one occurence of $destpage in $links{$page}
                foreach my $destpage (@{$links{$page}}) {
                        if (istranslatable($destpage)) {
                                # replace one occurence of $destpage in $links{$page}


@@ -261,7 +177,7 @@ sub scan (@) { #{{{
                                # there for other reasons)
                                for (my $i=0; $i<@{$links{$page}}; $i++) {
                                        if (@{$links{$page}}[$i] eq $destpage) {
                                # there for other reasons)
                                for (my $i=0; $i<@{$links{$page}}; $i++) {
                                        if (@{$links{$page}}[$i] eq $destpage) {

-                                               @{$links{$page}}[$i] = $destpage . '.' . $curlang;
+                                               @{$links{$page}}[$i] = $destpage . '.' . lang($page);

                                                last;
                                        }
                                }
                                                last;
                                        }
                                }


@@ -271,119 +187,15 @@ sub scan (@) { #{{{
        elsif (! istranslatable($page) && ! istranslation($page)) {
                foreach my $destpage (@{$links{$page}}) {
                        if (istranslatable($destpage)) {
        elsif (! istranslatable($page) && ! istranslation($page)) {
                foreach my $destpage (@{$links{$page}}) {
                        if (istranslatable($destpage)) {

-                               map {
-                                       push @{$links{$page}}, $destpage . '.' . $_;
-                               } (keys %{$config{po_slave_languages}});
+                               # make sure any destpage's translations has
+                               # $page in its backlinks
+                               push @{$links{$page}},
+                                       values %{otherlanguages($destpage)};

                        }
                }
        }
 } #}}}
 
                        }
                }
        }
 } #}}}
 

-sub mytargetpage ($$) { #{{{
-       my $page=shift;
-       my $ext=shift;
-
-       if (istranslation($page)) {
-               my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
-               if (! $config{usedirs} || $masterpage eq 'index') {
-                       return $masterpage . "." . $lang . "." . $ext;
-               }
-               else {
-                       return $masterpage . "/index." . $lang . "." . $ext;
-               }
-       }
-       elsif (istranslatable($page)) {
-               if (! $config{usedirs} || $page eq 'index') {
-                       return $page . "." . $config{po_master_language}{code} . "." . $ext;
-               }
-               else {
-                       return $page . "/index." . $config{po_master_language}{code} . "." . $ext;
-               }
-       }
-       return $origsubs{'targetpage'}->($page, $ext);
-} #}}}
-
-sub mybeautify_urlpath ($) { #{{{
-       my $url=shift;
-
-       my $res=$origsubs{'beautify_urlpath'}->($url);
-       if ($config{po_link_to} eq "negotiated") {
-               $res =~ s!/\Qindex.$config{po_master_language}{code}.$config{htmlext}\E$!/!;
-       }
-       return $res;
-} #}}}
-
-sub urlto_with_orig_beautiful_urlpath($$) { #{{{
-       my $to=shift;
-       my $from=shift;
-
-       inject(name => "IkiWiki::beautify_urlpath", call => $origsubs{'beautify_urlpath'});
-       my $res=urlto($to, $from);
-       inject(name => "IkiWiki::beautify_urlpath", call => \&mybeautify_urlpath);
-
-       return $res;
-} #}}}
-
-sub myurlto ($$;$) { #{{{
-       my $to=shift;
-       my $from=shift;
-       my $absolute=shift;
-
-       # workaround hard-coded /index.$config{htmlext} in IkiWiki::urlto()
-       if (! length $to
-           && $config{po_link_to} eq "current"
-           && istranslation($from)
-           && istranslatable('index')) {
-               my ($masterpage, $curlang) = ($from =~ /(.*)[.]([a-z]{2})$/);
-               return IkiWiki::beautify_urlpath(IkiWiki::baseurl($from) . "index." . $curlang . ".$config{htmlext}");
-       }
-       return $origsubs{'urlto'}->($to,$from,$absolute);
-} #}}}
-
-sub mybestlink ($$) { #{{{
-       my $page=shift;
-       my $link=shift;
-
-       my $res=$origsubs{'bestlink'}->($page, $link);
-       if (length $res) {
-               if ($config{po_link_to} eq "current"
-                   && istranslatable($res)
-                   && istranslation($page)) {
-                       my ($masterpage, $curlang) = ($page =~ /(.*)[.]([a-z]{2})$/);
-                       return $res . "." . $curlang;
-               }
-               else {
-                       return $res;
-               }
-       }
-       return "";
-} #}}}
-
-sub alreadyfiltered($$) { #{{{
-       my $page=shift;
-       my $destpage=shift;
-
-       return ( exists $filtered{$page}{$destpage}
-                && $filtered{$page}{$destpage} eq 1 );
-} #}}}
-sub setalreadyfiltered($$) { #{{{
-       my $page=shift;
-       my $destpage=shift;
-
-       $filtered{$page}{$destpage}=1;
-} #}}}
-sub unsetalreadyfiltered($$) { #{{{
-       my $page=shift;
-       my $destpage=shift;
-
-       if (exists $filtered{$page}{$destpage}) {
-               delete $filtered{$page}{$destpage};
-       }
-} #}}}
-sub resetalreadyfiltered() { #{{{
-       undef %filtered;
-} #}}}
-

 # We use filter to convert PO to the master page's format,
 # since the rest of ikiwiki should not work on PO files.
 sub filter (@) { #{{{
 # We use filter to convert PO to the master page's format,
 # since the rest of ikiwiki should not work on PO files.
 sub filter (@) { #{{{


@@ -419,8 +231,7 @@ sub filter (@) { #{{{
 
        writefile(basename($infile), File::Spec->tmpdir, $content);
 
 
        writefile(basename($infile), File::Spec->tmpdir, $content);
 

-       my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
-       my $masterfile = srcfile($pagesources{$masterpage});
+       my $masterfile = srcfile($pagesources{masterpage($page)});

        my (@pos,@masters);
        push @pos,$infile;
        push @masters,$masterfile;
        my (@pos,@masters);
        push @pos,$infile;
        push @masters,$masterfile;


@@ -451,70 +262,14 @@ sub htmlize (@) { #{{{
 
        my $page = $params{page};
        my $content = $params{content};
 
        my $page = $params{page};
        my $content = $params{content};

-       my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
-       my $masterfile = srcfile($pagesources{$masterpage});
-
-       # 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);
-} #}}}

 
 

-sub percenttranslated ($) { #{{{
-       my $page=shift;
+       # ignore PO files this plugin did not create
+       return $content unless istranslation($page);

 
 

-       return gettext("N/A") unless (istranslation($page));
-       my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
-       my $file=srcfile($pagesources{$page});
-       my $masterfile = srcfile($pagesources{$masterpage});
-       my (@pos,@masters);
-       push @pos,$file;
-       push @masters,$masterfile;
-       my %options = (
-               "markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0,
-       );
-       my $doc=Locale::Po4a::Chooser::new('text',%options);
-       $doc->process(
-               'po_in_name'    => \@pos,
-               'file_in_name'  => \@masters,
-               'file_in_charset'  => 'utf-8',
-               'file_out_charset' => 'utf-8',
-       ) or error("[po/percenttranslated:$page]: failed to translate");
-       my ($percent,$hit,$queries) = $doc->stats();
-       return $percent;
-} #}}}
-
-sub otherlanguagesloop ($) { #{{{
-       my $page=shift;
-
-       my @ret;
-       if (istranslatable($page)) {
-               foreach my $lang (sort keys %{$translations{$page}}) {
-                       my $translation = $translations{$page}{$lang};
-                       push @ret, {
-                               url => urlto($translation, $page),
-                               code => $lang,
-                               language => $config{po_slave_languages}{$lang},
-                               percent => percenttranslated($translation),
-                       };
-               }
-       }
-       elsif (istranslation($page)) {
-               my ($masterpage, $curlang) = ($page =~ /(.*)[.]([a-z]{2})$/);
-               push @ret, {
-                       url => urlto_with_orig_beautiful_urlpath($masterpage, $page),
-                       code => $config{po_master_language}{code},
-                       language => $config{po_master_language}{name},
-                       master => 1,
-               };
-               foreach my $lang (sort keys %{$translations{$masterpage}}) {
-                       push @ret, {
-                               url => urlto($translations{$masterpage}{$lang}, $page),
-                               code => $lang,
-                               language => $config{po_slave_languages}{$lang},
-                               percent => percenttranslated($translations{$masterpage}{$lang}),
-                       } unless ($lang eq $curlang);
-               }
-       }
-       return @ret;
+       # force content to be htmlize'd as if it was the same type as the master page
+       return IkiWiki::htmlize($page, $page,
+                               pagetype(srcfile($pagesources{masterpage($page)})),
+                               $content);

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


@@ -523,17 +278,20 @@ sub pagetemplate (@) { #{{{
        my $destpage=$params{destpage};
        my $template=$params{template};
 
        my $destpage=$params{destpage};
        my $template=$params{template};
 

-       my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/) if istranslation($page);
+       my ($masterpage, $lang) = istranslation($page);

 
        if (istranslation($page) && $template->query(name => "percenttranslated")) {
                $template->param(percenttranslated => percenttranslated($page));
        }
        if ($template->query(name => "istranslation")) {
 
        if (istranslation($page) && $template->query(name => "percenttranslated")) {
                $template->param(percenttranslated => percenttranslated($page));
        }
        if ($template->query(name => "istranslation")) {

-               $template->param(istranslation => istranslation($page));
+               $template->param(istranslation => scalar istranslation($page));

        }
        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)});


@@ -608,69 +366,382 @@ 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();
        }
 } #}}}
 

+# As we're previewing or saving a page, the content may have
+# changed, so tell the next filter() invocation it must not be lazy.

 sub editcontent () { #{{{
        my %params=@_;
 sub editcontent () { #{{{
        my %params=@_;

-       # as we're previewing or saving a page, the content may have
-       # changed, so tell the next filter() invocation it must not be lazy
+

        unsetalreadyfiltered($params{page}, $params{page});
        return $params{content};
 } #}}}
 
        unsetalreadyfiltered($params{page}, $params{page});
        return $params{content};
 } #}}}
 

+
+# ,----
+# | Injected functions
+# `----
+
+# Implement po_link_to 'current' and 'negotiated' settings.
+sub mybestlink ($$) { #{{{
+       my $page=shift;
+       my $link=shift;
+
+       my $res=$origsubs{'bestlink'}->(masterpage($page), $link);
+       if (length $res
+           && ($config{po_link_to} eq "current" || $config{po_link_to} eq "negotiated")
+           && istranslatable($res)
+           && istranslation($page)) {
+               return $res . "." . lang($page);
+       }
+       return $res;
+} #}}}
+
+sub mybeautify_urlpath ($) { #{{{
+       my $url=shift;
+
+       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;
+} #}}}
+
+sub mytargetpage ($$) { #{{{
+       my $page=shift;
+       my $ext=shift;
+
+       if (istranslation($page) || istranslatable($page)) {
+               my ($masterpage, $lang) = (masterpage($page), lang($page));
+               if (! $config{usedirs} || $masterpage eq 'index') {
+                       return $masterpage . "." . $lang . "." . $ext;
+               }
+               else {
+                       return $masterpage . "/index." . $lang . "." . $ext;
+               }
+       }
+       return $origsubs{'targetpage'}->($page, $ext);
+} #}}}
+
+sub myurlto ($$;$) { #{{{
+       my $to=shift;
+       my $from=shift;
+       my $absolute=shift;
+
+       # workaround hard-coded /index.$config{htmlext} in IkiWiki::urlto()
+       if (! length $to
+           && $config{po_link_to} eq "current"
+           && istranslatable('index')) {
+               return IkiWiki::beautify_urlpath(IkiWiki::baseurl($from) . "index." . lang($from) . ".$config{htmlext}");
+       }
+       return $origsubs{'urlto'}->($to,$from,$absolute);
+} #}}}
+
+
+# ,----
+# | Blackboxes for private data
+# `----
+
+{
+       my %filtered;
+
+       sub alreadyfiltered($$) { #{{{
+               my $page=shift;
+               my $destpage=shift;
+
+               return ( exists $filtered{$page}{$destpage}
+                        && $filtered{$page}{$destpage} eq 1 );
+       } #}}}
+
+       sub setalreadyfiltered($$) { #{{{
+               my $page=shift;
+               my $destpage=shift;
+
+               $filtered{$page}{$destpage}=1;
+       } #}}}
+
+       sub unsetalreadyfiltered($$) { #{{{
+               my $page=shift;
+               my $destpage=shift;
+
+               if (exists $filtered{$page}{$destpage}) {
+                       delete $filtered{$page}{$destpage};
+               }
+       } #}}}
+
+       sub resetalreadyfiltered() { #{{{
+               undef %filtered;
+       } #}}}
+}
+
+
+# ,----
+# | 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};
 
        my $file=$pagesources{$page};
 

-       if (! defined $file
-           || (defined pagetype($file) && pagetype($file) eq 'po')
-           || $file =~ /\.pot$/) {
-               return 0;
-       }
+       return 0 unless defined $file;
+       return 0 if (defined pagetype($file) && pagetype($file) eq 'po');
+       return 0 if $file =~ /\.pot$/;

        return pagespec_match($page, $config{po_translatable_pages});
 } #}}}
 
 sub _istranslation ($) { #{{{
        my $page=shift;
 
        return pagespec_match($page, $config{po_translatable_pages});
 } #}}}
 
 sub _istranslation ($) { #{{{
        my $page=shift;
 

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

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

-       if (! defined $file) {
-               return IkiWiki::FailReason->new("no file specified");
+       return 0 unless (defined $file
+                        && defined pagetype($file)
+                        && pagetype($file) eq 'po');
+       return 0 if $file =~ /\.pot$/;
+
+       my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
+       return 0 unless (defined $masterpage && defined $lang
+                        && length $masterpage && length $lang
+                        && defined $pagesources{$masterpage}
+                        && defined $config{po_slave_languages}{$lang});
+
+       return (maybe_add_leading_slash($masterpage, $hasleadingslash), $lang)
+               if istranslatable($masterpage);
+} #}}}
+
+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};
+               return (maybe_add_leading_slash($masterpage, $hasleadingslash), $lang)
+                       if istranslatable($masterpage);

        }
        }

+       return;
+} #}}}
+
+sub masterpage ($) { #{{{
+       my $page=shift;

 
 

-       if (! defined $file
-           || ! defined pagetype($file)
-           || ! pagetype($file) eq 'po'
-           || $file =~ /\.pot$/) {
-               return 0;
+       if ( 1 < (my ($masterpage, $lang) = _istranslation($page))) {
+               return $masterpage;

        }
        }

+       return $page;
+} #}}}

 
 

-       my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
-       if (! defined $masterpage || ! defined $lang
-           || ! (length($masterpage) > 0) || ! (length($lang) > 0)
-           || ! defined $pagesources{$masterpage}
-           || ! defined $config{po_slave_languages}{$lang}) {
-               return 0;
+sub lang ($) { #{{{
+       my $page=shift;
+
+       if (1 < (my ($masterpage, $lang) = _istranslation($page))) {
+               return $lang;

        }
        }

+       return $config{po_master_language}{code};
+} #}}}
+
+sub islanguagecode ($) { #{{{
+       my $code=shift;

 
 

-       return istranslatable($masterpage);
+       return ($code =~ /^[a-z]{2}$/);

 } #}}}
 
 } #}}}
 

-sub istranslation ($) { #{{{
+sub otherlanguages($) { #{{{

        my $page=shift;
 
        my $page=shift;
 

-       if (_istranslation($page)) {
-               my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
-               $translations{$masterpage}{$lang}=$page unless exists $translations{$masterpage}{$lang};
-               return 1;
+       my %ret;
+       if (istranslatable($page)) {
+               %ret = %{$translations{$page}} if defined $translations{$page};
+       }
+       elsif (istranslation($page)) {
+               my $masterpage = masterpage($page);
+               $ret{$config{po_master_language}{code}} = $masterpage;
+               foreach my $lang (sort keys %{$translations{$masterpage}}) {
+                       next if $lang eq lang($page);
+                       $ret{$lang} = $translations{$masterpage}{$lang};
+               }
+       }
+       return \%ret;
+} #}}}
+
+sub potfile ($) { #{{{
+       my $masterfile=shift;
+
+       (my $name, my $dir, my $suffix) = fileparse($masterfile, qr/\.[^.]*/);
+       $dir='' if $dir eq './';
+       return File::Spec->catpath('', $dir, $name . ".pot");
+} #}}}
+
+sub pofile ($$) { #{{{
+       my $masterfile=shift;
+       my $lang=shift;
+
+       (my $name, my $dir, my $suffix) = fileparse($masterfile, qr/\.[^.]*/);
+       $dir='' if $dir eq './';
+       return File::Spec->catpath('', $dir, $name . "." . $lang . ".po");
+} #}}}
+
+sub pofiles ($) { #{{{
+       my $masterfile=shift;
+
+       return map pofile($masterfile, $_), (keys %{$config{po_slave_languages}});
+} #}}}
+
+sub refreshpot ($) { #{{{
+       my $masterfile=shift;
+
+       my $potfile=potfile($masterfile);
+       my %options = ("markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0);
+       my $doc=Locale::Po4a::Chooser::new('text',%options);
+       $doc->{TT}{utf_mode} = 1;
+       $doc->{TT}{file_in_charset} = 'utf-8';
+       $doc->{TT}{file_out_charset} = 'utf-8';
+       $doc->read($masterfile);
+       # let's cheat a bit to force porefs option to be passed to Locale::Po4a::Po;
+       # this is undocument use of internal Locale::Po4a::TransTractor's data,
+       # compulsory since this module prevents us from using the porefs option.
+       my %po_options = ('porefs' => 'none');
+       $doc->{TT}{po_out}=Locale::Po4a::Po->new(\%po_options);
+       $doc->{TT}{po_out}->set_charset('utf-8');
+       # do the actual work
+       $doc->parse;
+       IkiWiki::prep_writefile(basename($potfile),dirname($potfile));
+       $doc->writepo($potfile);
+} #}}}
+
+sub refreshpofiles ($@) { #{{{
+       my $masterfile=shift;
+       my @pofiles=@_;
+
+       my $potfile=potfile($masterfile);
+       error("[po/refreshpofiles] POT file ($potfile) does not exist") unless (-e $potfile);
+
+       foreach my $pofile (@pofiles) {
+               IkiWiki::prep_writefile(basename($pofile),dirname($pofile));
+               if (-e $pofile) {
+                       system("msgmerge", "-U", "--backup=none", $pofile, $potfile) == 0
+                               or error("[po/refreshpofiles:$pofile] failed to update");
+               }
+               else {
+                       File::Copy::syscopy($potfile,$pofile)
+                               or error("[po/refreshpofiles:$pofile] failed to copy the POT file");
+               }

        }
        }

-       return 0;

 } #}}}
 
 } #}}}
 

+sub buildtranslationscache() { #{{{
+       # use istranslation's side-effect
+       map istranslation($_), (keys %pagesources);
+} #}}}
+
+sub resettranslationscache() { #{{{
+       undef %translations;
+} #}}}
+
+sub urlto_with_orig_beautiful_urlpath($$) { #{{{
+       my $to=shift;
+       my $from=shift;
+
+       inject(name => "IkiWiki::beautify_urlpath", call => $origsubs{'beautify_urlpath'});
+       my $res=urlto($to, $from);
+       inject(name => "IkiWiki::beautify_urlpath", call => \&mybeautify_urlpath);
+
+       return $res;
+} #}}}
+
+sub percenttranslated ($) { #{{{
+       my $page=shift;
+
+       return gettext("N/A") unless istranslation($page);
+       my $file=srcfile($pagesources{$page});
+       my $masterfile = srcfile($pagesources{masterpage($page)});
+       my (@pos,@masters);
+       push @pos,$file;
+       push @masters,$masterfile;
+       my %options = (
+               "markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0,
+       );
+       my $doc=Locale::Po4a::Chooser::new('text',%options);
+       $doc->process(
+               'po_in_name'    => \@pos,
+               'file_in_name'  => \@masters,
+               'file_in_charset'  => 'utf-8',
+               'file_out_charset' => 'utf-8',
+       ) or error("[po/percenttranslated:$page]: failed to translate");
+       my ($percent,$hit,$queries) = $doc->stats();
+       return $percent;
+} #}}}
+
+sub languagename ($) { #{{{
+       my $code=shift;
+
+       return $config{po_master_language}{name}
+               if $code eq $config{po_master_language}{code};
+       return $config{po_slave_languages}{$code}
+               if defined $config{po_slave_languages}{$code};
+       return;
+} #}}}
+
+sub otherlanguagesloop ($) { #{{{
+       my $page=shift;
+
+       my @ret;
+       my %otherpages=%{otherlanguages($page)};
+       while (my ($lang, $otherpage) = each %otherpages) {
+               if (istranslation($page) && masterpage($page) eq $otherpage) {
+                       push @ret, {
+                               url => urlto_with_orig_beautiful_urlpath($otherpage, $page),
+                               code => $lang,
+                               language => languagename($lang),
+                               master => 1,
+                       };
+               }
+               else {
+                       push @ret, {
+                               url => urlto_with_orig_beautiful_urlpath($otherpage, $page),
+                               code => $lang,
+                               language => languagename($lang),
+                               percent => percenttranslated($otherpage),
+                       }
+               }
+       }
+       return sort {
+                       return -1 if $a->{code} eq $config{po_master_language}{code};
+                       return 1 if $b->{code} eq $config{po_master_language}{code};
+                       return $a->{language} cmp $b->{language};
+               } @ret;
+} #}}}
+
+sub homepageurl (;$) { #{{{
+       my $page=shift;
+
+       return urlto('', $page);
+} #}}}
+
+# ,----
+# | PageSpec's
+# `----
+

 package IkiWiki::PageSpec;
 use warnings;
 use strict;
 package IkiWiki::PageSpec;
 use warnings;
 use strict;


@@ -703,16 +774,7 @@ sub match_lang ($$;@) { #{{{
        my $wanted=shift;
 
        my $regexp=IkiWiki::glob2re($wanted);
        my $wanted=shift;
 
        my $regexp=IkiWiki::glob2re($wanted);

-       my $lang;
-       my $masterpage;
-
-       if (IkiWiki::Plugin::po::istranslation($page)) {
-               ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
-       }
-       else {
-               $lang = $config{po_master_language}{code};
-       }
-
+       my $lang=IkiWiki::Plugin::po::lang($page);

        if ($lang!~/^$regexp$/i) {
                return IkiWiki::FailReason->new("file language is $lang, not $wanted");
        }
        if ($lang!~/^$regexp$/i) {
                return IkiWiki::FailReason->new("file language is $lang, not $wanted");
        }


@@ -723,26 +785,13 @@ sub match_lang ($$;@) { #{{{
 
 sub match_currentlang ($$;@) { #{{{
        my $page=shift;
 
 sub match_currentlang ($$;@) { #{{{
        my $page=shift;

-

        shift;
        my %params=@_;
        shift;
        my %params=@_;

-       my ($currentmasterpage, $currentlang, $masterpage, $lang);

 
        return IkiWiki::FailReason->new("no location provided") unless exists $params{location};
 
 
        return IkiWiki::FailReason->new("no location provided") unless exists $params{location};
 

-       if (IkiWiki::Plugin::po::istranslation($params{location})) {
-               ($currentmasterpage, $currentlang) = ($params{location} =~ /(.*)[.]([a-z]{2})$/);
-       }
-       else {
-               $currentlang = $config{po_master_language}{code};
-       }
-
-       if (IkiWiki::Plugin::po::istranslation($page)) {
-               ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
-       }
-       else {
-               $lang = $config{po_master_language}{code};
-       }
+       my $currentlang=IkiWiki::Plugin::po::lang($params{location});
+       my $lang=IkiWiki::Plugin::po::lang($page);

 
        if ($lang eq $currentlang) {
                return IkiWiki::SuccessReason->new("file language is the same as current one, i.e. $currentlang");
 
        if ($lang eq $currentlang) {
                return IkiWiki::SuccessReason->new("file language is the same as current one, i.e. $currentlang");