mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Prepare for ICU migration

Browse source
This commit is contained in:
Jamie Kyle 2023-03-27 16:37:39 -07:00 • committed by GitHub
parent d0f17a1398
commit 2781e621ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 550 additions and 414 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ts/util/timestamp.ts
View file

@ -125,21 +125,21 @@ export function formatDateTimeLong(
const timestamp = rawTimestamp.valueOf();
if (isToday(rawTimestamp)) {
return i18n('timestampFormat__long--today', [
new Intl.DateTimeFormat(locale, {
return i18n('timestampFormat__long--today', {
time: new Intl.DateTimeFormat(locale, {
hour: 'numeric',
minute: 'numeric',
}).format(timestamp),
]);
});
}
if (isYesterday(rawTimestamp)) {
return i18n('timestampFormat__long--yesterday', [
new Intl.DateTimeFormat(locale, {
return i18n('timestampFormat__long--yesterday', {
time: new Intl.DateTimeFormat(locale, {
hour: 'numeric',
minute: 'numeric',
}).format(timestamp),
]);
});
}
return new Intl.DateTimeFormat(locale, {
@ -165,11 +165,15 @@ export function formatTime(
}
if (diff < HOUR) {
return i18n('minutesAgo', [Math.floor(diff / MINUTE).toString()]);
return i18n('minutesAgo', {
minutes: Math.floor(diff / MINUTE).toString(),
});
}
if (isRelativeTime) {
return i18n('hoursAgo', [Math.floor(diff / HOUR).toString()]);
return i18n('hoursAgo', {
hours: Math.floor(diff / HOUR).toString(),
});
}
return new Date(timestamp).toLocaleTimeString([], {