From: Abdelrazak Younes <younes@lyx.org>
Date: Fri, 17 Nov 2006 17:28:14 +0000 (+0000)
Subject: Revert change in rev. 15955 because as Georg says:
X-Git-Tag: 1.6.10~11847
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3bc4d28449143f6c90cf8209f29693c975801b28;p=features.git

Revert change in rev. 15955 because as Georg says:

This fix will create extra translator work, and nobody will remmeber that
bformat should be used instead of your solution once the real problem is
fixed. If you use from_ascii instead of from_utf8 everything is OK. utf8
can be wrong as encoding for files anyway, so for now we require that files
are pure ascii.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15957 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 389647b562..27bfb44007 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -390,8 +390,9 @@ void LyX::prepareExit()
 		// FIXME UNICODE: package().temp_dir() could in theory contain utf8 characters.
 		// We cannot use from_utf8() here because this involves the use of static data
 		// that may have been destroyed already on Mac systems.
-		docstring const msg = _("Unable to remove the temporary directory") + " "
-			+ package().temp_dir().c_str();
+		docstring const msg =
+			bformat(_("Unable to remove the temporary directory %1$s"),
+			from_ascii(package().temp_dir()));
 		Alert::warning(_("Unable to remove temporary directory"), msg);
 	}
 }