Alfredo's second patch

[lyx.git] / src / importer.C

diff --git a/src/importer.C b/src/importer.C
index a0610964ef3b53041bb65cc1e0bc6075f0495f40..50601b456c929c2ef92e9ac58631208cff9ef544 100644 (file)
--- a/src/importer.C
+++ b/src/importer.C
@@ -1,25 +1,21 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file exporter.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author unknown
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
-
-#include <config.h>
+ * Full author contact details are available in file CREDITS
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
-#include <algorithm>
+#include <config.h>
 
 #include "importer.h"
 #include "converter.h"
+#include "format.h"
 #include "frontends/LyXView.h"
-#include "lyxfunc.h"
+#include "funcrequest.h"
 
 #include "bufferlist.h"
 #include "support/filetools.h"
@@ -27,6 +23,10 @@
 #include "gettext.h"
 #include "BufferView.h"
 
+#include "support/BoostFormat.h"
+
+#include <algorithm>
+
 using std::vector;
 using std::find;
 
@@ -39,8 +39,12 @@ bool Importer::Import(LyXView * lv, string const & filename,
 {
        string const displaypath = MakeDisplayPath(filename);
        ostringstream s1;
-       s1 << _("Importing") << ' ' << displaypath << "...";
-       lv->message(s1.str().c_str());
+#if USE_BOOST_FORMAT
+       s1 << boost::format(_("Importing %1$s...")) % displaypath;
+#else
+       s1 << _("Importing ") << displaypath << _("...");
+#endif
+       lv->message(STRCONV(s1.str()));
 
        string const lyxfile = ChangeExtension(filename, ".lyx");
 
@@ -58,9 +62,16 @@ bool Importer::Import(LyXView * lv, string const & filename,
                        }
                }
                if (loader_format.empty()) {
-                       Alert::alert(_("Cannot import file"),
-                                  _("No information for importing from ")
-                                  + formats.prettyName(format));
+#if USE_BOOST_FORMAT
+// FIXME: better english ...
+                       Alert::error(_("Couldn't import file"),
+                                    boost::io::str(boost::format(_("No information for importing the format %1$s."))
+                                  % formats.prettyName(format)));
+#else
+                       Alert::error(_("Couldn't import file"),
+                                    _("No information for importing the format ")
+                                    + formats.prettyName(format) + ".");
+#endif
                        return false;
                }
        } else
@@ -77,8 +88,8 @@ bool Importer::Import(LyXView * lv, string const & filename,
                string filename2 = (loader_format == format) ? filename
                        : ChangeExtension(filename,
                                          formats.extension(loader_format));
-               InsertAsciiFile(lv->view(), filename2, as_paragraphs);
-               lv->getLyXFunc()->dispatch(LFUN_MARK_OFF);
+               InsertAsciiFile(lv->view().get(), filename2, as_paragraphs);
+               lv->dispatch(FuncRequest(LFUN_MARK_OFF));
        }
 
        // we are done