avoid hitting the shell with system()

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 35eed6118412f08b03dcd23dfeab8ce3519ac634..b8c218c5a98c65db81c14726e5cf26986565dcdc 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -149,8 +149,7 @@ sub refreshpofiles ($@) { #{{{
 
        foreach my $pofile (@pofiles) {
                if (-e $pofile) {
 
        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 {
                                or error("[po/refreshpofiles:$pofile] failed to update");
                }
                else {

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 2463680f5b3c7fbc7ffee9e554cad59f77cca60c..7ac1b3f0f98af3b9117e757f0fb8d3c78849cddd 100644 (file)
--- 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).
 
 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
 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?
 
 
 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
 ### parentlinks
 
 When the wiki home page is translatable, the parentlinks plugin sets