diff options
| author | Jon Dowland <jon@ra.ncl.ac.uk> | 2009-07-21 11:45:29 +0100 |
|---|---|---|
| committer | Jon Dowland <jon@ra.ncl.ac.uk> | 2009-07-21 11:45:29 +0100 |
| commit | c28c7846b49df31b7ac4fbda7e44c514a939e816 (patch) | |
| tree | 14022295147c9efb7d1ec3681da6556c32abe767 | |
| parent | ddd55037d4662ec7f0d9e4f5643069d2592db6e2 (diff) | |
| parent | 8effd4885464ea0fc974c304453066ad5daafbf9 (diff) | |
Merge branch 'master' of git://git.ikiwiki.info
| -rw-r--r-- | IkiWiki/Plugin/po.pm | 14 | ||||
| -rw-r--r-- | doc/plugins/po.mdwn | 11 |
2 files changed, 19 insertions, 6 deletions
diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index 6aacca53a..70d678897 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -152,13 +152,15 @@ sub checkconfig () { push @{$config{wiki_file_prune_regexps}}, qr/\.pot$/; # 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\//; - # 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}}) { - add_underlay("locale/mo/$underlay") - if -d "$config{underlaydirbase}/locale/mo/$underlay"; + add_underlay("locale/po/$ll/$underlay") + if -d "$config{underlaydirbase}/locale/po/$ll/$underlay"; } if ($config{po_master_language}{code} ne 'en') { @@ -1088,8 +1090,8 @@ sub isvalidpo ($) { if ($res) { return IkiWiki::SuccessReason->new("valid gettext data"); } - return IkiWiki::FailReason->new("invalid gettext data, go back ". - "to previous page to go on with edit"); + return IkiWiki::FailReason->new(gettext("invalid gettext data, go back ". + "to previous page to continue edit")); } # ,---- diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 36b44cd7f..f69f84ae9 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -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? --[[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 ------------- |