diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-11-05 14:45:45 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-11-05 14:45:45 -0500 |
| commit | 7e95723dadfe2a11fcd2463f2e8adf579fdc64db (patch) | |
| tree | 91b1be06fae4b1adcef729ab7fc55856b57bb113 | |
| parent | b76ee8a96dbf64a4231f749fc9c233518f367ecd (diff) | |
avoid hitting the shell with system()
| -rw-r--r-- | IkiWiki/Plugin/po.pm | 3 | ||||
| -rw-r--r-- | doc/plugins/po.mdwn | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index 35eed6118..b8c218c5a 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -149,8 +149,7 @@ sub refreshpofiles ($@) { #{{{ foreach my $pofile (@pofiles) { if (-e $pofile) { - my $cmd = "msgmerge -U --backup=none $pofile $potfile"; - system ($cmd) == 0 + system("msgmerge", "-U", "--backup=none", $pofile, $potfile) == 0 or error("[po/refreshpofiles:$pofile] failed to update"); } else { diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 2463680f5..7ac1b3f0f 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -205,7 +205,7 @@ Translating One can edit the PO files using ikiwiki's CGI (a message-by-message interface could also be implemented at some point). -If [[tips/untrusted_git_push]] is setup, one can edit the PO files in her +If [[tips/untrusted_git_push]] is setup, one can edit the PO files in one's preferred `$EDITOR`, without needing to be online. TODO @@ -267,6 +267,14 @@ by something like [[todo/using_meta_titles_for_parentlinks]]. Which configuration settings are safe enough for websetup? +> I see no problems with `po_master_language` and `po_slave_languages` +> (assuming websetup handles the hashes correctly). Would not hurt to check +> that the values of these are legal language codes, in `checkconfig`. +> `po_translatable_pages` seems entirely safe. `po_link_to` w/o usedirs +> causes ikiwiki to error out. If it were changed to fall back to a safe +> setting in this case rather than error, it would be safe. +> --[[Joey]] + ### parentlinks When the wiki home page is translatable, the parentlinks plugin sets |