commit 806f7422633631669f6272e03c9e8dc79d1d299e
Author: Juergen Spitzmueller <[email protected]>
Date: Thu Aug 9 17:23:05 2018 +0200
Amend 5f45b3ed9c851f0
---
src/insets/InsetInfo.cpp | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index e25a8aa..c46fc52 100644
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -756,64 +756,69 @@ void InsetInfo::updateBuffer(ParIterator const & it,
UpdateType utype) {
// Since these are not included in many fonts, we
// re-translate them to textual names (see #10641)
odocstringstream ods;
+ string const lcode = params_.lang->code();
for (size_t n = 0; n < sequence.size(); ++n) {
char_type const c = sequence[n];
switch(c) {
case 0x21b5://Return
gui = _("Return[[Key]]");
- ods <<
translateIfPossible(from_ascii("Return[[Key]]"), params_.lang->code());
+ ods <<
translateIfPossible(from_ascii("Return[[Key]]"), lcode);
break;
case 0x21b9://Tab both directions (Win)
gui = _("Tab[[Key]]");
- ods <<
translateIfPossible(from_ascii("Tab[[Key]]"), params_.lang->code());
+ ods <<
translateIfPossible(from_ascii("Tab[[Key]]"), lcode);
break;
case 0x21de://Qt::Key_PageUp
gui = _("PgUp");
- ods << translateIfPossible(from_ascii("PgUp"),
params_.lang->code());
+ ods << translateIfPossible(from_ascii("PgUp"),
lcode);
break;
case 0x21df://Qt::Key_PageDown
gui = _("PgDown");
- ods <<
translateIfPossible(from_ascii("PgDown"), params_.lang->code());
+ ods <<
translateIfPossible(from_ascii("PgDown"), lcode);
break;
case 0x21e4://Qt::Key_Backtab
gui = _("Backtab");
- ods <<
translateIfPossible(from_ascii("Backtab"), params_.lang->code());
+ ods <<
translateIfPossible(from_ascii("Backtab"), lcode);
break;
case 0x21e5://Qt::Key_Tab
gui = _("Tab");
- ods << translateIfPossible(from_ascii("Tab"),
params_.lang->code());
+ ods << translateIfPossible(from_ascii("Tab"),
lcode);
break;
case 0x21e7://Shift
gui = _("Shift");
- ods << translateIfPossible(from_ascii("Shift"),
params_.lang->code());
+ ods << translateIfPossible(from_ascii("Shift"),
lcode);
break;
case 0x21ea://Qt::Key_CapsLock
gui = _("CapsLock");
- ods <<
translateIfPossible(from_ascii("CapsLock"), params_.lang->code());
+ ods <<
translateIfPossible(from_ascii("CapsLock"), lcode);
+ break;
+ case 0x2303://Control
+ gui = _("Control[[Key]]");
+ ods <<
translateIfPossible(from_ascii("Control[[Key]]"), lcode);
break;
case 0x2318://CMD
gui = _("Command[[Key]]");
- ods <<
translateIfPossible(from_ascii("Command[[Key]]"), params_.lang->code());
+ ods <<
translateIfPossible(from_ascii("Command[[Key]]"), lcode);
break;
case 0x2324://Qt::Key_Enter
gui = _("Return[[Key]]");
- ods <<
translateIfPossible(from_ascii("Return[[Key]]"), params_.lang->code());
+ ods <<
translateIfPossible(from_ascii("Return[[Key]]"), lcode);
break;
case 0x2325://Option key
gui = _("Option[[Key]]");
- ods <<
translateIfPossible(from_ascii("Option[[Key]]"), params_.lang->code());
+ ods <<
translateIfPossible(from_ascii("Option[[Key]]"), lcode);
break;
case 0x2326://Qt::Key_Delete
gui = _("Delete[[Key]]");
- ods <<
translateIfPossible(from_ascii("Delete[[Key]]"), params_.lang->code());
+ ods <<
translateIfPossible(from_ascii("Delete[[Key]]"), lcode);
break;
case 0x232b://Qt::Key_Backspace
gui = _("Fn+Del");
- ods <<
translateIfPossible(from_ascii("Fn+Delete"), params_.lang->code());
+ ods <<
translateIfPossible(from_ascii("Fn+Delete"), lcode);
break;
case 0x238b://Qt::Key_Escape
gui = _("Esc");
- ods << translateIfPossible(from_ascii("Esc"),
params_.lang->code());
+ ods << translateIfPossible(from_ascii("Esc"),
lcode);
break;
default:
ods.put(c);
