diff options
author | Andrew Dyukov <adyukov@productengine.com> | 2010-08-11 20:39:34 +0300 |
---|---|---|
committer | Andrew Dyukov <adyukov@productengine.com> | 2010-08-11 20:39:34 +0300 |
commit | d4f12f2630d41b0dc534c0d3d0d8ae7b3881c680 (patch) | |
tree | f9707d9342904db845cfacc6653efdf99be60aa1 /indra/llwindow | |
parent | 3b4385fe559b5a05d09463d920a8d28a64bc2e03 (diff) |
EXT-8425 FIXED Translated names of "Home" and "Esc" keys shown in shortcuts.
Each key has KEY (typedef of U8) represantation which is paired with text version of key.
To get strings corresponding to keys LLKeyboard::stringFromKey() is used.
- Added translation of keys into LLKeyboard::stringFromKey().
- Added corresponding strings into strings.xml.
- Changed LLTrans::getKeyboardString() so that it correctly process key names that are not found in strings.xml(returns English name instead of "MissingString").
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/845/
--HG--
branch : product-engine
Diffstat (limited to 'indra/llwindow')
-rw-r--r-- | indra/llwindow/llkeyboard.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llwindow/llkeyboard.cpp b/indra/llwindow/llkeyboard.cpp index 16cbf815e0..8f26f980d1 100644 --- a/indra/llwindow/llkeyboard.cpp +++ b/indra/llwindow/llkeyboard.cpp @@ -343,6 +343,13 @@ std::string LLKeyboard::stringFromKey(KEY key) buffer[1] = '\0'; res = std::string(buffer); } + + LLKeyStringTranslatorFunc *trans = gKeyboard->mStringTranslator; + if (trans != NULL) + { + res = trans(res.c_str()); + } + return res; } |