mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-30 22:16:14 +00:00
Code Issues Releases Wiki Activity

Use default-constructed QLocale for date/time/whatever else formatting

Browse Source 
Qt 6 chenged the QDateTime API to use QLocale::c() rather than QLocale::system(), using default-constructed QLocale will make this consistent and overradable application-wide

Other formating use-cases as QLocale::decimalPoint use default-constructed QLocale now, too
This commit is contained in:
Ilya Fedin
2022-10-17 07:51:59 +04:00
committed by John Preston
parent 2c1933bdb8
commit 7b5781b845
22 changed files with 50 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Telegram/SourceFiles/data/data_peer_values.cpp
View File

@@ -399,14 +399,15 @@ QString OnlineText(TimeId online, TimeId now) {
}
const auto onlineFull = base::unixtime::parse(online);
const auto nowFull = base::unixtime::parse(now);
const auto locale = QLocale();
if (onlineFull.date() == nowFull.date()) {
const auto onlineTime = onlineFull.time().toString(cTimeFormat());
const auto onlineTime = locale.toString(onlineFull.time(), cTimeFormat());
return tr::lng_status_lastseen_today(tr::now, lt_time, onlineTime);
} else if (onlineFull.date().addDays(1) == nowFull.date()) {
const auto onlineTime = onlineFull.time().toString(cTimeFormat());
const auto onlineTime = locale.toString(onlineFull.time(), cTimeFormat());
return tr::lng_status_lastseen_yesterday(tr::now, lt_time, onlineTime);
}
const auto date = onlineFull.date().toString(cDateFormat());
const auto date = locale.toString(onlineFull.date(), cDateFormat());
return tr::lng_status_lastseen_date(tr::now, lt_date, date);
}
@@ -425,15 +426,16 @@ QString OnlineTextFull(not_null<UserData*> user, TimeId now) {
}
const auto onlineFull = base::unixtime::parse(user->onlineTill);
const auto nowFull = base::unixtime::parse(now);
const auto locale = QLocale();
if (onlineFull.date() == nowFull.date()) {
const auto onlineTime = onlineFull.time().toString(cTimeFormat());
const auto onlineTime = locale.toString(onlineFull.time(), cTimeFormat());
return tr::lng_status_lastseen_today(tr::now, lt_time, onlineTime);
} else if (onlineFull.date().addDays(1) == nowFull.date()) {
const auto onlineTime = onlineFull.time().toString(cTimeFormat());
const auto onlineTime = locale.toString(onlineFull.time(), cTimeFormat());
return tr::lng_status_lastseen_yesterday(tr::now, lt_time, onlineTime);
}
const auto date = onlineFull.date().toString(cDateFormat());
const auto time = onlineFull.time().toString(cTimeFormat());
const auto date = locale.toString(onlineFull.date(), cDateFormat());
const auto time = locale.toString(onlineFull.time(), cTimeFormat());
return tr::lng_status_lastseen_date_time(tr::now, lt_date, date, lt_time, time);
}