diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index e803ac5036..75dbff36f4 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -2890,6 +2890,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf, if (inset) { if (!runparams.for_toc || inset->isInToc()) { OutputParams np = runparams; + np.local_font = &font; if (!inset->getLayout().htmlisblock()) np.html_in_par = true; retval += inset->xhtml(xs, np); diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp index 9bfb3d488c..9a2ddd8bd8 100644 --- a/src/insets/InsetRef.cpp +++ b/src/insets/InsetRef.cpp @@ -16,6 +16,7 @@ #include "Cursor.h" #include "DispatchResult.h" #include "InsetLabel.h" +#include "Language.h" #include "LaTeXFeatures.h" #include "LyX.h" #include "OutputParams.h" @@ -206,7 +207,7 @@ int InsetRef::docbook(odocstream & os, OutputParams const & runparams) const } -docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const &) const +docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const & op) const { docstring const & ref = getParam("reference"); InsetLabel const * il = buffer().insetLabel(ref); @@ -223,9 +224,8 @@ docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const &) const display_string = value; else if (cmd == "pageref" || cmd == "vpageref") // normally would be "on page #", but we have no pages. - // FIXME this is wrong, as it should be the current language, - // but it is better than _(), which is what we had before. - display_string = buffer().B_("elsewhere"); + display_string = translateIfPossible(from_ascii("elsewhere"), + op.local_font->language()->lang()); else if (cmd == "eqref") display_string = '(' + value + ')'; else if (cmd == "formatted")