summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2011-12-21 14:10:02 +0200
committerSeth ProductEngine <slitovchuk@productengine.com>2011-12-21 14:10:02 +0200
commit0ccf2b5a1c08c897326c0ce47caa48e30ec4b5fa (patch)
tree5f78328fc21e89a222b66ef69952a6325032fcec /indra/llui
parent2455a4bb00b399e5cd5f22e9b177ca2aeaad2ba2 (diff)
EXP-1693 FIXED the date localization in Item Profile window, Voice Morphs window and in scroll list widget in general.
- Added a customizable date format string to be used for scroll list cell of "date" type. - The date localization does not change the value of a scroll list cell changing only its string representation. - Added using localized week days and month names from strings.xml for all locales not only Ja and Pl as it was before. - Changed the date format in Item Profile window (French locale) as noted in the issue description. - For this fix the French locale still needs the localization of the following strings in strings.xml: <string name="dateTimeWeekdaysNames"> <string name="dateTimeWeekdaysShortNames"> <string name="dateTimeMonthNames"> <string name="dateTimeMonthShortNames"> <string name="dateTimeDayFormat"> <string name="dateTimeAM"> <string name="dateTimePM">
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llscrolllistcell.cpp10
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