livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-1103, Experimental Patch for chat seconds by Andromeda Rage, feedback requested

meow-7.2.2
Arrehn 2011-06-24 20:43:10 -04:00
parent a1e3d91a47
commit 847c96f27c
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/lllogchat.cpp
View File

@ -82,7 +82,8 @@ const static std::string MULTI_LINE_PREFIX(" ");
*
* Note: "You" was used as an avatar names in viewers of previous versions
*/
const static boost::regex TIMESTAMP_AND_STUFF("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}\\]\\s+|\\[\\d{1,2}:\\d{2}\\]\\s+)?(.*)$");
//const static boost::regex TIMESTAMP_AND_STUFF("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}\\]\\s+|\\[\\d{1,2}:\\d{2}\\]\\s+)?(.*)$");
const static boost::regex TIMESTAMP_AND_STUFF("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}:\\d{2}\\]\\s+|\\[\\d{1,2}:\\d{2}:\\d{2}\\]\\s+)?(.*)$");
/**
* Regular expression suitable to match names like
@ -104,8 +105,8 @@ const static boost::regex OUTBOUND_CONFERENCE("^Ad-hoc Conference hash[a-f0-9]{8
const static std::string NAME_TEXT_DIVIDER(": ");
// is used for timestamps adjusting
const static char* DATE_FORMAT("%Y/%m/%d %H:%M");
const static char* TIME_FORMAT("%H:%M");
const static char* DATE_FORMAT("%Y/%m/%d %H:%M:%S");
const static char* TIME_FORMAT("%H:%M:%S");
const static int IDX_TIMESTAMP = 1;
const static int IDX_STUFF = 2;
@ -254,12 +255,14 @@ std::string LLLogChat::timestamp(bool withdate)
+LLTrans::getString ("TimeMonth")+"]/["
+LLTrans::getString ("TimeDay")+"] ["
+LLTrans::getString ("TimeHour")+"]:["
+LLTrans::getString ("TimeMin")+"]";
+LLTrans::getString ("TimeMin")+"]:["
+LLTrans::getString ("TimeSec")+"]";
}
else
{
timeStr = "[" + LLTrans::getString("TimeHour") + "]:["
+ LLTrans::getString ("TimeMin")+"]";
+ LLTrans::getString ("TimeMin")+"]:["
+ LLTrans::getString ("TimeSec")+"]";
}
LLStringUtil::format (timeStr, substitution);

3
indra/newview/llnearbychat.cpp
View File

@ -221,7 +221,8 @@ std::string appendTime()
time_t utc_time;
utc_time = time_corrected();
std::string timeStr ="["+ LLTrans::getString("TimeHour")+"]:["
+LLTrans::getString("TimeMin")+"]";
+LLTrans::getString("TimeMin")+"]:["
+LLTrans::getString("TimeSec")+"]";
LLSD substitution;

3
indra/newview/skins/default/xui/en/language_settings.xml
View File

@ -34,7 +34,8 @@
-->
<string name="TimeHour">hour,datetime,slt</string>
<string name="TimeMin">min,datetime,slt</string>
<string name="TimeMin">min,datetime,slt</string>
<string name="TimeSec">second,datetime,slt</string>
<string name="TimeYear">year,datetime,slt</string>
<string name="TimeDay">day,datetime,slt</string>
<string name="TimeMonth">mthnum,datetime,slt</string>