Update CONTRIBUTING.md

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / misc / from-now.pipe.ts

diff --git a/client/src/app/shared/misc/from-now.pipe.ts b/client/src/app/shared/misc/from-now.pipe.ts
index 3a64a4077c349e3c089afa8a57179b433c35229a..3a9a76411f17b44e807ec1c74374cee007989fb8 100644 (file)
--- a/client/src/app/shared/misc/from-now.pipe.ts
+++ b/client/src/app/shared/misc/from-now.pipe.ts
@@ -7,33 +7,34 @@ export class FromNowPipe implements PipeTransform {
 
   constructor (private i18n: I18n) { }
 
-  transform (value: number) {
-    const seconds = Math.floor((Date.now() - value) / 1000)
+  transform (arg: number | Date | string) {
+    const argDate = new Date(arg)
+    const seconds = Math.floor((Date.now() - argDate.getTime()) / 1000)
 
     let interval = Math.floor(seconds / 31536000)
     if (interval > 1) {
-      return this.i18n('{{ interval }} years ago', { interval })
+      return this.i18n('{{interval}} years ago', { interval })
     }
 
     interval = Math.floor(seconds / 2592000)
-    if (interval > 1) return this.i18n('{{ interval }} months ago', { interval })
-    if (interval === 1) return this.i18n('{{ interval }} month ago', { interval })
+    if (interval > 1) return this.i18n('{{interval}} months ago', { interval })
+    if (interval === 1) return this.i18n('{{interval}} month ago', { interval })
 
     interval = Math.floor(seconds / 604800)
-    if (interval > 1) return this.i18n('{{ interval }} weeks ago', { interval })
-    if (interval === 1) return this.i18n('{{ interval }} week ago', { interval })
+    if (interval > 1) return this.i18n('{{interval}} weeks ago', { interval })
+    if (interval === 1) return this.i18n('{{interval}} week ago', { interval })
 
     interval = Math.floor(seconds / 86400)
-    if (interval > 1) return this.i18n('{{ interval }} days ago', { interval })
-    if (interval === 1) return this.i18n('{{ interval }} day ago', { interval })
+    if (interval > 1) return this.i18n('{{interval}} days ago', { interval })
+    if (interval === 1) return this.i18n('{{interval}} day ago', { interval })
 
     interval = Math.floor(seconds / 3600)
-    if (interval > 1) return this.i18n('{{ interval }} hours ago', { interval })
-    if (interval === 1) return this.i18n('{{ interval }} hour ago', { interval })
+    if (interval > 1) return this.i18n('{{interval}} hours ago', { interval })
+    if (interval === 1) return this.i18n('{{interval}} hour ago', { interval })
 
     interval = Math.floor(seconds / 60)
-    if (interval >= 1) return this.i18n('{{ interval }} min ago', { interval })
+    if (interval >= 1) return this.i18n('{{interval}} min ago', { interval })
 
-    return this.i18n('{{ interval }} sec ago', { interval: Math.floor(seconds) })
+    return this.i18n('{{interval}} sec ago', { interval: Math.max(0, seconds) })
   }
 }