From a880243f34a77549478e76c0606d69c953928e45 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Thu, 15 Jul 2010 15:26:13 +0300 Subject: EXT-8374 FIXED Added possibility to localize "None" action value for Animation and Sound Actions. Also changed hardcoded "until animations are done" value for Wait with label from the appropriate Floater checkbox. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/762/ --HG-- branch : product-engine --- indra/newview/llpreviewgesture.cpp | 12 +++++++++++- indra/newview/skins/default/xui/en/strings.xml | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp index a7b4873fed..6f9d8a7623 100644 --- a/indra/newview/llpreviewgesture.cpp +++ b/indra/newview/llpreviewgesture.cpp @@ -1625,7 +1625,17 @@ std::string LLPreviewGesture::getLabel(std::vector labels) result=LLTrans::getString("AnimFlagStart"); } - result.append(v_labels[1]); + // lets localize action value + std::string action = v_labels[1]; + if ("None" == action) + { + action = LLTrans::getString("GestureActionNone"); + } + else if ("until animations are done" == action) + { + action = LLFloaterReg::getInstance("preview_gesture")->getChild("wait_anim_check")->getLabel(); + } + result.append(action); return result; } diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index a63c09e300..e5bd549036 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1913,6 +1913,7 @@ Clears (deletes) the media and all params from the given face. + -- cgit v1.2.3