feat(@angular-devkit/build-angular): support extracting and merging w…

…ith arb format
angular · Jan 8, 2021 · ab72f8d · ab72f8d
1 parent dc97667
commit ab72f8d
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 4 deletions.
diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
@@ -1404,7 +1404,8 @@
                 "xliff",
                 "xlf2",
                 "xliff2",
-                "json"
+                "json",
+                "arb"
               ]
             },
             "i18nFormat": {
@@ -1419,7 +1420,8 @@
                 "xliff",
                 "xlf2",
                 "xliff2",
-                "json"
+                "json",
+                "arb"
               ]
             },
             "i18nLocale": {

diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
@@ -39,6 +39,8 @@ function getI18nOutfile(format: string | undefined) {
       return 'messages.xlf';
     case 'json':
       return 'messages.json';
+    case 'arb':
+      return 'messages.arb';
     default:
       throw new Error(`Unsupported format "${format}"`);
   }
@@ -73,6 +75,18 @@ async function getSerializer(format: Format, sourceLocale: string, basePath: str
 
       // 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);
   }
 }
 
@@ -97,6 +111,9 @@ function normalizeFormatOption(options: ExtractI18nBuilderOptions) {
     case Format.Json:
       format = Format.Json;
       break;
+    case Format.Arb:
+      format = Format.Arb;
+      break;
     case undefined:
       format = Format.Xlf;
       break;

diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/schema.json b/packages/angular_devkit/build_angular/src/extract-i18n/schema.json
@@ -20,7 +20,8 @@
         "xliff",
         "xlf2",
         "xliff2",
-        "json"
+        "json",
+        "arb"
       ]
     },
     "i18nFormat": {
@@ -35,7 +36,8 @@
         "xliff",
         "xlf2",
         "xliff2",
-        "json"
+        "json",
+        "arb"
       ]
     },
     "i18nLocale": {

diff --git a/packages/angular_devkit/build_angular/src/utils/load-translations.ts b/packages/angular_devkit/build_angular/src/utils/load-translations.ts
@@ -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'

diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-dl-arb.ts b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-dl-arb.ts
@@ -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();
+}
diff --git a/tests/legacy-cli/e2e/tests/i18n/legacy.ts b/tests/legacy-cli/e2e/tests/i18n/legacy.ts
@@ -94,6 +94,12 @@ export const formats = {
     sourceCheck: '"locale": "en-US"',
     replacements: [
     ],
+  },
+  'arb': {
+    ext: 'arb',
+    sourceCheck: '"@@locale": "en-US"',
+    replacements: [
+    ],
   }
 };