Collapse all those LFUN_XYZ_APPLY to a single LFUN_INSET_APPLY.

[lyx.git] / src / importer.C

diff --git a/src/importer.C b/src/importer.C
index 1a11197aa0c7ba69bc531b2c5b497b6aa1aa1661..808ec9c39573f7ec7dec4fdd7ca34ddb18a0f84b 100644 (file)
--- a/src/importer.C
+++ b/src/importer.C
@@ -10,10 +10,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "importer.h"
 #include "converter.h"
 #include "frontends/LyXView.h"
@@ -41,7 +37,11 @@ bool Importer::Import(LyXView * lv, string const & filename,
 {
        string const displaypath = MakeDisplayPath(filename);
        ostringstream s1;
+#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");
@@ -60,9 +60,15 @@ bool Importer::Import(LyXView * lv, string const & filename,
                        }
                }
                if (loader_format.empty()) {
+#if USE_BOOST_FORMAT
                        Alert::alert(_("Cannot import file"),
                                     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