summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Guslisty <pguslisty@productengine.com>2010-08-04 11:45:47 +0300
committerPaul Guslisty <pguslisty@productengine.com>2010-08-04 11:45:47 +0300
commit26ef92c7fb6c6bccccb498dcf13af37d0f37b769 (patch)
tree85ce0fdd6be045d5b44e2791e56a1e07b8550520
parent497a151fb923675cc6fae139bcdde1678be195bd (diff)
EXT-8424 FIXED ([HARD CODED] ALL LANGS: \"More\" menu option is untranslated under Advanced menu (French viewer) > Shortcuts)
Set translated label from strings.xml Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/831/ --HG-- branch : product-engine
-rw-r--r--indra/llui/llmenugl.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 12007f7b52..46a7215707 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -58,6 +58,7 @@
#include "llbutton.h"
#include "llfontgl.h"
#include "llresmgr.h"
+#include "lltrans.h"
#include "llui.h"
#include "llstl.h"
@@ -2272,8 +2273,9 @@ void LLMenuGL::createSpilloverBranch()
// technically, you can't tear off spillover menus, but we're passing the handle
// along just to be safe
LLMenuGL::Params p;
+ std::string label = LLTrans::getString("More");
p.name("More");
- p.label("More"); // *TODO: Translate
+ p.label(label);
p.bg_color(mBackgroundColor);
p.bg_visible(true);
p.can_tear_off(false);
@@ -2282,7 +2284,7 @@ void LLMenuGL::createSpilloverBranch()
LLMenuItemBranchGL::Params branch_params;
branch_params.name = "More";
- branch_params.label = "More"; // *TODO: Translate
+ branch_params.label = label;
branch_params.branch = mSpilloverMenu;
branch_params.font.style = "italic";