mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-25 17:20:47 +02:00
Code Issues Projects Releases Wiki Activity

Fix incorrect time format being used sometimes when not in UTC timezone, add day of month to "previous year" time format

Browse Source
This commit is contained in:
jacob1
2018-12-31 21:49:44 -05:00
parent 2d838087b5
commit cc93479c4b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Format.cpp
View File

@@ -52,12 +52,12 @@ ByteString format::UnixtimeToDate(time_t unixtime, ByteString dateFormat)
ByteString format::UnixtimeToDateMini(time_t unixtime) ByteString format::UnixtimeToDateMini(time_t unixtime)
{ {
time_t currentTime = time(NULL); time_t currentTime = time(NULL);
struct tm currentTimeData = *localtime(&currentTime); struct tm currentTimeData = *gmtime(&currentTime);
struct tm timeData = *localtime(&unixtime); struct tm timeData = *gmtime(&unixtime);
if(currentTimeData.tm_year != timeData.tm_year) if(currentTimeData.tm_year != timeData.tm_year)
{ {
return UnixtimeToDate(unixtime, "%b %Y"); return UnixtimeToDate(unixtime, "%d %b %Y");
} }
else if(currentTimeData.tm_mon != timeData.tm_mon || currentTimeData.tm_mday != timeData.tm_mday) else if(currentTimeData.tm_mon != timeData.tm_mon || currentTimeData.tm_mday != timeData.tm_mday)
{ {