honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(common): use correct group separator for currency pipe (#18932) 

PR Close #18932
This commit is contained in:
Olivier Combe 2017-08-29 18:54:17 +02:00 committed by Jason Aden
parent 4fa6ae82ee
commit 4ec5e282d9
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/common/src/i18n/locale_data_api.ts
View File

@ -325,7 +325,7 @@ export function getLocaleNumberSymbol(locale: string, symbol: NumberSymbol): str
if (symbol === NumberSymbol.CurrencyDecimal) { if (symbol === NumberSymbol.CurrencyDecimal) {
return data[LocaleDataIndex.NumberSymbols][NumberSymbol.Decimal]; return data[LocaleDataIndex.NumberSymbols][NumberSymbol.Decimal];
} else if (symbol === NumberSymbol.CurrencyGroup) { } else if (symbol === NumberSymbol.CurrencyGroup) {
return data[LocaleDataIndex.NumberSymbols][NumberSymbol.Decimal]; return data[LocaleDataIndex.NumberSymbols][NumberSymbol.Group];
} }
} }
return res; return res;

7
packages/common/test/pipes/number_pipe_spec.ts
View File

@ -8,6 +8,7 @@
import localeEn from '../../locales/en'; import localeEn from '../../locales/en';
import localeEsUS from '../../locales/es-US'; import localeEsUS from '../../locales/es-US';
import localeFr from '../../locales/fr';
import {registerLocaleData, CurrencyPipe, DecimalPipe, PercentPipe} from '@angular/common'; import {registerLocaleData, CurrencyPipe, DecimalPipe, PercentPipe} from '@angular/common';
import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal';
@ -16,6 +17,7 @@ export function main() {
beforeAll(() => { beforeAll(() => {
registerLocaleData(localeEn); registerLocaleData(localeEn);
registerLocaleData(localeEsUS); registerLocaleData(localeEsUS);
registerLocaleData(localeFr);
}); });
function isNumeric(value: any): boolean { return !isNaN(value - parseFloat(value)); } function isNumeric(value: any): boolean { return !isNaN(value - parseFloat(value)); }
@ -72,6 +74,8 @@ export function main() {
it('should return correct value for numbers', () => { it('should return correct value for numbers', () => {
expect(pipe.transform(1.23)).toEqual('123%'); expect(pipe.transform(1.23)).toEqual('123%');
expect(pipe.transform(1.2, '.2')).toEqual('120.00%'); expect(pipe.transform(1.2, '.2')).toEqual('120.00%');
expect(pipe.transform(1.2, '4.2')).toEqual('0,120.00%');
expect(pipe.transform(1.2, '4.2', 'fr')).toEqual('0 120,00 %');
}); });
it('should not support other objects', it('should not support other objects',
@ -93,6 +97,9 @@ export function main() {
expect(pipe.transform(5.1234, 'USD', 'symbol')).toEqual('$5.12'); expect(pipe.transform(5.1234, 'USD', 'symbol')).toEqual('$5.12');
expect(pipe.transform(5.1234, 'CAD', 'symbol')).toEqual('CA$5.12'); expect(pipe.transform(5.1234, 'CAD', 'symbol')).toEqual('CA$5.12');
expect(pipe.transform(5.1234, 'CAD', 'symbol-narrow')).toEqual('$5.12'); expect(pipe.transform(5.1234, 'CAD', 'symbol-narrow')).toEqual('$5.12');
expect(pipe.transform(5.1234, 'CAD', 'symbol-narrow', '5.2-2')).toEqual('$00,005.12');
expect(pipe.transform(5.1234, 'CAD', 'symbol-narrow', '5.2-2', 'fr'))
.toEqual('00 005,12 $');
}); });
it('should not support other objects', it('should not support other objects',