diff options
| author | Paul Guslisty <pguslisty@productengine.com> | 2010-03-17 14:40:50 +0200 |
|---|---|---|
| committer | Paul Guslisty <pguslisty@productengine.com> | 2010-03-17 14:40:50 +0200 |
| commit | 69491cccae0ec7a638abcee34f460aed314997ef (patch) | |
| tree | 63c3797f1b704b557df86be3d3db897bdfb7599b | |
| parent | 733a9275a615ffa678f52356ad4eefae80db52f4 (diff) | |
Fixed normal bug EXT - 6026 ([TRANSLATED BUT IN EN] Side bar : My Appearance > Wearing tab - where it's linked description)
- Replaced hardcoded '(active)' string with [GESLABEL] arg. <string name=\"ActiveGesture\" value=\"[GESLABEL] (TRANSLATION OF 'active')\"/> - this line with translation should be added to the rest locales
- Corrected \"[ATTACHMENT_POINT]\" arg assigning. Now \"[ATTACHMENT_POINT]\" assigned with LLTrans::getString() and gets translated string.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/45/
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index ceeffea1c9..1f918c72ea 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3808,7 +3808,9 @@ std::string LLGestureBridge::getLabelSuffix() const { if( LLGestureManager::instance().isGestureActive(mUUID) ) { - return LLItemBridge::getLabelSuffix() + " (active)"; + LLStringUtil::format_map_t args; + args["[GESLABEL]"] = LLItemBridge::getLabelSuffix(); + return LLTrans::getString("ActiveGesture", args); } else { @@ -4157,7 +4159,7 @@ std::string LLObjectBridge::getLabelSuffix() const // e.g. "(worn on ...)" / "(attached to ...)" LLStringUtil::format_map_t args; - args["[ATTACHMENT_POINT]"] = attachment_point_name.c_str(); + args["[ATTACHMENT_POINT]"] = LLTrans::getString(attachment_point_name); return LLItemBridge::getLabelSuffix() + LLTrans::getString("WornOnAttachmentPoint", args); } else diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index eb45a9765b..a8f888f0cb 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1838,6 +1838,7 @@ Clears (deletes) the media and all params from the given face. <string name="LoadingContents">Loading contents...</string> <string name="NoContents">No contents</string> <string name="WornOnAttachmentPoint" value=" (worn on [ATTACHMENT_POINT])" /> + <string name="ActiveGesture" value="[GESLABEL] (active)"/> <!-- Inventory permissions --> <string name="PermYes">Yes</string> <string name="PermNo">No</string> |