fix: double-check missing translation before reporting (#728)

Closes #726
intershop · Jun 15, 2021 · f1eb525 · f1eb525
1 parent 0df6e8d
commit f1eb525
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/app/core/utils/translate/fallback-missing-translation-handler.ts b/src/app/core/utils/translate/fallback-missing-translation-handler.ts
@@ -51,13 +51,20 @@ export class FallbackMissingTranslationHandler implements MissingTranslationHand
 
   handle(params: MissingTranslationHandlerParams) {
     if (params.interpolateParams || /^\w+(\.[\w-]+)+$/.test(params.key)) {
-      this.reportMissingTranslation(params.translateService.currentLang, params.key);
+      const currentLang = params.translateService.currentLang;
+      /*
+       * when changing languages 'currentLang' from the translate service
+       * is out of sync -- double check before reporting
+       */
+      if (!params.translateService.translations?.[currentLang]?.[params.key]) {
+        this.reportMissingTranslation(currentLang, params.key);
+      }
 
       const doSingleCheck = isPlatformBrowser(this.platformId) && /\berror\b/.test(params.key);
-      const isFallbackAvailable = params.translateService.currentLang !== this.fallback;
+      const isFallbackAvailable = currentLang !== this.fallback;
       return concat(
         // try API call with specific key
-        iif(() => doSingleCheck, this.retrieveSpecificTranslation(params.translateService.currentLang, params.key)),
+        iif(() => doSingleCheck, this.retrieveSpecificTranslation(currentLang, params.key)),
         // try fallback translations
         iif(
           () => isFallbackAvailable,