Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions packages/angular/cli/lib/config/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,9 @@
"xlif",
"xliff",
"xlf2",
"xliff2"
"xliff2",
"json",
"arb"
]
},
"i18nFormat": {
Expand All @@ -1417,7 +1419,9 @@
"xlif",
"xliff",
"xlf2",
"xliff2"
"xliff2",
"json",
"arb"
]
},
"i18nLocale": {
Expand Down
28 changes: 28 additions & 0 deletions packages/angular_devkit/build_angular/src/extract-i18n/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ function getI18nOutfile(format: string | undefined) {
case 'xlf2':
case 'xliff2':
return 'messages.xlf';
case 'json':
return 'messages.json';
case 'arb':
return 'messages.arb';
default:
throw new Error(`Unsupported format "${format}"`);
}
Expand Down Expand Up @@ -65,6 +69,24 @@ async function getSerializer(format: Format, sourceLocale: string, basePath: str

// tslint:disable-next-line: no-any
return new Xliff2TranslationSerializer(sourceLocale, basePath as any, useLegacyIds, {});
case Format.Json:
const { SimpleJsonTranslationSerializer } =
await import('@angular/localize/src/tools/src/extract/translation_files/json_translation_serializer');

// tslint:disable-next-line: no-any
return new SimpleJsonTranslationSerializer(sourceLocale);
case Format.Arb:
const { ArbTranslationSerializer } =
await import('@angular/localize/src/tools/src/extract/translation_files/arb_translation_serializer');

const fileSystem = {
relative(from: string, to: string): string {
return path.relative(from, to);
},
};

// tslint:disable-next-line: no-any
return new ArbTranslationSerializer(sourceLocale, basePath as any, fileSystem as any);
}
}

Expand All @@ -86,6 +108,12 @@ function normalizeFormatOption(options: ExtractI18nBuilderOptions) {
case Format.Xliff2:
format = Format.Xlf2;
break;
case Format.Json:
format = Format.Json;
break;
case Format.Arb:
format = Format.Arb;
break;
case undefined:
format = Format.Xlf;
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
"xlif",
"xliff",
"xlf2",
"xliff2"
"xliff2",
"json",
"arb"
]
},
"i18nFormat": {
Expand All @@ -33,7 +35,9 @@
"xlif",
"xliff",
"xlf2",
"xliff2"
"xliff2",
"json",
"arb"
]
},
"i18nLocale": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ async function importParsers() {
const diagnostics = new localizeDiag.Diagnostics();

const parsers = {
arb: new (await import(
// tslint:disable-next-line:trailing-comma
'@angular/localize/src/tools/src/translate/translation_files/translation_parsers/arb_translation_parser'
)).ArbTranslationParser(),
json: new (await import(
// tslint:disable-next-line:trailing-comma
'@angular/localize/src/tools/src/translate/translation_files/translation_parsers/simple_json_translation_parser'
Expand Down
10 changes: 10 additions & 0 deletions tests/legacy-cli/e2e/tests/i18n/ivy-localize-dl-arb.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { executeTest } from './ivy-localize-dl-xliff2';
import { setupI18nConfig } from './legacy';

export default async function() {
// Setup i18n tests and config.
await setupI18nConfig(true, 'arb');

// Execute the tests
await executeTest();
}
10 changes: 10 additions & 0 deletions tests/legacy-cli/e2e/tests/i18n/ivy-localize-dl-json.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { executeTest } from './ivy-localize-dl-xliff2';
import { setupI18nConfig } from './legacy';

export default async function() {
// Setup i18n tests and config.
await setupI18nConfig(true, 'json');

// Execute the tests
await executeTest();
}
17 changes: 16 additions & 1 deletion tests/legacy-cli/e2e/tests/i18n/legacy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,18 @@ export const formats = {
[/<source>.*?<\/source>/g, ''],
],
},
'json': {
ext: 'json',
sourceCheck: '"locale": "en-US"',
replacements: [
],
},
'arb': {
ext: 'arb',
sourceCheck: '"@@locale": "en-US"',
replacements: [
],
}
};

export async function setupI18nConfig(useLocalize = true, format: keyof typeof formats = 'xlf') {
Expand Down Expand Up @@ -226,7 +238,10 @@ export async function setupI18nConfig(useLocalize = true, format: keyof typeof f
const translationFile = `src/locale/messages.${formats[format].ext}`;
await expectFileToExist(translationFile);
await expectFileToMatch(translationFile, formats[format].sourceCheck);
await expectFileToMatch(translationFile, `An introduction header for this sample`);

if (format !== 'json') {
await expectFileToMatch(translationFile, `An introduction header for this sample`);
}

// Make translations for each language.
for (const { lang, translationReplacements } of langTranslations) {
Expand Down