summaryrefslogtreecommitdiff
path: root/indra/newview/llexpandabletextbox.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-07-16 19:12:46 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-07-16 19:12:46 +0300
commit9137fd8e4303e424986822a1598341bfb99f8e26 (patch)
tree6e98087146f522a05047f4f748290d2c9d3f6768 /indra/newview/llexpandabletextbox.cpp
parentccc4e8bb7e96da7dd945c64395f99ea7433681ee (diff)
EXT-8365 FIXED Untranslated "More" link in the Residents Profiles.
The default link label specified in widgets/expandable_text.xml didn't seem to be taken into account for translation. So I moved the label to strings.xml to make sure it's localized. Also I removed overridden textbox.label attribute values because VLT can't handle them. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/770/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
-rw-r--r--indra/newview/llexpandabletextbox.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp
index 92fda31cc2..8ccc5fb248 100644
--- a/indra/newview/llexpandabletextbox.cpp
+++ b/indra/newview/llexpandabletextbox.cpp
@@ -34,6 +34,7 @@
#include "llexpandabletextbox.h"
#include "llscrollcontainer.h"
+#include "lltrans.h"
#include "llwindow.h"
#include "llviewerwindow.h"
@@ -117,7 +118,7 @@ LLExpandableTextBox::LLTextBoxEx::Params::Params()
LLExpandableTextBox::LLTextBoxEx::LLTextBoxEx(const Params& p)
: LLTextEditor(p),
- mExpanderLabel(p.label),
+ mExpanderLabel(p.label.isProvided() ? p.label : LLTrans::getString("More")),
mExpanderVisible(false)
{
setIsChrome(TRUE);