status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-01-12 15:24:39 +00:00
Code Issues Projects Releases Wiki Activity

fix(i18n): timestamp stripping year part

Browse Source 
Use locale-neutral `getDayMonth()` plus the time part as there's no way
to programatically check for date parts separator.

Fixes #10615
This commit is contained in:
Lukáš Tinkl 2023-08-29 10:50:20 +02:00 committed by Lukáš Tinkl
parent ae5381a29f
commit a210189137
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/StatusQ/src/StatusQ/Core/LocaleUtils.qml
View File

@ -431,17 +431,14 @@ QtObject {
return qsTr("%1 %2").arg(loc.standaloneDayName(value.getDay(), Locale.ShortFormat)).arg(value.toLocaleTimeString(loc, formatString))
}
// otherwise
var fullFormatString = d.fixupTimeFormatString(loc.dateTimeFormat(Locale.ShortFormat))
// within this year
if (now.getFullYear() === value.getFullYear()) {
// strip year part, if current year -> "31 December 09:41"
// It remove preceding dot or space
fullFormatString = fullFormatString.replace(/([.\s])?\b(y+)\b/g, "")
} else if (!fullFormatString.includes("yyyy")) {
fullFormatString = fullFormatString.replace("yy", "yyyy") // different year -> "31 December 2022 09:41"
// strip year part, if current year -> "31 Dec 09:41"
return getDayMonth(value) + " " + formatTime(value, Locale.ShortFormat)
}
return value.toLocaleString(loc, fullFormatString)
// otherwise
return formatDateTime(value, Locale.ShortFormat)
}
function getTimeDifference(d1, d2) {