A couple comments and some very minor cleanup.

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 6fd6c8cb20ad440e1b0893bbd3780fd731672c17..11c9231bb651b4be4cc1a87c67feae6cbd6f7920 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1392,7 +1392,7 @@ void Buffer::makeLyXHTMLFile(FileName const & fname,
                              OutputParams const & runparams,
                              bool const body_only) const
 {
-       LYXERR(Debug::LATEX, "makeLYXHTMLFile...");
+       LYXERR(Debug::LATEX, "makeLyXHTMLFile...");
 
        ofdocstream ofs;
        if (!openFileWrite(ofs, fname))
@@ -3124,10 +3124,11 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
        // Plain text backend
        if (backend_format == "text")
                writePlaintextFile(*this, FileName(filename), runparams);
-       // no backend
-       else if (backend_format == "xhtml")
+       // HTML backend
+       else if (backend_format == "xhtml") {
+               runparams.flavor = OutputParams::HTML;
                makeLyXHTMLFile(FileName(filename), runparams);
-       else if (backend_format == "lyx")
+       }       else if (backend_format == "lyx")
                writeFile(FileName(filename));
        // Docbook backend
        else if (isDocBook()) {
@@ -3302,8 +3303,8 @@ bool Buffer::readFileHelper(FileName const & s)
                                str = _("Document was successfully recovered.");
                        else
                                str = _("Document was NOT successfully recovered.");
-                       str += "\n\n" + _("Remove emergency file now?") +
-                               "\n(" + from_utf8(e.absFilename())+")";
+                       str += "\n\n" + bformat(_("Remove emergency file now?\n(%1$s)"),
+                                               from_utf8(e.absFilename()));
 
                        if (!Alert::prompt(_("Delete emergency file?"), str, 1, 1,
                                        _("&Remove"), _("&Keep it"))) {