Make things a little better with respect to bug #8587.

(cherry picked from commit fbe9e96b5eac2d2c3748272d63731437e820e782)

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index d38e9645dbeae2b96bd3eadbf88b1c402cf2397e..6571ba7f99619f9a5e48bb13e35727919926aef2 100644 (file)
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -217,8 +217,10 @@ docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const &) const
                        // normally, would be "ref on page #", but we have no pages
                        display_string = value;
                else if (cmd == "pageref" || cmd == "vpageref")
-                       // normally would be "on page #", but we have no pages
-                       display_string = _("elsewhere");
+                       // 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");
                else if (cmd == "eqref")
                        display_string = '(' + value + ')';
                else if (cmd == "formatted"

diff --git a/status.20x b/status.20x
index ca3e680126ab2bb7b14b2068ae3984e7b4f40966..b23a76f41b4aa5fd63537df1254da19007555a83 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -116,6 +116,10 @@ What's new
 
 - Reset counters properly when outputting included XHTML files (bug 8598).
 
+- Translate "elsewhere" to the Buffer language when outputting XHTML.
+  This is not quite right, but it is better than translating it to the
+  UI language (partial fix for #8587).
+
 
 * USER INTERFACE