v...@lyx.org schreef:
Author: vfr Date: Sat Aug 15 22:47:46 2009 New Revision: 31062 URL: http://www.lyx.org/trac/changeset/31062Log: Fix a bunch of assertions. The first thing that bformat does is to check whether the string contains "%1$s". Otherwise it asserts. Why didn't we see this happen before ? This was revealed by the emergency saves that Richard introduced in the Buffer dtor. Modified: lyx-devel/trunk/src/Buffer.cpp lyx-devel/trunk/src/frontends/qt4/qt_helpers.cpp Modified: lyx-devel/trunk/src/Buffer.cpp ============================================================================== --- lyx-devel/trunk/src/Buffer.cpp Sat Aug 15 22:03:41 2009 (r31061) +++ lyx-devel/trunk/src/Buffer.cpp Sat Aug 15 22:47:46 2009 (r31062) @@ -967,7 +967,7 @@ LYXERR0(" " << s); if (writeFile(FileName(s))) { markClean(); - user_message += bformat(_(" Saved to %1$. Phew.\n"), from_utf8(s)); + user_message += bformat(_(" Saved to %1$s. Phew.\n"), from_utf8(s)); return user_message; } else { user_message += _(" Save failed! Trying again...\n"); @@ -980,7 +980,7 @@ lyxerr << ' ' << s << endl; if (writeFile(FileName(s))) { markClean(); - user_message += bformat(_(" Saved to %1$. Phew.\n"), from_utf8(s)); + user_message += bformat(_(" Saved to %1$s. Phew.\n"), from_utf8(s)); return user_message; }@@ -994,7 +994,7 @@lyxerr << ' ' << s << endl; if (writeFile(FileName(s))) { markClean(); - user_message += bformat(_(" Saved to %1$. Phew.\n"), from_utf8(s)); + user_message += bformat(_(" Saved to %1$s. Phew.\n"), from_utf8(s)); return user_message; }Modified: lyx-devel/trunk/src/frontends/qt4/qt_helpers.cpp ============================================================================== --- lyx-devel/trunk/src/frontends/qt4/qt_helpers.cpp Sat Aug 15 22:03:41 2009 (r31061) +++ lyx-devel/trunk/src/frontends/qt4/qt_helpers.cpp Sat Aug 15 22:47:46 2009 (r31062) @@ -213,7 +213,7 @@ return; // FIXME UNICODE frontend::Alert::error(_("Could not update TeX information"), - bformat(_("The script `%s' failed."), from_utf8(command.absFilename()))); + bformat(_("The script `%1$s' failed."), from_utf8(command.absFilename()))); }
Jurgen.. This is also in branch. ok? Vincent
