fix(@angular-devkit/build-angular): load translations fresh start

bbarry · alan-agius4 · commit acf7532bd7f3 · 2022-01-19T17:45:34.000+01:00
Currently when making a change while serving a localized application, duplicate translation warnings appear for every translation id. This fixes that by replacing the whole translation object with a new one each time translations are loaded. fixes #22398
diff --git a/packages/angular_devkit/build_angular/src/utils/i18n-options.ts b/packages/angular_devkit/build_angular/src/utils/i18n-options.ts
@@ -310,6 +310,7 @@ export function loadTranslations(
   usedFormats?: Set<string>,
   duplicateTranslation?: I18NTranslation,
 ) {
+  let translations: Record<string, unknown> | undefined = undefined;
   for (const file of desc.files) {
     const loadResult = loader(path.join(workspaceRoot, file.path));
 
@@ -331,10 +332,10 @@ export function loadTranslations(
     file.format = loadResult.format;
     file.integrity = loadResult.integrity;
 
-    if (desc.translation) {
+    if (translations) {
       // Merge translations
       for (const [id, message] of Object.entries(loadResult.translations)) {
-        if (desc.translation[id] !== undefined) {
+        if (translations[id] !== undefined) {
           const duplicateTranslationMessage = `[${file.path}]: Duplicate translations for message '${id}' when merging.`;
           switch (duplicateTranslation) {
             case I18NTranslation.Ignore:
@@ -348,11 +349,12 @@ export function loadTranslations(
               break;
           }
         }
-        desc.translation[id] = message;
+        translations[id] = message;
       }
     } else {
       // First or only translation file
-      desc.translation = loadResult.translations;
+      translations = loadResult.translations;
     }
   }
+  desc.translation = translations;
 }

Original file line number	Diff line number	Diff line change
`@@ -310,6 +310,7 @@ export function loadTranslations(`
`310`	`310`	`usedFormats?: Set<string>,`
`311`	`311`	`duplicateTranslation?: I18NTranslation,`
`312`	`312`	`) {`
	`313`	`+ let translations: Record<string, unknown> \| undefined = undefined;`
`313`	`314`	`for (const file of desc.files) {`
`314`	`315`	`const loadResult = loader(path.join(workspaceRoot, file.path));`
`315`	`316`
`@@ -331,10 +332,10 @@ export function loadTranslations(`
`331`	`332`	`file.format = loadResult.format;`
`332`	`333`	`file.integrity = loadResult.integrity;`
`333`	`334`
`334`		`- if (desc.translation) {`
	`335`	`+ if (translations) {`
`335`	`336`	`// Merge translations`
`336`	`337`	`for (const [id, message] of Object.entries(loadResult.translations)) {`
`337`		`- if (desc.translation[id] !== undefined) {`
	`338`	`+ if (translations[id] !== undefined) {`
`338`	`339`	const duplicateTranslationMessage = `[${file.path}]: Duplicate translations for message '${id}' when merging.`;
`339`	`340`	`switch (duplicateTranslation) {`
`340`	`341`	`case I18NTranslation.Ignore:`
`@@ -348,11 +349,12 @@ export function loadTranslations(`
`348`	`349`	`break;`
`349`	`350`	`}`
`350`	`351`	`}`
`351`		`- desc.translation[id] = message;`
	`352`	`+ translations[id] = message;`
`352`	`353`	`}`
`353`	`354`	`} else {`
`354`	`355`	`// First or only translation file`
`355`		`- desc.translation = loadResult.translations;`
	`356`	`+ translations = loadResult.translations;`
`356`	`357`	`}`
`357`	`358`	`}`
	`359`	`+ desc.translation = translations;`
`358`	`360`	`}`