Merge pull request #1090 from ing-bank/feat/localize-postprocessor

Localize post processors
This commit is contained in:
Thijs Louisse 2020-11-16 17:54:00 +01:00 committed by GitHub
commit 405d8e752e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 248 additions and 0 deletions

View file

@ -0,0 +1,5 @@
---
'@lion/localize': minor
---
Localize set date and number postProcessors for locale

View file

@ -6,6 +6,9 @@ import isLocalizeESModule from './isLocalizeESModule.js';
* @typedef {import('../types/LocalizeMixinTypes').NamespaceObject} NamespaceObject
*/
/** @typedef {import('../types/LocalizeMixinTypes').DatePostProcessor} DatePostProcessor */
/** @typedef {import('../types/LocalizeMixinTypes').NumberPostProcessor} NumberPostProcessor */
/**
* `LocalizeManager` manages your translations (includes loading)
*/
@ -30,6 +33,13 @@ export class LocalizeManager {
this.formatNumberOptions = {
returnIfNaN: '',
/** @type {Map<string,DatePostProcessor>} */
postProcessors: new Map(),
};
this.formatDateOptions = {
/** @type {Map<string,DatePostProcessor>} */
postProcessors: new Map(),
};
/**
@ -523,4 +533,18 @@ export class LocalizeManager {
return String(result || '');
}
/**
* @param {{locale:string, postProcessor:DatePostProcessor}} options
*/
setDatePostProcessorForLocale({ locale, postProcessor }) {
this.formatDateOptions.postProcessors.set(locale, postProcessor);
}
/**
* @param {{locale:string, postProcessor:NumberPostProcessor}} options
*/
setNumberPostProcessorForLocale({ locale, postProcessor }) {
this.formatNumberOptions.postProcessors.set(locale, postProcessor);
}
}

View file

@ -1,6 +1,9 @@
import { localize } from '../localize.js';
import { getLocale } from './getLocale.js';
import { normalizeIntlDate } from './normalizeIntlDate.js';
/** @typedef {import('../../types/LocalizeMixinTypes').DatePostProcessor} DatePostProcessor */
/**
* Formats date based on locale and options
*
@ -33,5 +36,22 @@ export function formatDate(date, options) {
} catch (e) {
formattedDate = '';
}
if (localize.formatDateOptions.postProcessors.size > 0) {
Array.from(localize.formatDateOptions.postProcessors).forEach(([locale, fn]) => {
if (locale === computedLocale) {
formattedDate = fn(formattedDate);
}
});
}
if (formatOptions.postProcessors && formatOptions.postProcessors.size > 0) {
Array.from(formatOptions.postProcessors).forEach(([locale, fn]) => {
if (locale === computedLocale) {
formattedDate = fn(formattedDate);
}
});
}
return normalizeIntlDate(formattedDate, computedLocale, formatOptions);
}

View file

@ -1,6 +1,9 @@
import { localize } from '../localize.js';
import { getLocale } from './getLocale.js';
import { formatNumberToParts } from './formatNumberToParts.js';
/** @typedef {import('../../types/LocalizeMixinTypes').NumberPostProcessor} NumberPostProcessor */
/**
* Formats a number based on locale and options. It uses Intl for the formatting.
*
@ -27,5 +30,24 @@ export function formatNumber(number, options = /** @type {FormatOptions} */ ({})
const part = /** @type {FormatNumberPart} */ (formattedToParts[i]);
printNumberOfParts += part.value;
}
const computedLocale = getLocale(options && options.locale);
if (localize.formatNumberOptions.postProcessors.size > 0) {
Array.from(localize.formatNumberOptions.postProcessors).forEach(([locale, fn]) => {
if (locale === computedLocale) {
printNumberOfParts = fn(printNumberOfParts);
}
});
}
if (options.postProcessors && options.postProcessors.size > 0) {
Array.from(options.postProcessors).forEach(([locale, fn]) => {
if (locale === computedLocale) {
printNumberOfParts = fn(printNumberOfParts);
}
});
}
return printNumberOfParts;
}

View file

@ -232,4 +232,104 @@ describe('formatDate', () => {
// @ts-ignore tests what happens if you use a wrong type
expect(formatDate(date)).to.equal('');
});
describe('Date post processors', () => {
/**
* Uppercase processor
*
* @param {string} str
* @returns {string}
*/
const upperCaseProcessor = str => {
return str.toUpperCase();
};
/**
* Lowercase processor
*
* @param {string} str
* @returns {string}
*/
const lowerCaseProcessor = str => {
return str.toLocaleLowerCase();
};
it('displays the appropriate date after post processor set in options', async () => {
const testDate = new Date('2012/05/21');
const postProcessors = new Map();
postProcessors.set('nl-NL', upperCaseProcessor);
postProcessors.set('de-DE', lowerCaseProcessor);
const options = {
weekday: 'long',
year: 'numeric',
month: 'long',
day: '2-digit',
postProcessors,
};
// locale is en-GB
expect(formatDate(testDate, options)).to.equal('Monday, 21 May 2012');
localize.locale = 'nl-NL';
expect(formatDate(testDate, options)).to.equal('MAANDAG 21 MEI 2012');
localize.locale = 'de-DE';
expect(formatDate(testDate, options)).to.equal('montag, 21. mai 2012');
localize.locale = 'en-US';
expect(formatDate(testDate, options)).to.equal('Monday, May 21, 2012');
});
it('displays the appropriate date after post processor set in localize', async () => {
const testDate = new Date('2012/05/21');
const options = {
weekday: 'long',
year: 'numeric',
month: 'long',
day: '2-digit',
};
localize.setDatePostProcessorForLocale({
locale: 'nl-NL',
postProcessor: upperCaseProcessor,
});
localize.setDatePostProcessorForLocale({
locale: 'de-DE',
postProcessor: upperCaseProcessor,
});
expect(formatDate(testDate, options)).to.equal('Monday, 21 May 2012');
localize.locale = 'nl-NL';
expect(formatDate(testDate, options)).to.equal('MAANDAG 21 MEI 2012');
localize.locale = 'de-DE';
expect(formatDate(testDate, options)).to.equal('MONTAG, 21. MAI 2012');
localize.locale = 'en-US';
expect(formatDate(testDate, options)).to.equal('Monday, May 21, 2012');
});
it('displays the appropriate date after post processors set in options and localize', async () => {
const testDate = new Date('2012/05/21');
const postProcessors = new Map();
postProcessors.set('nl-NL', upperCaseProcessor);
postProcessors.set('de-DE', upperCaseProcessor);
const options = {
weekday: 'long',
year: 'numeric',
month: 'long',
day: '2-digit',
postProcessors,
};
localize.setDatePostProcessorForLocale({
locale: 'de-DE',
postProcessor: lowerCaseProcessor,
});
expect(formatDate(testDate, options)).to.equal('Monday, 21 May 2012');
localize.locale = 'nl-NL';
expect(formatDate(testDate, options)).to.equal('MAANDAG 21 MEI 2012');
localize.locale = 'de-DE';
expect(formatDate(testDate, options)).to.equal('MONTAG, 21. MAI 2012');
localize.locale = 'en-US';
expect(formatDate(testDate, options)).to.equal('Monday, May 21, 2012');
});
});
});

View file

@ -362,4 +362,69 @@ describe('formatNumber', () => {
});
});
});
describe('postProcessors', () => {
/** @type {Map<string, import('../../types/LocalizeMixinTypes.js').NumberPostProcessor>} */
let savedpostProcessors;
beforeEach(() => {
savedpostProcessors = localize.formatNumberOptions.postProcessors;
});
afterEach(() => {
localize.formatNumberOptions.postProcessors = savedpostProcessors;
});
/**
* Comma to spaces processor
*
* @param {string} str
* @returns {string}
*/
const commaToSpaceProcessor = str => {
return str.replace(/,/g, ' ');
};
/**
* First space to dot processor
*
* @param {string} str
* @returns {string}
*/
const firstSpaceToDotProcessor = str => {
return str.replace(' ', '.');
};
it('uses `options.postProcessors`', () => {
const postProcessors = new Map();
postProcessors.set('en-GB', commaToSpaceProcessor);
expect(
formatNumber(112345678, {
postProcessors,
}),
).to.equal('112 345 678');
});
it('uses `localize.formatNumberOptions.postProcessors`', () => {
localize.setNumberPostProcessorForLocale({
locale: 'en-GB',
postProcessor: commaToSpaceProcessor,
});
expect(formatNumber(112345678)).to.equal('112 345 678');
});
it('uses `options.postProcessors` and `localize.formatNumberOptions.postProcessors`', () => {
const postProcessors = new Map();
postProcessors.set('en-GB', commaToSpaceProcessor);
localize.setNumberPostProcessorForLocale({
locale: 'en-GB',
postProcessor: firstSpaceToDotProcessor,
});
expect(
formatNumber(112345678, {
postProcessors,
}),
).to.equal('112 345 678');
});
});
});

View file

@ -6,6 +6,10 @@ export interface FormatNumberPart {
value: string;
}
declare function DatePostProcessorImplementation(date: string): string;
export type DatePostProcessor = typeof DatePostProcessorImplementation;
// Take the DateTimeFormat and add the missing resolved options as well as optionals
export declare interface FormatDateOptions extends Intl.DateTimeFormatOptions {
locale?: string;
@ -17,8 +21,14 @@ export declare interface FormatDateOptions extends Intl.DateTimeFormatOptions {
returnIfNaN?: string;
decimalSeparator?: string;
mode?: 'pasted' | 'auto';
postProcessors?: Map<string, DatePostProcessor>;
}
declare function NumberPostProcessorImplementation(number: string): string;
export type NumberPostProcessor = typeof NumberPostProcessorImplementation;
// Take the DateTimeFormat and add the missing resolved options as well as optionals, and our own
export declare interface FormatNumberOptions extends Intl.NumberFormatOptions {
locale?: string;
@ -27,6 +37,8 @@ export declare interface FormatNumberOptions extends Intl.NumberFormatOptions {
returnIfNaN?: string;
decimalSeparator?: string;
mode?: 'pasted' | 'auto';
postProcessors?: Map<string, NumberPostProcessor>;
}
interface StringToFunctionMap {