anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* GuiDocument.cpp (formatStrVec):

Browse Source 
- module names can have non-ASCII chars.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27274 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2008-11-05 18:37:47 +00:00
parent 5ec13cc15b
commit b65ef30b34
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/frontends/qt4/GuiDocument.cpp
View File

@ -1364,22 +1364,22 @@ namespace {
if (v.size() == 0)
return docstring();
if (v.size() == 1)
return from_ascii(v[0]);
return from_utf8(v[0]);
if (v.size() == 2) {
docstring retval = _("%1$s and %2$s");
retval = subst(retval, _("and"), s);
return bformat(retval, from_ascii(v[0]), from_ascii(v[1]));
return bformat(retval, from_utf8(v[0]), from_utf8(v[1]));
}
// The idea here is to format all but the last two items...
int const vSize = v.size();
docstring t2 = _("%1$s, %2$s");
docstring retval = from_ascii(v[0]);
docstring retval = from_utf8(v[0]);
for (int i = 1; i < vSize - 2; ++i)
retval = bformat(t2, retval, from_ascii(v[i]));
retval = bformat(t2, retval, from_utf8(v[i]));
//...and then to plug them, and the last two, into this schema
docstring t = _("%1$s, %2$s, and %3$s");
t = subst(t, _("and"), s);
return bformat(t, retval, from_ascii(v[vSize - 2]), from_ascii(v[vSize - 1]));
return bformat(t, retval, from_utf8(v[vSize - 2]), from_utf8(v[vSize - 1]));
}
vector<string> idsToNames(vector<string> const & idList)