void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Separate strings for "requested to join {date}".

Browse source
This commit is contained in:
John Preston 2021-10-31 12:32:33 +04:00
parent 51addb7320
commit 5cbfdad2e8
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Telegram/Resources/langs/lang.strings
View file

@ -1345,7 +1345,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_group_requests_pending#one" = "{count} user requested to join"; "lng_group_requests_pending#one" = "{count} user requested to join";
"lng_group_requests_pending#other" = "{count} users requested to join"; "lng_group_requests_pending#other" = "{count} users requested to join";
"lng_group_requests_pending_user" = "{user} requested to join"; "lng_group_requests_pending_user" = "{user} requested to join";
"lng_group_requests_status" = "requested to join {date}"; "lng_group_requests_status_today" = "requested to join today at {time}";
"lng_group_requests_status_yesterday" = "requested to join yesterday at {time}";
"lng_group_requests_status_date_time" = "requested to join {date} at {time}";
"lng_group_requests_add" = "Add to Group"; "lng_group_requests_add" = "Add to Group";
"lng_group_requests_add_channel" = "Add to Channel"; "lng_group_requests_add_channel" = "Add to Channel";
"lng_group_requests_dismiss" = "Dismiss"; "lng_group_requests_dismiss" = "Dismiss";

15
Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
View file

@ -1312,20 +1312,19 @@ QString PrepareRequestedRowStatus(TimeId date) {
const auto parsed = base::unixtime::parse(date); const auto parsed = base::unixtime::parse(date);
const auto parsedDate = parsed.date(); const auto parsedDate = parsed.date();
const auto time = parsed.time().toString(cTimeFormat()); const auto time = parsed.time().toString(cTimeFormat());
const auto dateGeneric = [&] { const auto generic = [&] {
return tr::lng_mediaview_date_time( return tr::lng_group_requests_status_date_time(
tr::now, tr::now,
lt_date, lt_date,
langDayOfMonth(parsedDate), langDayOfMonth(parsedDate),
lt_time, lt_time,
time); time);
}; };
const auto dateString = (parsedDate.addDays(1) < now.date()) return (parsedDate.addDays(1) < now.date())
? dateGeneric() ? generic()
: (parsedDate.addDays(1) == now.date()) : (parsedDate.addDays(1) == now.date())
? tr::lng_mediaview_yesterday(tr::now, lt_time, time) ? tr::lng_group_requests_status_yesterday(tr::now, lt_time, time)
: (now.date() == parsedDate) : (now.date() == parsedDate)
? tr::lng_mediaview_today(tr::now, lt_time, time) ? tr::lng_group_requests_status_today(tr::now, lt_time, time)
: dateGeneric(); : generic();
return tr::lng_group_requests_status(tr::now, lt_date, dateString);
} }