X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fmisc%2Ffrom-now.pipe.ts;h=3a9a76411f17b44e807ec1c74374cee007989fb8;hb=9ba1d64b1ac77304d9ffb1b3432a90ea00ff3281;hp=fac02af0bd6b59e3aa23c1e10d5ccc766f2b428b;hpb=be44767854709dbf7da4ba37fe4f16ac4e297f08;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/shared/misc/from-now.pipe.ts b/client/src/app/shared/misc/from-now.pipe.ts
index fac02af0b..3a9a76411 100644
--- a/client/src/app/shared/misc/from-now.pipe.ts
+++ b/client/src/app/shared/misc/from-now.pipe.ts
@@ -1,36 +1,40 @@
 import { Pipe, PipeTransform } from '@angular/core'
+import { I18n } from '@ngx-translate/i18n-polyfill'
 
 // Thanks: https://stackoverflow.com/questions/3177836/how-to-format-time-since-xxx-e-g-4-minutes-ago-similar-to-stack-exchange-site
 @Pipe({ name: 'myFromNow' })
 export class FromNowPipe implements PipeTransform {
 
-  transform (value: number) {
-    const seconds = Math.floor((Date.now() - value) / 1000)
+  constructor (private i18n: I18n) { }
+
+  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 interval + ' years ago'
+      return this.i18n('{{interval}} years ago', { interval })
     }
 
     interval = Math.floor(seconds / 2592000)
-    if (interval > 1) return interval + ' months ago'
-    if (interval === 1) return interval + ' month ago'
+    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 interval + ' weeks ago'
-    if (interval === 1) return interval + ' week ago'
+    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 interval + ' days ago'
-    if (interval === 1) return interval + ' day ago'
+    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 interval + ' hours ago'
-    if (interval === 1) return interval + ' hour ago'
+    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 interval + ' min ago'
+    if (interval >= 1) return this.i18n('{{interval}} min ago', { interval })
 
-    return Math.floor(seconds) + ' sec ago'
+    return this.i18n('{{interval}} sec ago', { interval: Math.max(0, seconds) })
   }
 }