X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fshared-main%2Fangular%2Fnumber-formatter.pipe.ts;h=8badb1573d3f37f55f8c3813de7a7478f84321d0;hb=68018040f2ec0a7c89ca5c8490b4b74d11cc07f7;hp=5e6ccfa16ce44d70f492c2f66a2e7c4a46af3d76;hpb=d0dd9813d563ecd3f7ec6342d922a1534e182bd8;p=github%2FChocobozzz%2FPeerTube.git 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 5e6ccfa16..8badb1573 100644 --- a/client/src/app/shared/shared-main/angular/number-formatter.pipe.ts +++ b/client/src/app/shared/shared-main/angular/number-formatter.pipe.ts @@ -1,14 +1,10 @@ -import { Pipe, PipeTransform } from '@angular/core' +import { formatNumber } from '@angular/common' +import { Inject, LOCALE_ID, Pipe, PipeTransform } from '@angular/core' // Thanks: https://github.com/danrevah/ngx-pipes/blob/master/src/ng-pipes/pipes/math/bytes.ts @Pipe({ name: 'myNumberFormatter' }) export class NumberFormatterPipe implements PipeTransform { - private dictionary: Array<{max: number, type: string}> = [ - { max: 1000, type: '' }, - { max: 1000000, type: 'K' }, - { max: 1000000000, type: 'M' } - ] /** * @param x number @@ -21,6 +17,13 @@ export class NumberFormatterPipe implements PipeTransform { return +f } + private dictionary: Array<{max: number, type: string}> = [ + { max: 1000, type: '' }, + { max: 1000000, type: 'K' }, + { max: 1000000000, type: 'M' } + ] + constructor (@Inject(LOCALE_ID) private localeId: string) {} + transform (value: number) { const format = this.dictionary.find(d => value < d.max) || this.dictionary[this.dictionary.length - 1] const calc = value / (format.max / 1000) @@ -28,7 +31,7 @@ export class NumberFormatterPipe implements PipeTransform { const decimalPart = NumberFormatterPipe.getDecimalForNumber(calc) return integralPart < 10 && decimalPart > 0 - ? `${integralPart}.${decimalPart}${format.type}` + ? formatNumber(parseFloat(`${integralPart}.${decimalPart}`), this.localeId) + format.type : `${integralPart}${format.type}` } }