Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(common): update locales data to remove � characters #33699

Closed
wants to merge 2 commits into from
Closed

fix(common): update locales data to remove � characters #33699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07f6d24
build: move clang formating out of gulp stream for cldr
josephperrott Nov 8, 2019
7b1a46a
fix(common): rerun cldr to remove � characters
josephperrott Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/common/locales/closure-locale.ts
View file
Open in desktop
Expand Up @@ -3415,7 +3415,7 @@ export const locale_or = [
'or', [['ପୂ', 'ଅ'], ['AM', 'PM'], u], [['AM', 'ଅପରାହ୍ନ'], ['ପୂର୍ବାହ୍ନ', 'ଅପରାହ୍ନ'], u],
[
['ର', 'ସୋ', 'ମ', 'ବୁ', 'ଗୁ', 'ଶୁ', 'ଶ'], ['ରବି', 'ସୋମ', 'ମଙ୍ଗଳ', 'ବୁଧ', 'ଗୁରୁ', 'ଶୁକ୍ର', 'ଶନି'],
['ରବିବାର', 'ସୋମବା���', 'ମଙ୍ଗଳବାର', 'ବୁଧବାର', 'ଗୁରୁବାର', 'ଶୁକ୍ରବାର', 'ଶନିବାର'],
['ରବିବାର', 'ସୋମବାର', 'ମଙ୍ଗଳବାର', 'ବୁଧବାର', 'ଗୁରୁବାର', 'ଶୁକ୍ରବାର', 'ଶନିବାର'],
['ରବି', 'ସୋମ', 'ମଙ୍ଗଳ', 'ବୁଧ', 'ଗୁରୁ', 'ଶୁକ୍ର', 'ଶନି']
],
u,
Expand Down
2 changes: 1 addition & 1 deletion packages/common/locales/global/ar-IQ.js
View file
Open in desktop
Expand Up @@ -128,7 +128,7 @@
[
[
[
'فجرًا', 'صباحًا', 'ظه��ًا', 'بعد الظهر', 'مساءً',
'فجرًا', 'صباحًا', 'ظهرًا', 'بعد الظهر', 'مساءً',
'منتصف الليل', 'ليلاً'
],
[
Expand Down
8 changes: 3 additions & 5 deletions tools/gulp-tasks/cldr/closure.js
View file
Open in desktop
Expand Up @@ -8,6 +8,7 @@

const fs = require('fs');
const yargs = require('yargs').argv;
const shelljs = require('shelljs');
const {I18N_DATA_FOLDER, RELATIVE_I18N_DATA_FOLDER, HEADER} = require('./extract');
const OUTPUT_NAME = `closure-locale.ts`;

Expand Down Expand Up @@ -57,11 +58,8 @@ module.exports = (gulp, done) => {
`${RELATIVE_I18N_DATA_FOLDER}/${OUTPUT_NAME}`, generateAllLocalesFile(GOOG_LOCALES, ALIASES));

console.log(`Formatting ${I18N_DATA_FOLDER}/${OUTPUT_NAME}..."`);
const format = require('gulp-clang-format');
const clangFormat = require('clang-format');
return gulp.src([`${I18N_DATA_FOLDER}/${OUTPUT_NAME}`], {base: '.'})
.pipe(format.format('file', clangFormat))
.pipe(gulp.dest('.'));
shelljs.exec(`yarn clang-format -i ${I18N_DATA_FOLDER}/${OUTPUT_NAME}`, {silent: true});
done();
};

/**
Expand Down
19 changes: 6 additions & 13 deletions tools/gulp-tasks/cldr/extract.js
View file
Open in desktop
Expand Up @@ -13,6 +13,8 @@ const stringify = require('./util').stringify;
const cldr = require('cldr');
// used to extract all other cldr data
const cldrJs = require('cldrjs');
// used to call to clang-format
const shelljs = require('shelljs');

const COMMON_PACKAGE = 'packages/common';
const CORE_PACKAGE = 'packages/core';
Expand Down Expand Up @@ -94,19 +96,10 @@ module.exports = (gulp, done) => {
console.log(`${LOCALES.length} locale files generated.`);

console.log(`All i18n cldr files have been generated, formatting files..."`);
const format = require('gulp-clang-format');
const clangFormat = require('clang-format');
return gulp
.src(
[
`${I18N_DATA_FOLDER}/**/*.ts`,
`${I18N_FOLDER}/currencies.ts`,
`${I18N_CORE_FOLDER}/locale_en.ts`,
`${I18N_GLOBAL_FOLDER}/*.js`,
],
{base: '.'})
.pipe(format.format('file', clangFormat))
.pipe(gulp.dest('.'));
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});
done();
};

/**
Expand Down