chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change "yesterday" to "1 day ago" in Welcome message

Browse Source 
and fix date plural in oximetry Welcome message
This commit is contained in:
Guy Scharf 2020-06-03 09:36:52 -07:00
parent 2d69049c77
commit 8579b1d63d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oscar/welcome.cpp
View File

@ -178,7 +178,7 @@ QString Welcome::GenerateCPAPHTML()
int daysto = date.daysTo(QDate::currentDate());
QString daystring;
if (daysto == 1) daystring += tr("last night");
else if (daysto == 2) daystring += tr("yesterday");
else if (daysto == 2) daystring += tr("1 day ago");
else daystring += tr("%2 days ago").arg(date.daysTo(QDate::currentDate()));
html += tr("was %1 (on %2)").arg(daystring).arg(date.toString(Qt::SystemLocaleLongDate)) + "<br/>";
@ -339,8 +339,8 @@ QString Welcome::GenerateOxiHTML()
html += "<p>"+QObject::tr("Most recent Oximetry data: <a onclick='alert(\"daily=%2\");'>%1</a> ").arg(oxidate.toString(Qt::SystemLocaleLongDate)).arg(oxidate.toString(Qt::ISODate));
if (daysto == 1) html += QObject::tr("(last night)");
else if (daysto == 2) html += QObject::tr("(yesterday)");
else html += QObject::tr("(%2 day ago)").arg(oxidate.daysTo(QDate::currentDate()));
else if (daysto == 2) html += QObject::tr("(1 day ago)");
else html += QObject::tr("(%2 days ago)").arg(oxidate.daysTo(QDate::currentDate()));
html+="</p>";
ui->oxiIcon->setVisible(true);
ui->oxiInfo->setVisible(true);