Change _() to return a docstring. Fixup callers with the help of lyx::to_utf8.

[lyx.git] / src / importer.C

diff --git a/src/importer.C b/src/importer.C
index 1c84d3d147e22eef988f5e8786daf435ff908c96..7f627f092bfdd021fd0cf668fc2f09d1d4158dc0 100644 (file)
--- a/src/importer.C
+++ b/src/importer.C
@@ -24,6 +24,7 @@
 #include "frontends/Alert.h"
 #include "gettext.h"
 #include "BufferView.h"
+#include "buffer_funcs.h"
 
 using lyx::support::bformat;
 using lyx::support::changeExtension;
@@ -38,10 +39,10 @@ extern BufferList bufferlist;
 
 
 bool Importer::Import(LyXView * lv, string const & filename,
-                     string const & format)
+                     string const & format, ErrorList & errorList)
 {
        string const displaypath = makeDisplayPath(filename);
-       lv->message(bformat(_("Importing %1$s..."), displaypath));
+       lv->message(bformat(lyx::to_utf8(_("Importing %1$s...")), displaypath));
 
        string const lyxfile = changeExtension(filename, ".lyx");
 
@@ -52,15 +53,15 @@ bool Importer::Import(LyXView * lv, string const & filename,
                     it != loaders.end(); ++it) {
                        if (converters.isReachable(format, *it)) {
                                if (!converters.convert(0, filename, filename,
-                                                       format, *it))
+                                                       format, *it, errorList))
                                        return false;
                                loader_format = *it;
                                break;
                        }
                }
                if (loader_format.empty()) {
-                       Alert::error(_("Couldn't import file"),
-                                    bformat(_("No information for importing the format %1$s."),
+                       Alert::error(lyx::to_utf8(_("Couldn't import file")),
+                                    bformat(lyx::to_utf8(_("No information for importing the format %1$s.")),
                                         formats.prettyName(format)));
                        return false;
                }
@@ -69,9 +70,13 @@ bool Importer::Import(LyXView * lv, string const & filename,
 
 
        if (loader_format == "lyx") {
-               lv->view()->loadLyXFile(lyxfile);
+               lv->loadLyXFile(lyxfile);
        } else {
-               lv->view()->newFile(lyxfile, string(), true);
+               Buffer * const b = newFile(lyxfile, string(), true);
+               if (b)
+                       lv->setBuffer(b);
+               else
+                       return false;
                bool as_paragraphs = loader_format == "textparagraph";
                string filename2 = (loader_format == format) ? filename
                        : changeExtension(filename,
@@ -81,7 +86,7 @@ bool Importer::Import(LyXView * lv, string const & filename,
        }
 
        // we are done
-       lv->message(_("imported."));
+       lv->message(lyx::to_utf8(_("imported.")));
        return true;
 }