urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.ikiwiki.info

master
Jon Dowland 2009-07-21 11:45:29 +01:00
parent ddd55037d4 8effd48854
commit c28c7846b4
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
IkiWiki/Plugin/po.pm
View File

@ -152,13 +152,15 @@ sub checkconfig () {
push @{$config{wiki_file_prune_regexps}}, qr/\.pot$/; push @{$config{wiki_file_prune_regexps}}, qr/\.pot$/;
# Translated versions of the underlays are added if available. # Translated versions of the underlays are added if available.
foreach my $underlay ("basewiki", map { m/^\Q$config{underlaydirbase}\E\/*(.*)/ } reverse @{$config{underlaydirs}}) { foreach my $underlay ("basewiki",
map { m/^\Q$config{underlaydirbase}\E\/*(.*)/ }
reverse @{$config{underlaydirs}}) {
next if $underlay=~/^locale\//; next if $underlay=~/^locale\//;
# Add underlays containing the po files for slave languages. # Underlays containing the po files for slave languages.
foreach my $ll (keys %{$config{po_slave_languages}}) { foreach my $ll (keys %{$config{po_slave_languages}}) {
add_underlay("locale/mo/$underlay") add_underlay("locale/po/$ll/$underlay")
if -d "$config{underlaydirbase}/locale/mo/$underlay"; if -d "$config{underlaydirbase}/locale/po/$ll/$underlay";
} }
if ($config{po_master_language}{code} ne 'en') { if ($config{po_master_language}{code} ne 'en') {
@ -1088,8 +1090,8 @@ sub isvalidpo ($) {
if ($res) { if ($res) {
return IkiWiki::SuccessReason->new("valid gettext data"); return IkiWiki::SuccessReason->new("valid gettext data");
} }
return IkiWiki::FailReason->new("invalid gettext data, go back ". return IkiWiki::FailReason->new(gettext("invalid gettext data, go back ".
"to previous page to go on with edit"); "to previous page to continue edit"));
} }
# ,---- # ,----

11
doc/plugins/po.mdwn
View File

@ -268,6 +268,17 @@ That used to be so, but the bug was fixed. Does this mean
that po might be replacing the only link on a page, in error? that po might be replacing the only link on a page, in error?
--[[Joey]] --[[Joey]]
Bug when editing underlay file
------------------------------
While I've gotten translated underlays working, there is a bug
if the wiki is currently using a page from the underlay, and the master
language version is edited. This causes the edited page to be saved
to srcdir.. and all the translations get set to 0% and their
po files have the translated strings "emptied". What's really going on
is that these are entirely new po files not based on the old ones
in the basewiki, and thus lacking translations. --[[Joey]]
Documentation Documentation
------------- -------------