Remember to run all the tests before committing!

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

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index a233fb5affee8927c2d667244c170bf406982403..6410a1c663ceba0b615a6d3959bb27c3dd20b609 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -30,6 +30,8 @@ my %translations;
 my @origneedsbuild;
 my %origsubs;
 my @slavelanguages; # language codes ordered as in config po_slave_languages
 my @origneedsbuild;
 my %origsubs;
 my @slavelanguages; # language codes ordered as in config po_slave_languages

+my %slavelanguages; # language code to name lookup
+my $language_code_pattern = '[a-zA-Z]+(?:_[a-zA-Z]+)?';

 
 memoize("istranslatable");
 memoize("_istranslation");
 
 memoize("istranslatable");
 memoize("_istranslation");


@@ -37,7 +39,8 @@ memoize("percenttranslated");
 
 sub import {
        hook(type => "getsetup", id => "po", call => \&getsetup);
 
 sub import {
        hook(type => "getsetup", id => "po", call => \&getsetup);

-       hook(type => "checkconfig", id => "po", call => \&checkconfig);
+       hook(type => "checkconfig", id => "po", call => \&checkconfig,
+               last => 1);

        hook(type => "needsbuild", id => "po", call => \&needsbuild);
        hook(type => "scan", id => "po", call => \&scan, last => 1);
        hook(type => "filter", id => "po", call => \&filter);
        hook(type => "needsbuild", id => "po", call => \&needsbuild);
        hook(type => "scan", id => "po", call => \&scan, last => 1);
        hook(type => "filter", id => "po", call => \&filter);


@@ -64,8 +67,11 @@ sub import {
                inject(name => "IkiWiki::urlto", call => \&myurlto);
                $origsubs{'cgiurl'}=\&IkiWiki::cgiurl;
                inject(name => "IkiWiki::cgiurl", call => \&mycgiurl);
                inject(name => "IkiWiki::urlto", call => \&myurlto);
                $origsubs{'cgiurl'}=\&IkiWiki::cgiurl;
                inject(name => "IkiWiki::cgiurl", call => \&mycgiurl);

-               $origsubs{'rootpage'}=\&IkiWiki::rootpage;
-               inject(name => "IkiWiki::rootpage", call => \&myrootpage);
+               if (IkiWiki->can('rootpage')) {
+                       $origsubs{'rootpage'}=\&IkiWiki::rootpage;
+                       inject(name => "IkiWiki::rootpage", call => \&myrootpage)
+                               if defined $origsubs{'rootpage'};
+               }

                $origsubs{'isselflink'}=\&IkiWiki::isselflink;
                inject(name => "IkiWiki::isselflink", call => \&myisselflink);
        }
                $origsubs{'isselflink'}=\&IkiWiki::isselflink;
                inject(name => "IkiWiki::isselflink", call => \&myisselflink);
        }


@@ -138,6 +144,7 @@ sub checkconfig () {
                else {
                        $master_language_code=$config{po_master_language}{code};
                        $master_language_name=$config{po_master_language}{name};
                else {
                        $master_language_code=$config{po_master_language}{code};
                        $master_language_name=$config{po_master_language}{name};

+                       $config{po_master_language}=joinlangpair($master_language_code, $master_language_name);

                }
        }
        if (! defined $master_language_code) {
                }
        }
        if (! defined $master_language_code) {


@@ -148,23 +155,25 @@ sub checkconfig () {
        }
 
        if (ref $config{po_slave_languages} eq 'ARRAY') {
        }
 
        if (ref $config{po_slave_languages} eq 'ARRAY') {

-               my %slaves;

                foreach my $pair (@{$config{po_slave_languages}}) {
                        my ($code, $name)=splitlangpair($pair);
                foreach my $pair (@{$config{po_slave_languages}}) {
                        my ($code, $name)=splitlangpair($pair);

-                       if (defined $code) {
+                       if (defined $code && ! exists $slavelanguages{$code}) {

                                push @slavelanguages, $code;
                                push @slavelanguages, $code;

-                               $slaves{$code} = $name;
+                               $slavelanguages{$code} = $name;

                        }
                }
                        }
                }

-               $config{po_slave_languages} = \%slaves;

        }
        elsif (ref $config{po_slave_languages} eq 'HASH') {
        }
        elsif (ref $config{po_slave_languages} eq 'HASH') {

+               %slavelanguages=%{$config{po_slave_languages}};

                @slavelanguages = sort {
                        $config{po_slave_languages}->{$a} cmp $config{po_slave_languages}->{$b};
                @slavelanguages = sort {
                        $config{po_slave_languages}->{$a} cmp $config{po_slave_languages}->{$b};

-               } keys %{$config{po_slave_languages}};
+               } keys %slavelanguages;
+               $config{po_slave_languages}=[
+                       map { joinlangpair($_, $slavelanguages{$_}) } @slavelanguages
+               ]

        }
 
        }
 

-       delete $config{po_slave_languages}{$master_language_code};
+       delete $slavelanguages{$master_language_code};

 
        map {
                islanguagecode($_)
 
        map {
                islanguagecode($_)


@@ -334,6 +343,13 @@ sub pagetemplate (@) {
        if ($template->query(name => "istranslatable")) {
                $template->param(istranslatable => istranslatable($page));
        }
        if ($template->query(name => "istranslatable")) {
                $template->param(istranslatable => istranslatable($page));
        }

+       my $lang_code = istranslation($page) ? lang($page) : $master_language_code;
+       if ($template->query(name => "lang_code")) {
+               $template->param(lang_code => $lang_code);
+       }
+       if ($template->query(name => "lang_name")) {
+               $template->param(lang_name => languagename($lang_code));
+       }

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


@@ -363,7 +379,8 @@ sub pagetemplate (@) {
            && $masterpage eq "index") {
                $template->param('parentlinks' => []);
        }
            && $masterpage eq "index") {
                $template->param('parentlinks' => []);
        }

-       if (ishomepage($page) && $template->query(name => "title")) {
+       if (ishomepage($page) && $template->query(name => "title")
+           && !$template->param("title_overridden")) {

                $template->param(title => $config{wikiname});
        }
 }
                $template->param(title => $config{wikiname});
        }
 }


@@ -615,23 +632,27 @@ sub mybeautify_urlpath ($) {
        return $res;
 }
 
        return $res;
 }
 

-sub mytargetpage ($$) {
+sub mytargetpage ($$;$) {

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

+       my $filename=shift;

 
        if (istranslation($page) || istranslatable($page)) {
                my ($masterpage, $lang) = (masterpage($page), lang($page));
 
        if (istranslation($page) || istranslatable($page)) {
                my ($masterpage, $lang) = (masterpage($page), lang($page));

-               if (! $config{usedirs} || $masterpage eq 'index') {
+               if (defined $filename) {
+                       return $masterpage . "/" . $filename . "." . $lang . "." . $ext;
+               }
+               elsif (! $config{usedirs} || $masterpage eq 'index') {

                        return $masterpage . "." . $lang . "." . $ext;
                }
                else {
                        return $masterpage . "/index." . $lang . "." . $ext;
                }
        }
                        return $masterpage . "." . $lang . "." . $ext;
                }
                else {
                        return $masterpage . "/index." . $lang . "." . $ext;
                }
        }

-       return $origsubs{'targetpage'}->($page, $ext);
+       return $origsubs{'targetpage'}->($page, $ext, $filename);

 }
 
 }
 

-sub myurlto ($$;$) {
+sub myurlto ($;$$) {

        my $to=shift;
        my $from=shift;
        my $absolute=shift;
        my $to=shift;
        my $from=shift;
        my $absolute=shift;


@@ -640,7 +661,12 @@ sub myurlto ($$;$) {
        if (! length $to
            && $config{po_link_to} eq "current"
            && istranslatable('index')) {
        if (! length $to
            && $config{po_link_to} eq "current"
            && istranslatable('index')) {

-               return IkiWiki::beautify_urlpath(IkiWiki::baseurl($from) . "index." . lang($from) . ".$config{htmlext}");
+               if (defined $from) {
+                       return IkiWiki::beautify_urlpath(IkiWiki::baseurl($from) . "index." . lang($from) . ".$config{htmlext}");
+               }
+               else {
+                       return $origsubs{'urlto'}->($to,$from,$absolute);
+               }

        }
        # avoid using our injected beautify_urlpath if run by cgi_editpage,
        # so that one is redirected to the just-edited page rather than to the
        }
        # avoid using our injected beautify_urlpath if run by cgi_editpage,
        # so that one is redirected to the just-edited page rather than to the


@@ -793,11 +819,11 @@ sub _istranslation ($) {
                         && pagetype($file) eq 'po';
        return 0 if $file =~ /\.pot$/;
 
                         && pagetype($file) eq 'po';
        return 0 if $file =~ /\.pot$/;
 

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

        return 0 unless defined $masterpage && defined $lang
                         && length $masterpage && length $lang
                         && defined $pagesources{$masterpage}
        return 0 unless defined $masterpage && defined $lang
                         && length $masterpage && length $lang
                         && defined $pagesources{$masterpage}

-                        && defined $config{po_slave_languages}{$lang};
+                        && defined $slavelanguages{$lang};

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


@@ -835,7 +861,7 @@ sub lang ($) {
 sub islanguagecode ($) {
        my $code=shift;
 
 sub islanguagecode ($) {
        my $code=shift;
 

-       return $code =~ /^[a-z]{2}$/;
+       return $code =~ /^$language_code_pattern$/;

 }
 
 sub otherlanguage_page ($$) {
 }
 
 sub otherlanguage_page ($$) {


@@ -1015,8 +1041,8 @@ sub languagename ($) {
 
        return $master_language_name
                if $code eq $master_language_code;
 
        return $master_language_name
                if $code eq $master_language_code;

-       return $config{po_slave_languages}{$code}
-               if defined $config{po_slave_languages}{$code};
+       return $slavelanguages{$code}
+               if defined $slavelanguages{$code};

        return;
 }
 
        return;
 }
 


@@ -1227,6 +1253,7 @@ sub po4a_options($) {
                # how to disable options is not consistent across po4a modules
                $options{includessi} = '';
                $options{includeexternal} = 0;
                # how to disable options is not consistent across po4a modules
                $options{includessi} = '';
                $options{includeexternal} = 0;

+               $options{ontagerror} = 'warn';

        }
        elsif ($pagetype eq 'mdwn') {
                $options{markdown} = 1;
        }
        elsif ($pagetype eq 'mdwn') {
                $options{markdown} = 1;


@@ -1241,17 +1268,24 @@ sub po4a_options($) {
 sub splitlangpair ($) {
        my $pair=shift;
 
 sub splitlangpair ($) {
        my $pair=shift;
 

-       my ($code, $name) = ( $pair =~ /^([a-z]{2})\|(.+)$/ );
+       my ($code, $name) = ( $pair =~ /^($language_code_pattern)\|(.+)$/ );

        if (! defined $code || ! defined $name ||
            ! length $code || ! length $name) {
                # not a fatal error to avoid breaking if used with web setup
        if (! defined $code || ! defined $name ||
            ! length $code || ! length $name) {
                # not a fatal error to avoid breaking if used with web setup

-               print STDERR sprintf(gettext("%s has invalid syntax: must use CODE|NAME"),
-                       $pair)."\n";
+               warn sprintf(gettext("%s has invalid syntax: must use CODE|NAME"),
+                       $pair);

        }
 
        return $code, $name;
 }
 
        }
 
        return $code, $name;
 }
 

+sub joinlangpair ($$) {
+       my $code=shift;
+       my $name=shift;
+
+       return "$code|$name";
+}
+

 # ,----
 # | PageSpecs
 # `----
 # ,----
 # | PageSpecs
 # `----


@@ -1286,7 +1320,7 @@ sub match_lang ($$;@) {
 
        my $regexp=IkiWiki::glob2re($wanted);
        my $lang=IkiWiki::Plugin::po::lang($page);
 
        my $regexp=IkiWiki::glob2re($wanted);
        my $lang=IkiWiki::Plugin::po::lang($page);

-       if ($lang !~ /^$regexp$/i) {
+       if ($lang !~ $regexp) {

                return IkiWiki::FailReason->new("file language is $lang, not $wanted");
        }
        else {
                return IkiWiki::FailReason->new("file language is $lang, not $wanted");
        }
        else {