From a38ac0efcfbf814574ee4d47e76e53597dc847af Mon Sep 17 00:00:00 2001
From: Lynn <kjarli@gmail.com>
Date: Sun, 25 Oct 2020 19:45:27 +0100
Subject: [PATCH] Update button was showing Install, and made texts
 translatable

---
 .../business-objects/my-addon-list-item.ts    | 15 ++++++++-------
 .../addon-update-button.component.ts          |  6 +++++-
 .../my-addon-status-column.component.html     |  4 ++--
 .../my-addon-status-column.component.ts       |  6 +++++-
 .../pages/my-addons/my-addons.component.ts    | 19 ++++++++-----------
 wowup-electron/src/assets/i18n/de.json        |  1 +
 wowup-electron/src/assets/i18n/en.json        |  1 +
 wowup-electron/src/assets/i18n/es.json        |  1 +
 wowup-electron/src/assets/i18n/fr.json        |  1 +
 wowup-electron/src/assets/i18n/it.json        |  1 +
 wowup-electron/src/assets/i18n/ko.json        |  1 +
 wowup-electron/src/assets/i18n/nb.json        |  1 +
 wowup-electron/src/assets/i18n/pt.json        |  1 +
 wowup-electron/src/assets/i18n/ru.json        |  1 +
 wowup-electron/src/assets/i18n/zh.json        |  1 +
 15 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/wowup-electron/src/app/business-objects/my-addon-list-item.ts b/wowup-electron/src/app/business-objects/my-addon-list-item.ts
index 71b036a3..17ad3b5a 100644
--- a/wowup-electron/src/app/business-objects/my-addon-list-item.ts
+++ b/wowup-electron/src/app/business-objects/my-addon-list-item.ts
@@ -9,7 +9,7 @@ export class AddonViewModel {
   public installState: AddonInstallState = AddonInstallState.Unknown;
   public isInstalling: boolean = false;
   public installProgress: number = 0;
-  public statusText: string = "";
+  public stateTextTranslationKey: string = "";
   public selected: boolean = false;
 
   get hasThumbnail() {
@@ -78,26 +78,27 @@ export class AddonViewModel {
 
   constructor(addon?: Addon) {
     this.addon = addon;
-    this.statusText = this.getStateText();
+    this.stateTextTranslationKey = this.getStateTextTranslationKey();
   }
 
   public onClicked() {
     this.selected = !this.selected;
   }
 
-  public getStateText() {
+  public getStateTextTranslationKey() {
     switch (this.displayState) {
       case AddonDisplayState.UpToDate:
-        return "Up to Date";
+        return "COMMON.ADDON_STATE.UPTODATE";
       case AddonDisplayState.Ignored:
-        return "Ignored";
+        return "COMMON.ADDON_STATE.IGNORED";
       case AddonDisplayState.Update:
+        return "COMMON.ADDON_STATE.UPDATE";
       case AddonDisplayState.Install:
-        return "Install";
+        return "COMMON.ADDON_STATE.INSTALL";
       case AddonDisplayState.Unknown:
       default:
         console.log("Unhandled display state", this.displayState);
-        return "";
+        return "COMMON.ADDON_STATE.UNKNOWN";
     }
   }
 }
diff --git a/wowup-electron/src/app/components/addon-update-button/addon-update-button.component.ts b/wowup-electron/src/app/components/addon-update-button/addon-update-button.component.ts
index 284b1e86..5e6a503e 100644
--- a/wowup-electron/src/app/components/addon-update-button/addon-update-button.component.ts
+++ b/wowup-electron/src/app/components/addon-update-button/addon-update-button.component.ts
@@ -117,7 +117,11 @@ export class AddonUpdateButtonComponent implements OnInit, OnDestroy {
       );
     }
 
-    return this.listItem?.statusText;
+    if (!this.listItem) {
+      return null;
+    }
+
+    return this._translateService.instant(this.listItem.stateTextTranslationKey);
   }
 
   private getInstallStateText(installState: AddonInstallState) {
diff --git a/wowup-electron/src/app/components/my-addon-status-column/my-addon-status-column.component.html b/wowup-electron/src/app/components/my-addon-status-column/my-addon-status-column.component.html
index 269746f5..5a6d8553 100644
--- a/wowup-electron/src/app/components/my-addon-status-column/my-addon-status-column.component.html
+++ b/wowup-electron/src/app/components/my-addon-status-column/my-addon-status-column.component.html
@@ -1,10 +1,10 @@
 <div class="row">
   <app-addon-update-button *ngIf="showStatusText === false" [listItem]="listItem"></app-addon-update-button>
   <div *ngIf="showStatusText === true" class="status-text" [ngClass]="{ ignored: listItem.isIgnored }">
-    {{ getStatusText() }}
+    {{ getStatusText() | translate }}
   </div>
   <mat-icon *ngIf="this.listItem.isAutoUpdate === true" class="auto-update-icon"
     [matTooltip]="'PAGES.MY_ADDONS.TABLE.AUTO_UPDATE_ICON_TOOLTIP' | translate">
     update
   </mat-icon>
-</div>
\ No newline at end of file
+</div>
diff --git a/wowup-electron/src/app/components/my-addon-status-column/my-addon-status-column.component.ts b/wowup-electron/src/app/components/my-addon-status-column/my-addon-status-column.component.ts
index 6ba3f774..2702c94d 100644
--- a/wowup-electron/src/app/components/my-addon-status-column/my-addon-status-column.component.ts
+++ b/wowup-electron/src/app/components/my-addon-status-column/my-addon-status-column.component.ts
@@ -39,7 +39,11 @@ export class MyAddonStatusColumnComponent implements OnInit, OnDestroy {
       return this._translateService.instant("COMMON.ADDON_STATE.UPTODATE");
     }
 
-    return this.listItem?.statusText;
+    if (!this.listItem) {
+      return null;
+    }
+
+    return this._translateService.instant(this.listItem.stateTextTranslationKey);
   }
 
   public onUpdateButtonUpdated() {
diff --git a/wowup-electron/src/app/pages/my-addons/my-addons.component.ts b/wowup-electron/src/app/pages/my-addons/my-addons.component.ts
index 82675560..c2736221 100644
--- a/wowup-electron/src/app/pages/my-addons/my-addons.component.ts
+++ b/wowup-electron/src/app/pages/my-addons/my-addons.component.ts
@@ -149,7 +149,7 @@ export class MyAddonsComponent implements OnInit, OnDestroy {
         listItem.isInstalling =
           evt.installState === AddonInstallState.Installing ||
           evt.installState === AddonInstallState.Downloading;
-        listItem.statusText = this.getInstallStateText(evt.installState);
+        listItem.stateTextTranslationKey = this.getInstallStateTextTranslationKey(evt.installState);
         listItem.installProgress = evt.progress;
         listItem.installState = evt.installState;
         if (listItemIdx !== -1) {
@@ -519,7 +519,6 @@ export class MyAddonsComponent implements OnInit, OnDestroy {
       if (evt.checked) {
         listItem.addon.autoUpdateEnabled = false;
       }
-      listItem.statusText = listItem.getStateText();
       this.addonService.saveAddon(listItem.addon);
     });
 
@@ -714,22 +713,20 @@ export class MyAddonsComponent implements OnInit, OnDestroy {
     );
   }
 
-  private getInstallStateText(installState: AddonInstallState) {
+  private getInstallStateTextTranslationKey(installState: AddonInstallState) {
     switch (installState) {
       case AddonInstallState.BackingUp:
-        return this._translateService.instant("COMMON.ADDON_STATUS.BACKINGUP");
+        return "COMMON.ADDON_STATUS.BACKINGUP";
       case AddonInstallState.Complete:
-        return this._translateService.instant("COMMON.ADDON_STATE.UPTODATE");
+        return "COMMON.ADDON_STATE.UPTODATE";
       case AddonInstallState.Downloading:
-        return this._translateService.instant(
-          "COMMON.ADDON_STATUS.DOWNLOADING"
-        );
+        return "COMMON.ADDON_STATUS.DOWNLOADING";
       case AddonInstallState.Installing:
-        return this._translateService.instant("COMMON.ADDON_STATUS.INSTALLING");
+        return "COMMON.ADDON_STATUS.INSTALLING";
       case AddonInstallState.Pending:
-        return this._translateService.instant("COMMON.ADDON_STATUS.PENDING");
+        return "COMMON.ADDON_STATUS.PENDING";
       default:
-        return "";
+        return "COMMON.ADDON_STATUS.UNKNOWN";
     }
   }
 }
diff --git a/wowup-electron/src/assets/i18n/de.json b/wowup-electron/src/assets/i18n/de.json
index ca0c5574..65f129ff 100644
--- a/wowup-electron/src/assets/i18n/de.json
+++ b/wowup-electron/src/assets/i18n/de.json
@@ -8,6 +8,7 @@
       "IGNORED": "Ignorieren",
       "INSTALL": "Installieren",
       "UNINSTALL": "Deinstallieren",
+      "UNKNOWN": "",
       "UPDATE": "Aktualisieren",
       "UPTODATE": "Aktuell"
     },
diff --git a/wowup-electron/src/assets/i18n/en.json b/wowup-electron/src/assets/i18n/en.json
index 0b85afed..3ca8302b 100644
--- a/wowup-electron/src/assets/i18n/en.json
+++ b/wowup-electron/src/assets/i18n/en.json
@@ -8,6 +8,7 @@
       "IGNORED": "Ignored",
       "INSTALL": "Install",
       "UNINSTALL": "Uninstall",
+      "UNKNOWN": "",
       "UPDATE": "Update",
       "UPTODATE": "Up to date"
     },
diff --git a/wowup-electron/src/assets/i18n/es.json b/wowup-electron/src/assets/i18n/es.json
index c259a869..2fe5201c 100644
--- a/wowup-electron/src/assets/i18n/es.json
+++ b/wowup-electron/src/assets/i18n/es.json
@@ -8,6 +8,7 @@
       "IGNORED": "IGNORED",
       "INSTALL": "INSTALL",
       "UNINSTALL": "UNINSTALL",
+      "UNKNOWN": "",
       "UPDATE": "UPDATE",
       "UPTODATE": "UPTODATE"
     },
diff --git a/wowup-electron/src/assets/i18n/fr.json b/wowup-electron/src/assets/i18n/fr.json
index 0fc66264..3741598f 100644
--- a/wowup-electron/src/assets/i18n/fr.json
+++ b/wowup-electron/src/assets/i18n/fr.json
@@ -8,6 +8,7 @@
       "IGNORED": "IGNORED",
       "INSTALL": "INSTALL",
       "UNINSTALL": "UNINSTALL",
+      "UNKNOWN": "",
       "UPDATE": "UPDATE",
       "UPTODATE": "UPTODATE"
     },
diff --git a/wowup-electron/src/assets/i18n/it.json b/wowup-electron/src/assets/i18n/it.json
index 507c54e5..1135c73e 100644
--- a/wowup-electron/src/assets/i18n/it.json
+++ b/wowup-electron/src/assets/i18n/it.json
@@ -8,6 +8,7 @@
       "IGNORED": "IGNORED",
       "INSTALL": "INSTALL",
       "UNINSTALL": "UNINSTALL",
+      "UNKNOWN": "",
       "UPDATE": "UPDATE",
       "UPTODATE": "UPTODATE"
     },
diff --git a/wowup-electron/src/assets/i18n/ko.json b/wowup-electron/src/assets/i18n/ko.json
index d073bf1c..2397d322 100644
--- a/wowup-electron/src/assets/i18n/ko.json
+++ b/wowup-electron/src/assets/i18n/ko.json
@@ -8,6 +8,7 @@
       "IGNORED": "Ignored",
       "INSTALL": "Install",
       "UNINSTALL": "Uninstall",
+      "UNKNOWN": "",
       "UPDATE": "Update",
       "UPTODATE": "Up to date"
     },
diff --git a/wowup-electron/src/assets/i18n/nb.json b/wowup-electron/src/assets/i18n/nb.json
index d77f4af4..482b8a6f 100644
--- a/wowup-electron/src/assets/i18n/nb.json
+++ b/wowup-electron/src/assets/i18n/nb.json
@@ -8,6 +8,7 @@
       "IGNORED": "Ignorert",
       "INSTALL": "Installer",
       "UNINSTALL": "Avinstaller",
+      "UNKNOWN": "",
       "UPDATE": "Oppdater",
       "UPTODATE": "Oppdatert"
     },
diff --git a/wowup-electron/src/assets/i18n/pt.json b/wowup-electron/src/assets/i18n/pt.json
index d8f83bbd..f879449d 100644
--- a/wowup-electron/src/assets/i18n/pt.json
+++ b/wowup-electron/src/assets/i18n/pt.json
@@ -8,6 +8,7 @@
       "IGNORED": "Ignored",
       "INSTALL": "Install",
       "UNINSTALL": "Uninstall",
+      "UNKNOWN": "",
       "UPDATE": "Update",
       "UPTODATE": "Up to date"
     },
diff --git a/wowup-electron/src/assets/i18n/ru.json b/wowup-electron/src/assets/i18n/ru.json
index 06fa51fc..39fe3565 100644
--- a/wowup-electron/src/assets/i18n/ru.json
+++ b/wowup-electron/src/assets/i18n/ru.json
@@ -8,6 +8,7 @@
       "IGNORED": "Игнорируется",
       "INSTALL": "Установить",
       "UNINSTALL": "Удалить",
+      "UNKNOWN": "",
       "UPDATE": "Обновить",
       "UPTODATE": "Актуальная"
     },
diff --git a/wowup-electron/src/assets/i18n/zh.json b/wowup-electron/src/assets/i18n/zh.json
index 1d4c3b18..6753f250 100644
--- a/wowup-electron/src/assets/i18n/zh.json
+++ b/wowup-electron/src/assets/i18n/zh.json
@@ -8,6 +8,7 @@
       "IGNORED": "IGNORED",
       "INSTALL": "INSTALL",
       "UNINSTALL": "UNINSTALL",
+      "UNKNOWN": "",
       "UPDATE": "UPDATE",
       "UPTODATE": "UPTODATE"
     },