fix issue #152

toonvanstrijp · Jul 20, 2020 · 60fe9af · 60fe9af
1 parent 3c3861b
commit 60fe9af
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 29 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nestjs-i18n",
-  "version": "8.0.6",
+  "version": "8.0.8",
   "description": "",
   "author": "Toon van Strijp",
   "license": "MIT",

diff --git a/src/lib/interceptors/i18n-language.interceptor.ts b/src/lib/interceptors/i18n-language.interceptor.ts
@@ -51,34 +51,12 @@ export class I18nLanguageInterceptor implements NestInterceptor {
         }
       }
 
-      ctx.i18nLang = language;
+      ctx.i18nLang = language || this.i18nOptions.fallbackLanguage;
     }
 
     return next.handle();
   }
 
-  async use(req: any, res: any, next: () => void) {
-    let language = null;
-
-    req.i18nService = this.i18nService;
-    for (const r of this.i18nResolvers) {
-      const resolver = await this.getResolver(r);
-
-      language = resolver.resolve(req);
-
-      if (language instanceof Promise) {
-        language = await (language as Promise<string>);
-      }
-
-      if (language !== undefined) {
-        break;
-      }
-    }
-    req.i18nLang = language || this.i18nOptions.fallbackLanguage;
-
-    next();
-  }
-
   private async getResolver(r: I18nOptionResolver): Promise<I18nResolver> {
     if (shouldResolve(r)) {
       if (r.hasOwnProperty('use') && r.hasOwnProperty('options')) {

diff --git a/src/lib/services/i18n.service.ts b/src/lib/services/i18n.service.ts
@@ -34,7 +34,7 @@ export class I18nService {
     private readonly languagesSubject: BehaviorSubject<string[]>,
     @Inject(I18N_TRANSLATIONS_SUBJECT)
     private readonly translationsSubject: BehaviorSubject<I18nTranslation>,
-  ) { }
+  ) {}
 
   public async translate(
     key: string,
@@ -117,10 +117,9 @@ export class I18nService {
   private async handleFallbacks(lang: string) {
     const supportedLanguages = await this.getSupportedLanguages();
     if (this.i18nOptions.fallbacks && !supportedLanguages.includes(lang)) {
-      const sanitizedLang =
-        lang.includes('-')
-          ? lang.substring(0, lang.indexOf('-')).concat('-*')
-          : lang;
+      const sanitizedLang = lang.includes('-')
+        ? lang.substring(0, lang.indexOf('-')).concat('-*')
+        : lang;
 
       for (const key in this.i18nOptions.fallbacks) {
         if (key === lang || key === sanitizedLang) {