feat: Add a formatLocallyDistanceToNowStrict helper

cozy · Dec 21, 2022 · ff6b565 · ff6b565
1 parent 7a8918c
commit ff6b565
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/react/I18n/format.jsx b/react/I18n/format.jsx
@@ -1,6 +1,7 @@
 import format from 'date-fns/format'
 import { DEFAULT_LANG } from '.'
 import formatDistanceToNow from 'date-fns/distance_in_words_to_now'
+import formatDistanceStrict from 'date-fns/distance_in_words_strict'
 
 const locales = {}
 let lang = DEFAULT_LANG
@@ -36,3 +37,6 @@ export const initFormat = (userLang, defaultLang = DEFAULT_LANG) => (
 
 export const formatLocallyDistanceToNow = date =>
   formatDistanceToNow(date, { locale: locales[lang] })
+
+export const formatLocallyDistanceToNowStrict = date =>
+  formatDistanceStrict(Date.now(), date, { locale: locales[lang] })
diff --git a/react/Viewer/components/ExpirationAlert.jsx b/react/Viewer/components/ExpirationAlert.jsx
@@ -9,7 +9,7 @@ import Link from '../../Link'
 import Typography from '../../Typography'
 import { withViewerLocales } from '../hoc/withViewerLocales'
 import { useI18n } from '../../I18n'
-import { formatLocallyDistanceToNow } from '../../I18n/format'
+import { formatLocallyDistanceToNowStrict } from '../../I18n/format'
 
 const FILES_DOCTYPE = 'io.cozy.files'
 
@@ -51,7 +51,7 @@ const ExpirationAlert = ({ file }) => {
       <Typography component="span" variant="inherit">
         <Typography component="span" variant="inherit">
           {t('Viewer.panel.expiration.description', {
-            duration: formatLocallyDistanceToNow(expirationDate)
+            duration: formatLocallyDistanceToNowStrict(expirationDate)
           })}
         </Typography>
         {expirationNoticeLink && (

diff --git a/react/Viewer/components/ExpirationAnnotation.jsx b/react/Viewer/components/ExpirationAnnotation.jsx
@@ -5,7 +5,7 @@ import { models } from 'cozy-client'
 
 import Typography from '../../Typography'
 import { useI18n } from '../../I18n'
-import { formatLocallyDistanceToNow } from '../../I18n/format'
+import { formatLocallyDistanceToNowStrict } from '../../I18n/format'
 
 const { computeExpirationDate, isExpired } = models.paper
 
@@ -25,7 +25,7 @@ const ExpirationAnnotation = ({ file }) => {
   return (
     <Typography component="span" variant="inherit" className="u-warning">
       {t('Viewer.panel.qualification.expiresIn', {
-        duration: formatLocallyDistanceToNow(expirationDate)
+        duration: formatLocallyDistanceToNowStrict(expirationDate)
       })}
     </Typography>
   )