Scons: update_po target, part one: language_l10n.pot

[lyx.git] / src / converter.C

diff --git a/src/converter.C b/src/converter.C
index 0cea5a852f7819faf05e088bafebad38f39494b1..7d8bb710ebc89cbba18a78e50f1be800a61e85d8 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -337,7 +337,10 @@ bool Converters::convert(Buffer const * buffer,
                                                        from_ascii(from_format), from_ascii(to_format)));
                return false;
        }
-       OutputParams runparams;
+
+       // buffer is only invalid for importing, and then runparams is not
+       // used anyway.
+       OutputParams runparams(buffer ? &buffer->params().encoding() : 0);
        runparams.flavor = getFlavor(edgepath);
 
        // Some converters (e.g. lilypond) can only output files to the
@@ -426,9 +429,11 @@ bool Converters::convert(Buffer const * buffer,
                        int res;
                        if (conv.original_dir) {
                                Path p(buffer->filePath());
-                               res = one.startscript(type, command);
+                               res = one.startscript(type,
+                                       to_filesystem8bit(from_utf8(command)));
                        } else
-                               res = one.startscript(type, command);
+                               res = one.startscript(type,
+                                       to_filesystem8bit(from_utf8(command)));
 
                        if (!real_outfile.empty()) {
                                Mover const & mover = getMover(conv.to);
@@ -450,7 +455,8 @@ bool Converters::convert(Buffer const * buffer,
                                string const command2 = script +
                                        " < " + quoteName(infile2 + ".out") +
                                        " > " + quoteName(logfile);
-                               one.startscript(Systemcall::Wait, command2);
+                               one.startscript(Systemcall::Wait,
+                                       to_filesystem8bit(from_utf8(command2)));
                                if (!scanLog(*buffer, command, makeAbsPath(logfile, path), errorList))
                                        return false;
                        }
@@ -464,7 +470,7 @@ bool Converters::convert(Buffer const * buffer,
 // it is a document (.lyx) or something else. Same goes for elsewhere.
                                        Alert::error(_("Cannot convert file"),
                                                bformat(_("An error occurred whilst running %1$s"),
-                                               from_ascii(command.substr(0, 50))));
+                                               from_utf8(command.substr(0, 50))));
                                }
                                return false;
                        }
@@ -487,7 +493,7 @@ bool Converters::convert(Buffer const * buffer,
                        if (!mover.rename(FileName(from), FileName(to))) {
                                Alert::error(_("Cannot convert file"),
                                        bformat(_("Could not move a temporary directory from %1$s to %2$s."),
-                                               from_ascii(from), from_ascii(to)));
+                                               from_utf8(from), from_utf8(to)));
                                return false;
                        }
                }
@@ -558,7 +564,7 @@ bool Converters::formatIsUsed(string const & format)
 bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
                         FileName const & filename, ErrorList & errorList)
 {
-       OutputParams runparams;
+       OutputParams runparams(0);
        runparams.flavor = OutputParams::LATEX;
        LaTeX latex("", runparams, filename);
        TeXErrors terr;