cargdev/angular
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: i18n - include currency code in locale data (#34771)

Browse Source 
PR Close #34771
This commit is contained in:
Pete Bacon Darwin
2019-12-14 10:39:41 +00:00
committed by atscott
parent 965f5575c7
commit c18a3fe455
4 changed files with 62 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tools/gulp-tasks/cldr/extract.js
View File

@ -97,8 +97,8 @@ module.exports = (gulp, done) => {
console.log(`All i18n cldr files have been generated, formatting files..."`);
shelljs.exec(
`yarn clang-format -i ${I18N_DATA_FOLDER}/**/*.ts ${I18N_DATA_FOLDER}/*.ts ${I18N_FOLDER}/currencies.ts ${I18N_CORE_FOLDER}/locale_en.ts ${I18N_GLOBAL_FOLDER}/*.js`,
{silent: true});
`yarn clang-format -i ${I18N_DATA_FOLDER}/**/*.ts ${I18N_DATA_FOLDER}/*.ts ${I18N_FOLDER}/currencies.ts ${I18N_CORE_FOLDER}/locale_en.ts ${I18N_GLOBAL_FOLDER}/*.js`,
{silent: true});
done();
};
@ -149,16 +149,18 @@ function generateGlobalLocale(locale, localeData, baseCurrencies) {
* Collect up the basic locale data [ localeId, dateTime, number, currency, pluralCase ].
*/
function generateBasicLocaleString(locale, localeData, baseCurrencies) {
let data =
stringify(
[
locale, ...getDateTimeTranslations(localeData), ...getDateTimeSettings(localeData),
...getNumberSettings(localeData), ...getCurrencySettings(locale, localeData),
generateLocaleCurrencies(localeData, baseCurrencies)
],
true)
// We remove "undefined" added by spreading arrays when there is no value
.replace(/undefined/g, 'u');
let data = stringify(
[
locale,
...getDateTimeTranslations(localeData),
...getDateTimeSettings(localeData),
...getNumberSettings(localeData),
...getCurrencySettings(locale, localeData),
generateLocaleCurrencies(localeData, baseCurrencies),
],
true)
// We remove "undefined" added by spreading arrays when there is no value
.replace(/undefined/g, 'u');
// adding plural function after, because we don't want it as a string
data = data.replace(/\]$/, ', plural]');
@ -495,8 +497,8 @@ function getNumberSettings(localeData) {
}
/**
* Returns the currency symbol and name for a locale
* @returns [ symbol, name ]
* Returns the currency code, symbol and name for a locale
* @returns [ code, symbol, name ]
*/
function getCurrencySettings(locale, localeData) {
const currencyInfo = localeData.main(`numbers/currencies`);
@ -523,11 +525,13 @@ function getCurrencySettings(locale, localeData) {
}
}
let currencySettings = [undefined, undefined];
let currencySettings = [undefined, undefined, undefined];
if (currentCurrency) {
currencySettings =
[currencyInfo[currentCurrency].symbol, currencyInfo[currentCurrency].displayName];
currencySettings = [
currentCurrency, currencyInfo[currentCurrency].symbol,
currencyInfo[currentCurrency].displayName
];
}
return currencySettings;