synced/outline
1
0
Fork 0
mirror of https://github.com/outline/outline.git synced 2025-04-10 03:03:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Show count of days rather than relative time on notice, closes #6330

Browse Source
This commit is contained in:
Tom Moor
2024-01-03 22:44:14 -05:00
parent 67a6b3fe43
commit 3c3ec45dc0
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/scenes/Document/components/Notices.tsx
View File

@ -1,3 +1,4 @@
import differenceInDays from "date-fns/differenceInDays";
import { TrashIcon, ArchiveIcon, ShapesIcon, InputIcon } from "outline-icons";
import * as React from "react";
import { Trans, useTranslation } from "react-i18next";
@ -11,6 +12,19 @@ type Props = {
readOnly: boolean;
};
function Days(props: { dateTime: string }) {
const { t } = useTranslation();
const days = differenceInDays(new Date(props.dateTime), new Date());
return (
<>
{t(`{{ count }} days`, {
count: days,
})}
</>
);
}
export default function Notices({ document, readOnly }: Props) {
const { t } = useTranslation();
@ -22,12 +36,12 @@ export default function Notices({ document, readOnly }: Props) {
return document.template ? (
<Trans>
This template will be permanently deleted in{" "}
<Time dateTime={document.permanentlyDeletedAt} /> unless restored.
<Days dateTime={document.permanentlyDeletedAt} /> unless restored.
</Trans>
) : (
<Trans>
This document will be permanently deleted in{" "}
<Time dateTime={document.permanentlyDeletedAt} /> unless restored.
<Days dateTime={document.permanentlyDeletedAt} /> unless restored.
</Trans>
);
}

2
shared/i18n/locales/en_US/translation.json
View File

@ -553,6 +553,8 @@
"Viewer insights": "Viewer insights",
"As an admin you can manage if team members can see who has viewed this document": "As an admin you can manage if team members can see who has viewed this document",
"Sorry, the last change could not be persisted – please reload the page": "Sorry, the last change could not be persisted – please reload the page",
"{{ count }} days": "{{ count }} day",
"{{ count }} days_plural": "{{ count }} days",
"This template will be permanently deleted in <2></2> unless restored.": "This template will be permanently deleted in <2></2> unless restored.",
"This document will be permanently deleted in <2></2> unless restored.": "This document will be permanently deleted in <2></2> unless restored.",
"Highlight some text and use the <1></1> control to add placeholders that can be filled out when creating new documents": "Highlight some text and use the <1></1> control to add placeholders that can be filled out when creating new documents",