From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 5 Jul 2024 14:10:17 +0000 (+0200)
Subject: Fix display of page references when language is not specified
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f64349db8d544bbce835d958371a39acf67adf41;p=lyx.git

Fix display of page references when language is not specified

Using translateIfPossible with null language does not make sense (and
gives an error on console).

Using translateIfPossible there actually does not make sense at all: it
is only for string from layout files that may already be translated.

We use the GUI language when no language has been specified (this is
different and probably safer than what is done in master).

A consequence of the commit is that "elsewhere" will be in the po
files and now really translatable ;)

(cherry picked from commit 6f6d9b631d110fb71fcd99351b4f40d58451700a)
---

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index c1ea8e4a93..6021a239d2 100644
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -32,6 +32,7 @@
 #include "support/docstream.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/Messages.h"
 #include "support/textutils.h"
 
 using namespace lyx::support;
@@ -399,8 +400,8 @@ docstring InsetRef::displayString(docstring const & ref, string const & cmd,
 			display_string = value;
 		else if (cmd == "pageref" || cmd == "vpageref") {
 			// normally would be "on page #", but we have no pages.
-			display_string =
-				translateIfPossible(from_ascii("elsewhere"), language);
+			display_string = language.empty() ? _("elsewhere")
+				: getMessages(language).get("elsewhere");
 		} else if (cmd == "eqref")
 			display_string = '(' + value + ')';
 		else if (cmd == "formatted") {