diff options
| author | Richard Linden <none@none> | 2012-01-05 10:59:29 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-05 10:59:29 -0800 |
| commit | 66fcc2da3925cd16939e4438dad749b2c22dbc27 (patch) | |
| tree | 771fe7786750454ad478773d7045accb4a353b53 /indra/llui/llscrolllistcell.cpp | |
| parent | 570d562f5871f40bd7f8c683db5316ffd0133335 (diff) | |
| parent | 9c8f6ba6a51b799d16e89e995bbcf3b0dcc15c62 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/llui/llscrolllistcell.cpp')
| -rw-r--r-- | indra/llui/llscrolllistcell.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/llui/llscrolllistcell.cpp b/indra/llui/llscrolllistcell.cpp index 9d25c7180d..786e18b187 100644 --- a/indra/llui/llscrolllistcell.cpp +++ b/indra/llui/llscrolllistcell.cpp @@ -29,6 +29,8 @@ #include "llscrolllistcell.h" +#include "lltrans.h" + #include "llcheckboxctrl.h" #include "llui.h" // LLUIImage #include "lluictrlfactory.h" @@ -428,7 +430,13 @@ LLScrollListDate::LLScrollListDate( const LLScrollListCell::Params& p) void LLScrollListDate::setValue(const LLSD& value) { mDate = value.asDate(); - LLScrollListText::setValue(mDate.asRFC1123()); + + std::string date_str = LLTrans::getString("ScrollListCellDateFormat"); + LLSD substitution; + substitution["datetime"] = mDate.secondsSinceEpoch(); + LLStringUtil::format(date_str, substitution); + + LLScrollListText::setValue(date_str); } const LLSD LLScrollListDate::getValue() const |