Fix a few more translation probelms for XHTML output.

This commit is contained in:
Richard Heck 2013-03-23 09:10:01 -04:00
parent 8831e4a11f
commit a93a8cd393
2 changed files with 12 additions and 7 deletions

View File

@ -171,7 +171,7 @@ int InsetFloatList::plaintext(odocstringstream & os,
} }
docstring InsetFloatList::xhtml(XHTMLStream &, OutputParams const &) const { docstring InsetFloatList::xhtml(XHTMLStream &, OutputParams const & op) const {
FloatList const & floats = buffer().params().documentClass().floats(); FloatList const & floats = buffer().params().documentClass().floats();
FloatList::const_iterator cit = floats[to_ascii(getParam("type"))]; FloatList::const_iterator cit = floats[to_ascii(getParam("type"))];
@ -193,17 +193,20 @@ docstring InsetFloatList::xhtml(XHTMLStream &, OutputParams const &) const {
string const type = cit->second.floattype(); string const type = cit->second.floattype();
if (type == "table") { if (type == "table") {
toctype = "table"; toctype = "table";
toclabel = _("List of Tables"); toclabel = translateIfPossible(from_ascii("List of Tables"),
op.local_font->language()->lang());
} else if (type == "figure") { } else if (type == "figure") {
toctype = "figure"; toctype = "figure";
toclabel = _("List of Figures"); toclabel = translateIfPossible(from_ascii("List of Figures"),
op.local_font->language()->lang());
} else { } else {
LYXERR0("Unknown Builtin Float!"); LYXERR0("Unknown Builtin Float!");
return docstring(); return docstring();
} }
} else { } else {
toctype = to_utf8(getParam("type")); toctype = to_utf8(getParam("type"));
toclabel = buffer().B_(cit->second.listName()); toclabel = translateIfPossible(from_utf8(cit->second.listName()),
op.local_font->language()->lang());
} }
// FIXME Do we need to check if it exists? If so, we need a new // FIXME Do we need to check if it exists? If so, we need a new

View File

@ -22,6 +22,7 @@
#include "FuncRequest.h" #include "FuncRequest.h"
#include "FuncStatus.h" #include "FuncStatus.h"
#include "IndicesList.h" #include "IndicesList.h"
#include "Language.h"
#include "LaTeXFeatures.h" #include "LaTeXFeatures.h"
#include "Lexer.h" #include "Lexer.h"
#include "output_latex.h" #include "output_latex.h"
@ -698,7 +699,7 @@ docstring InsetPrintIndex::xhtml(XHTMLStream &, OutputParams const & op) const
Layout const & lay = bp.documentClass().htmlTOCLayout(); Layout const & lay = bp.documentClass().htmlTOCLayout();
string const & tocclass = lay.defaultCSSClass(); string const & tocclass = lay.defaultCSSClass();
string const tocattr = "class='tochead " + tocclass + "'"; string const tocattr = "class='index tochead " + tocclass + "'";
// we'll use our own stream, because we are going to defer everything. // we'll use our own stream, because we are going to defer everything.
// that's how we deal with the fact that we're probably inside a standard // that's how we deal with the fact that we're probably inside a standard
@ -706,9 +707,10 @@ docstring InsetPrintIndex::xhtml(XHTMLStream &, OutputParams const & op) const
odocstringstream ods; odocstringstream ods;
XHTMLStream xs(ods); XHTMLStream xs(ods);
xs << html::StartTag("div", "class='index'"); xs << html::StartTag("div", tocattr);
xs << html::StartTag(lay.htmltag(), lay.htmlattr()) xs << html::StartTag(lay.htmltag(), lay.htmlattr())
<< _("Index") << translateIfPossible(from_ascii("Index"),
op.local_font->language()->lang())
<< html::EndTag(lay.htmltag()); << html::EndTag(lay.htmltag());
xs << html::StartTag("ul", "class='main'"); xs << html::StartTag("ul", "class='main'");
Font const dummy; Font const dummy;