Push r38098 again in

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38108 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2011-03-28 22:20:41 +00:00
parent c8844cad05
commit 9c9abe843f

View File

@ -672,13 +672,19 @@ void switchBetweenClasses(DocumentClass const * const oldone,
n == DocumentClass::plainInsetLayout().name(); n == DocumentClass::plainInsetLayout().name();
if (!is_undefined) if (!is_undefined)
continue; continue;
// The flex inset is undefined in newtc // The flex inset is undefined in newtc
docstring const s = bformat(_( docstring const oldname = from_utf8(oldtc.name());
"Flex inset %1$s is " docstring const newname = from_utf8(newtc.name());
"undefined because of class " docstring s;
"conversion from\n%2$s to %3$s"), if (oldname == newname)
it->name(), from_utf8(oldtc.name()), s = bformat(_("Flex inset %1$s is undefined after "
from_utf8(newtc.name())); "reloading `%2$s' layout."),
it->name(), oldname);
else
s = bformat(_("Flex inset %1$s is undefined because of "
"conversion from `%2$s' layout to `%3$s'."),
it->name(), oldname, newname);
// To warn the user that something had to be done. // To warn the user that something had to be done.
errorlist.push_back(ErrorItem( errorlist.push_back(ErrorItem(
_("Undefined flex inset"), _("Undefined flex inset"),