show first decimal for views above a thousand (#3564)

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / shared-main / angular / number-formatter.pipe.ts

diff --git a/client/src/app/shared/shared-main/angular/number-formatter.pipe.ts b/client/src/app/shared/shared-main/angular/number-formatter.pipe.ts
index e2eba3a60a620c5f4a7d0a31685bc886af9cc2a3..5e6ccfa16ce44d70f492c2f66a2e7c4a46af3d76 100644 (file)
--- a/client/src/app/shared/shared-main/angular/number-formatter.pipe.ts
+++ b/client/src/app/shared/shared-main/angular/number-formatter.pipe.ts
@@ -10,10 +10,25 @@ export class NumberFormatterPipe implements PipeTransform {
     { max: 1000000000, type: 'M' }
   ]
 
+  /**
+   * @param x number
+   * @param n number of decimals to get (defaults to 1, needs to be >= 1)
+   */
+  static getDecimalForNumber (x: number, n = 1) {
+    const v = x.toString().split('.')
+    const f = v[1] || ''
+    if (f.length > n) return +f.substr(0, n)
+    return +f
+  }
+
   transform (value: number) {
     const format = this.dictionary.find(d => value < d.max) || this.dictionary[this.dictionary.length - 1]
-    const calc = Math.floor(value / (format.max / 1000))
+    const calc = value / (format.max / 1000)
+    const integralPart = Math.floor(calc)
+    const decimalPart = NumberFormatterPipe.getDecimalForNumber(calc)
 
-    return `${calc}${format.type}`
+    return integralPart < 10 && decimalPart > 0
+      ? `${integralPart}.${decimalPart}${format.type}`
+      : `${integralPart}${format.type}`
   }
 }