anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert patch from bug 1954, to fix bug 2421

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13498 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Spray 2006-03-26 10:18:52 +00:00
parent bcccc2780d
commit 107d32b49f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/frontends/gtk/ChangeLog
View File

@ -1,3 +1,6 @@
2006-03-26 John Spray <spray@lyx.org>
* GMenubar.C: expect menu strings to be locale encoded (bug 2421,1954)
2006-03-10 Martin Vermeer <martin.vermeer@hut.fi>
* GChanges.C: fix bug 2212: First change is skipped in

6
src/frontends/gtk/GMenubar.C
View File

@ -52,15 +52,15 @@ private:
};
// ENCODING: assume that the backend will give us a ISO-8859-1 string
// ENCODING: assume that the backend will give us a locale string
Glib::ustring labelTrans(string const & label_src, string const & shortcut)
{
string label = subst(label_src, "_", "__");
string::size_type i = label.find(shortcut);
if (i == string::npos)
return Glib::convert(label, "UTF-8", "ISO-8859-1");
return Glib::locale_to_utf8 (label);
label.insert(i, "_");
return Glib::convert(label, "UTF-8", "ISO-8859-1");
return Glib::locale_to_utf8 (label);
}