fix: prevent mixed locale due to race condition using ngx-translate s…

…ervice use method (#207, #222) Closes #207 Co-authored-by: Alpe Numan Genc <anumangenc@gmail.com>
intershop · Apr 30, 2020 · 7750993 · 7750993
1 parent 337d9d3
commit 7750993
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/app/core/store/configuration/configuration.effects.spec.ts b/src/app/core/store/configuration/configuration.effects.spec.ts
@@ -133,10 +133,12 @@ describe('Configuration Effects', () => {
 
   describe('setLocale$', () => {
     it('should call TranslateService when locale was initialized', done => {
-      verify(translateServiceMock.use(anything())).once();
-      const params = capture(translateServiceMock.use).last();
-      expect(params[0]).toEqual('en_US');
-      setTimeout(done, 1000);
+      setTimeout(() => {
+        verify(translateServiceMock.use(anything())).once();
+        const params = capture(translateServiceMock.use).last();
+        expect(params[0]).toEqual('en_US');
+        done();
+      }, 1000);
     });
   });
 

diff --git a/src/app/core/store/configuration/configuration.effects.ts b/src/app/core/store/configuration/configuration.effects.ts
@@ -7,6 +7,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { defer, fromEvent, iif, merge } from 'rxjs';
 import {
   concatMap,
+  debounceTime,
   distinctUntilChanged,
   map,
   mapTo,
@@ -100,8 +101,10 @@ export class ConfigurationEffects {
   setLocale$ = this.store.pipe(
     select(getCurrentLocale),
     mapToProperty('lang'),
-    whenTruthy(),
     distinctUntilChanged(),
+    // https://github.com/ngx-translate/core/issues/1030
+    debounceTime(0),
+    whenTruthy(),
     tap(lang => this.translateService.use(lang))
   );