#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include <algorithm>
-
#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"
#include "gettext.h"
#include "BufferView.h"
+#include "BoostFormat.h"
+
+#include <algorithm>
+
using std::vector;
using std::find;
{
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");
}
}
if (loader_format.empty()) {
+#if USE_BOOST_FORMAT
Alert::alert(_("Cannot import file"),
- _("No information for importing from ")
- + formats.prettyName(format));
+ boost::io::str(boost::format(_("No information for importing from %1$s"))
+ % formats.prettyName(format)));
+#else
+ Alert::alert(_("Cannot import file"),
+ _("No information for importing from ")
+ + formats.prettyName(format));
+#endif
return false;
}
} else
: ChangeExtension(filename,
formats.extension(loader_format));
InsertAsciiFile(lv->view().get(), filename2, as_paragraphs);
- lv->getLyXFunc()->dispatch(LFUN_MARK_OFF);
+ lv->dispatch(FuncRequest(LFUN_MARK_OFF));
}
// we are done