diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-08-17 17:10:13 +0300 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-08-17 17:10:13 +0300 |
| commit | 2683006ff4a8325bc884a2861220b08964e7eaad (patch) | |
| tree | 345e276949c71c259a79c3a2cabb5bdfa820d49a /indra | |
| parent | fb11213c04269ee35c32d35cfeaafb035b0b321f (diff) | |
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
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llxuixml/lltrans.h | 2 | ||||
| -rw-r--r-- | 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 6c8d28b346..84eeef0ace 100644 --- a/indra/llxuixml/lltrans.h +++ b/indra/llxuixml/lltrans.h @@ -107,7 +107,7 @@ public: { 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 7a292ab943..04d8c53d97 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> |