don't rm emergency saves ever

[lyx.git] / src / importer.C

diff --git a/src/importer.C b/src/importer.C
index 1a11197aa0c7ba69bc531b2c5b497b6aa1aa1661..50601b456c929c2ef92e9ac58631208cff9ef544 100644 (file)
--- a/src/importer.C
+++ b/src/importer.C
@@ -1,21 +1,19 @@
-/* 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.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS
+ */
 
-#include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "importer.h"
 #include "converter.h"
+#include "format.h"
 #include "frontends/LyXView.h"
 #include "funcrequest.h"
 
@@ -25,7 +23,7 @@
 #include "gettext.h"
 #include "BufferView.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <algorithm>
 
@@ -41,7 +39,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 +62,16 @@ bool Importer::Import(LyXView * lv, string const & filename,
                        }
                }
                if (loader_format.empty()) {
-                       Alert::alert(_("Cannot import file"),
-                                    boost::io::str(boost::format(_("No information for importing from %1$s"))
+#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