diff options
| author | intrigeri <intrigeri@boum.org> | 2008-11-12 23:22:26 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2008-11-12 23:27:30 +0100 |
| commit | 190c641c8a9c59fcd69f413853ef84e312658791 (patch) | |
| tree | e19d77b9b1781ac513b5abda983e3d257f552a1e | |
| parent | 36312b13b4eced4bc328ed09bb40307671490b35 (diff) | |
po(otherlanguages): return pages that should exist
... instead of already existing ones.
This fixes the "missing otherlanguages links on master pages just created via
the CGI" bug.
Signed-off-by: intrigeri <intrigeri@boum.org>
| -rw-r--r-- | IkiWiki/Plugin/po.pm | 27 | ||||
| -rw-r--r-- | doc/plugins/po.mdwn | 3 |
2 files changed, 17 insertions, 13 deletions
diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index a6342c74f..7039f3033 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -150,6 +150,7 @@ sub needsbuild () { #{{{ # a given master page was rendered because its source file was changed @origneedsbuild=(@$needsbuild); + flushmemoizecache(); buildtranslationscache(); # make existing translations depend on the corresponding master page @@ -568,20 +569,24 @@ sub islanguagecode ($) { #{{{ return ($code =~ /^[a-z]{2}$/); } #}}} -sub otherlanguages($) { #{{{ +sub otherlanguage ($$) { #{{{ + my $page=shift; + my $code=shift; + + return masterpage($page) if $code eq $config{po_master_language}{code}; + return masterpage($page) . '.' . $code; +} #}}} + +sub otherlanguages ($) { #{{{ my $page=shift; 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 unless (istranslation($page) || istranslatable($page)); + my $curlang=lang($page); + foreach my $lang + ($config{po_master_language}{code}, keys %{$config{po_slave_languages}}) { + next if $lang eq $curlang; + $ret{$lang}=otherlanguage($page, $lang); } return \%ret; } #}}} diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 209b573cb..47fa13450 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -592,8 +592,7 @@ Robustness tests ### Creating pages - creating a master page via RCS: **OK** -- creating a master page via CGI: **FIXME** the new master page has no - `otherlanguages` links until refreshed once more +- creating a master page via CGI: **OK** ### Deleting pages |