From b404636b7fdb3b8a1b8417d4d84b3cb3bd8327af Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 26 Jan 2016 13:36:14 +0100 Subject: [PATCH] FIRE-17649: Localizable date formats for group notices --- indra/newview/llnotificationlistitem.cpp | 44 ++++++++++++------- indra/newview/llpanelgroupnotices.cpp | 16 ++++--- indra/newview/lltoastgroupnotifypanel.cpp | 21 +++++---- .../newview/skins/default/xui/en/strings.xml | 6 +++ 4 files changed, 56 insertions(+), 31 deletions(-) diff --git a/indra/newview/llnotificationlistitem.cpp b/indra/newview/llnotificationlistitem.cpp index 8709d2e500..73c8827b4d 100644 --- a/indra/newview/llnotificationlistitem.cpp +++ b/indra/newview/llnotificationlistitem.cpp @@ -114,29 +114,41 @@ std::string LLNotificationListItem::buildNotificationDate(const LLDate& time_sta std::string timeStr; switch(time_type) { + // FIRE-17649: Localizable date formats for group notices + //case Local: + // timeStr = "[" + LLTrans::getString("LTimeMthNum") + "]/[" + // +LLTrans::getString("LTimeDay")+"]/[" + // +LLTrans::getString("LTimeYear")+"] [" + // +LLTrans::getString("LTimeHour")+"]:[" + // +LLTrans::getString("LTimeMin")+ "]"; + // break; + //case UTC: + // timeStr = "[" + LLTrans::getString("UTCTimeMth") + "]/[" + // +LLTrans::getString("UTCTimeDay")+"]/[" + // +LLTrans::getString("UTCTimeYr")+"] [" + // +LLTrans::getString("UTCTimeHr")+"]:[" + // +LLTrans::getString("UTCTimeMin")+"] [" + // +LLTrans::getString("UTCTimeTimezone")+"]"; + // break; + //case SLT: + //default: + // timeStr = "[" + LLTrans::getString("TimeMonth") + "]/[" + // +LLTrans::getString("TimeDay")+"]/[" + // +LLTrans::getString("TimeYear")+"] [" + // +LLTrans::getString("TimeHour")+"]:[" + // +LLTrans::getString("TimeMin")+"]"; + // break; case Local: - timeStr = "[" + LLTrans::getString("LTimeMthNum") + "]/[" - +LLTrans::getString("LTimeDay")+"]/[" - +LLTrans::getString("LTimeYear")+"] [" - +LLTrans::getString("LTimeHour")+"]:[" - +LLTrans::getString("LTimeMin")+ "]"; + timeStr = LLTrans::getString("NotificationItemDateStringLocal"); break; case UTC: - timeStr = "[" + LLTrans::getString("UTCTimeMth") + "]/[" - +LLTrans::getString("UTCTimeDay")+"]/[" - +LLTrans::getString("UTCTimeYr")+"] [" - +LLTrans::getString("UTCTimeHr")+"]:[" - +LLTrans::getString("UTCTimeMin")+"] [" - +LLTrans::getString("UTCTimeTimezone")+"]"; + timeStr = LLTrans::getString("NotificationItemDateStringUTC"); break; case SLT: default: - timeStr = "[" + LLTrans::getString("TimeMonth") + "]/[" - +LLTrans::getString("TimeDay")+"]/[" - +LLTrans::getString("TimeYear")+"] [" - +LLTrans::getString("TimeHour")+"]:[" - +LLTrans::getString("TimeMin")+"]"; + timeStr = LLTrans::getString("NotificationItemDateStringSLT"); break; + // } LLSD substitution; substitution["datetime"] = time_stamp; diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp index a6e751d6b7..90479dc57f 100755 --- a/indra/newview/llpanelgroupnotices.cpp +++ b/indra/newview/llpanelgroupnotices.cpp @@ -203,12 +203,16 @@ std::string build_notice_date(const U32& the_time) time(&t); } - std::string dateStr = "["+LLTrans::getString("LTimeYear")+"]/[" - +LLTrans::getString("LTimeMthNum")+"]/[" - +LLTrans::getString("LTimeDay")+"] [" - +LLTrans::getString("LTimeHour")+"]:[" - +LLTrans::getString("LTimeMin")+"]:[" - +LLTrans::getString("LTimeSec")+"]"; + // FIRE-17649: Localizable date formats for group notices + //std::string dateStr = "["+LLTrans::getString("LTimeYear")+"]/[" + // +LLTrans::getString("LTimeMthNum")+"]/[" + // +LLTrans::getString("LTimeDay")+"] [" + // +LLTrans::getString("LTimeHour")+"]:[" + // +LLTrans::getString("LTimeMin")+"]:[" + // +LLTrans::getString("LTimeSec")+"]"; + std::string dateStr = LLTrans::getString("GroupNoticesPanelDateString"); + // + LLSD substitution; substitution["datetime"] = (S32) t; LLStringUtil::format (dateStr, substitution); diff --git a/indra/newview/lltoastgroupnotifypanel.cpp b/indra/newview/lltoastgroupnotifypanel.cpp index 97e4585746..c6c15adb41 100755 --- a/indra/newview/lltoastgroupnotifypanel.cpp +++ b/indra/newview/lltoastgroupnotifypanel.cpp @@ -95,15 +95,18 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(const LLNotificationPtr& notifi //message body const std::string& message = payload["message"].asString(); - std::string timeStr = "["+LLTrans::getString("TimeWeek")+"], [" - +LLTrans::getString("TimeMth")+"] [" - +LLTrans::getString("TimeDay")+"] [" - +LLTrans::getString("TimeYear")+"] [" - +LLTrans::getString("TimeHour12")+"]:[" - +LLTrans::getString("TimeMin")+"]:[" - +LLTrans::getString("TimeSec")+"] [" - +LLTrans::getString("TimeAMPM")+"] [" - +LLTrans::getString("TimeTimezone")+"]"; + // FIRE-17649: Localizable date formats for group notices + //std::string timeStr = "["+LLTrans::getString("TimeWeek")+"], [" + // +LLTrans::getString("TimeMth")+"] [" + // +LLTrans::getString("TimeDay")+"] [" + // +LLTrans::getString("TimeYear")+"] [" + // +LLTrans::getString("TimeHour12")+"]:[" + // +LLTrans::getString("TimeMin")+"]:[" + // +LLTrans::getString("TimeSec")+"] [" + // +LLTrans::getString("TimeAMPM")+"] [" + // +LLTrans::getString("TimeTimezone")+"]"; + std::string timeStr = LLTrans::getString("GroupNoticesToastDateString"); + // const LLDate timeStamp = notification->getDate(); LLDate notice_date = timeStamp.notNull() ? timeStamp : payload["received_time"].asDate(); LLSD substitution; diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index d1fc71bcc4..73b6a1efc7 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2939,4 +2939,10 @@ Try enclosing path to the editor with double quotes. A group member named [NAME] (online) + + [year,datetime,local]/[mthnum,datetime,local]/[day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] + [wkday,datetime,slt], [mth,datetime,slt] [day,datetime,slt] [year,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt] [timezone,datetime,slt] + [mthnum,datetime,local]/[day,datetime,local]/[year,datetime,local] [hour,datetime,local]:[min,datetime,local] + [mth,datetime,utc]/[day,datetime,utc]/[year,datetime,utc] [hour,datetime,utc]:[min,datetime,utc] [timezone,datetime,utc] + [mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]