diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 8f021701a..686179c99 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -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#other" = "{count} users 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_channel" = "Add to Channel"; "lng_group_requests_dismiss" = "Dismiss"; diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp index 1ece3c545..c17e83832 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp @@ -1312,20 +1312,19 @@ QString PrepareRequestedRowStatus(TimeId date) { const auto parsed = base::unixtime::parse(date); const auto parsedDate = parsed.date(); const auto time = parsed.time().toString(cTimeFormat()); - const auto dateGeneric = [&] { - return tr::lng_mediaview_date_time( + const auto generic = [&] { + return tr::lng_group_requests_status_date_time( tr::now, lt_date, langDayOfMonth(parsedDate), lt_time, time); }; - const auto dateString = (parsedDate.addDays(1) < now.date()) - ? dateGeneric() + return (parsedDate.addDays(1) < now.date()) + ? generic() : (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) - ? tr::lng_mediaview_today(tr::now, lt_time, time) - : dateGeneric(); - return tr::lng_group_requests_status(tr::now, lt_date, dateString); + ? tr::lng_group_requests_status_today(tr::now, lt_time, time) + : generic(); }