anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 05:01:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix display of page references when language is not specified

Browse Source 
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 6f6d9b631d)
This commit is contained in:
Jean-Marc Lasgouttes 2024-07-05 16:10:17 +02:00
parent 4b9e1d8b09
commit f64349db8d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/insets/InsetRef.cpp
View File

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