Skip to content

Commit

Permalink
Correct incorrect time stamp when date = today.
Browse files Browse the repository at this point in the history
  • Loading branch information
baumgarr committed Jul 24, 2017
1 parent 695ff8a commit b5c1bb9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion gui/datedelegate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ QString DateDelegate::displayText(const QVariant &value, const QLocale &locale)

//QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedKingdom));
if (timestamp.date() == QDate::currentDate())
return tr("Today") +" " + timestamp.time().toString(Qt::SystemLocaleShortDate);
return tr("Today") +" " + timestamp.time().toString(global.timeFormat);
return timestamp.toString(global.dateFormat + QString(" ") +global.timeFormat);
// return timestamp.toString(Qt::SystemLocaleShortDate);
}

0 comments on commit b5c1bb9

Please sign in to comment.