From 492c189e24242cedd10dca47c31ffddccf200fcc Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Tue, 17 Aug 2010 17:10:13 +0300
Subject: [PATCH] EXT-8425 ADDITIONAL FIX Fixed broken translation of
accelerators which was introduced by fix of this bug in changeset
14331:11122e1fc5cf.
Removed "Key_" prefix from new key strings and from function that finds them, because it broke translation of old accelerator strings.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/861/
--HG--
branch : product-engine
---
indra/llxuixml/lltrans.h | 2 +-
indra/newview/skins/default/xui/en/strings.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/llxuixml/lltrans.h b/indra/llxuixml/lltrans.h
index 6c8d28b346a..84eeef0aceb 100644
--- a/indra/llxuixml/lltrans.h
+++ b/indra/llxuixml/lltrans.h
@@ -107,7 +107,7 @@ class LLTrans
{
std::string key_str(keystring);
std::string trans_str;
- return findString(trans_str, "Key_" + key_str) ? trans_str : key_str;
+ return findString(trans_str, key_str) ? trans_str : key_str;
}
// get the default args
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 7a292ab943f..04d8c53d97a 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2282,8 +2282,8 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
<string name="accel-win-alt">Alt+</string>
<string name="accel-win-shift">Shift+</string>
- <string name="Key_Esc">Esc</string>
- <string name="Key_Home">Home</string>
+ <string name="Esc">Esc</string>
+ <string name="Home">Home</string>
<!-- Previews -->
<string name="FileSaved">File Saved</string>
--
GitLab