po: rewrote otherlanguagesloop()

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

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 5383027b826ce396c8a58e1530598c821a325008..1754260ed8867b8e5ab32bfc9fbac15333f72f94 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -98,8 +98,8 @@ sub getsetup () { #{{{
 } #}}}
 
 sub islanguagecode ($) { #{{{
 } #}}}
 
 sub islanguagecode ($) { #{{{

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

 } #}}}
 
 sub checkconfig () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{


@@ -145,10 +145,10 @@ sub otherlanguages($) { #{{{
                %ret = %{$translations{$page}};
        }
        elsif (istranslation($page)) {
                %ret = %{$translations{$page}};
        }
        elsif (istranslation($page)) {

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

                $ret{$config{po_master_language}{code}} = $masterpage;
                foreach my $lang (sort keys %{$translations{$masterpage}}) {
                $ret{$config{po_master_language}{code}} = $masterpage;
                foreach my $lang (sort keys %{$translations{$masterpage}}) {

-                       next if $lang eq $curlang;
+                       next if $lang eq lang($page);

                        $ret{$lang} = $translations{$masterpage}{$lang};
                }
        }
                        $ret{$lang} = $translations{$masterpage}{$lang};
                }
        }


@@ -251,7 +251,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}


@@ -260,7 +259,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;
                                        }
                                }


@@ -283,7 +282,7 @@ sub mytargetpage ($$) { #{{{
        my $ext=shift;
 
        if (istranslation($page)) {
        my $ext=shift;
 
        if (istranslation($page)) {

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

                if (! $config{usedirs} || $masterpage eq 'index') {
                        return $masterpage . "." . $lang . "." . $ext;
                }
                if (! $config{usedirs} || $masterpage eq 'index') {
                        return $masterpage . "." . $lang . "." . $ext;
                }


@@ -333,8 +332,7 @@ sub myurlto ($$;$) { #{{{
            && $config{po_link_to} eq "current"
            && istranslation($from)
            && istranslatable('index')) {
            && $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 IkiWiki::beautify_urlpath(IkiWiki::baseurl($from) . "index." . lang($from) . ".$config{htmlext}");

        }
        return $origsubs{'urlto'}->($to,$from,$absolute);
 } #}}}
        }
        return $origsubs{'urlto'}->($to,$from,$absolute);
 } #}}}


@@ -348,8 +346,7 @@ sub mybestlink ($$) { #{{{
                if ($config{po_link_to} eq "current"
                    && istranslatable($res)
                    && istranslation($page)) {
                if ($config{po_link_to} eq "current"
                    && istranslatable($res)
                    && istranslation($page)) {

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

                }
                else {
                        return $res;
                }
                else {
                        return $res;


@@ -426,8 +423,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;


@@ -458,8 +454,7 @@ 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});
+       my $masterfile = srcfile($pagesources{masterpage($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);
 
        # 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);


@@ -468,10 +463,9 @@ sub htmlize (@) { #{{{
 sub percenttranslated ($) { #{{{
        my $page=shift;
 
 sub percenttranslated ($) { #{{{
        my $page=shift;
 

-       return gettext("N/A") unless (istranslation($page));
-       my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
+       return gettext("N/A") unless istranslation($page);

        my $file=srcfile($pagesources{$page});
        my $file=srcfile($pagesources{$page});

-       my $masterfile = srcfile($pagesources{$masterpage});
+       my $masterfile = srcfile($pagesources{masterpage($page)});

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


@@ -489,39 +483,44 @@ sub percenttranslated ($) { #{{{
        return $percent;
 } #}}}
 
        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;
 sub otherlanguagesloop ($) { #{{{
        my $page=shift;
 
        my @ret;

-       if (istranslatable($page)) {
-               my %otherpages=%{otherlanguages($page)};
-               while (my ($lang, $translation) = each %otherpages) {
+       my %otherpages=%{otherlanguages($page)};
+       while (my ($lang, $otherpage) = each %otherpages) {
+               if (istranslation($page) && masterpage($page) eq $otherpage) {

                        push @ret, {
                        push @ret, {

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

                                code => $lang,
                                code => $lang,

-                               language => $config{po_slave_languages}{$lang},
-                               percent => percenttranslated($translation),
+                               language => languagename($lang),
+                               master => 1,

                        };
                }
                        };
                }

-       }
-       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}}) {
+               else {

                        push @ret, {
                        push @ret, {

-                               url => urlto($translations{$masterpage}{$lang}, $page),
+                               url => urlto($otherpage, $page),

                                code => $lang,
                                code => $lang,

-                               language => $config{po_slave_languages}{$lang},
-                               percent => percenttranslated($translations{$masterpage}{$lang}),
-                       } unless ($lang eq $curlang);
+                               language => languagename($lang),
+                               percent => percenttranslated($otherpage),
+                       }

                }
        }
                }
        }

-       return @ret;
+       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 pagetemplate (@) { #{{{
 } #}}}
 
 sub pagetemplate (@) { #{{{


@@ -530,13 +529,13 @@ 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));


@@ -664,18 +663,35 @@ sub _istranslation ($) { #{{{
                return 0;
        }
 
                return 0;
        }
 

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

 } #}}}
 
 sub istranslation ($) { #{{{
        my $page=shift;
 
 } #}}}
 
 sub istranslation ($) { #{{{
        my $page=shift;
 

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

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

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

        }
        }

-       return 0;
+       return $config{po_master_language}{code};

 } #}}}
 
 package IkiWiki::PageSpec;
 } #}}}
 
 package IkiWiki::PageSpec;