From 7bec248a6fc1de439d0b2f4816793d01fb3d739a Mon Sep 17 00:00:00 2001
From: Abdellatif Ait boudad <a.aitboudad@gmail.com>
Date: Sun, 25 Oct 2020 12:58:36 +0100
Subject: [PATCH] fix(module:upload): ensure i18n$ is defined on unsubscribe

---
 components/upload/upload.component.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/components/upload/upload.component.ts b/components/upload/upload.component.ts
index f14c9cb95a6..4bb88dc6de3 100644
--- a/components/upload/upload.component.ts
+++ b/components/upload/upload.component.ts
@@ -18,8 +18,8 @@ import {
   ViewEncapsulation
 } from '@angular/core';
 import { BooleanInput, NumberInput, NzSafeAny } from 'ng-zorro-antd/core/types';
-import { Observable, of, Subscription } from 'rxjs';
-import { filter } from 'rxjs/operators';
+import { Observable, of, Subscription, Subject } from 'rxjs';
+import { filter, takeUntil } from 'rxjs/operators';
 
 import { InputBoolean, InputNumber, toBoolean } from 'ng-zorro-antd/core/util';
 import { NzI18nService, NzUploadI18nInterface } from 'ng-zorro-antd/i18n';
@@ -60,7 +60,7 @@ export class NzUploadComponent implements OnInit, OnChanges, OnDestroy {
   static ngAcceptInputType_nzShowButton: BooleanInput;
   static ngAcceptInputType_nzWithCredentials: BooleanInput;
 
-  private i18n$!: Subscription;
+  private destroy$ = new Subject<void>();
   @ViewChild('uploadComp', { static: false }) uploadComp!: NzUploadBtnComponent;
   @ViewChild('listComp', { static: false }) listComp!: NzUploadListComponent;
 
@@ -321,7 +321,7 @@ export class NzUploadComponent implements OnInit, OnChanges, OnDestroy {
   // #endregion
 
   ngOnInit(): void {
-    this.i18n$ = this.i18n.localeChange.subscribe(() => {
+    this.i18n.localeChange.pipe(takeUntil(this.destroy$)).subscribe(() => {
       this.locale = this.i18n.getLocaleData('Upload');
       this.detectChangesList();
     });
@@ -332,6 +332,7 @@ export class NzUploadComponent implements OnInit, OnChanges, OnDestroy {
   }
 
   ngOnDestroy(): void {
-    this.i18n$.unsubscribe();
+    this.destroy$.next();
+    this.destroy$.complete();
   }
 }