From cf7ed11fd930841b6dbdbd18f4d237fbba93df72 Mon Sep 17 00:00:00 2001 From: jliddev Date: Fri, 26 Mar 2021 15:30:30 -0500 Subject: [PATCH] Fix #784 --- .../wow-client-options/wow-client-options.component.html | 2 +- .../wow-client-options/wow-client-options.component.ts | 8 +++++++- wowup-electron/src/assets/i18n/en.json | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/wowup-electron/src/app/components/wow-client-options/wow-client-options.component.html b/wowup-electron/src/app/components/wow-client-options/wow-client-options.component.html index 4bf03898..ebed4dc4 100644 --- a/wowup-electron/src/app/components/wow-client-options/wow-client-options.component.html +++ b/wowup-electron/src/app/components/wow-client-options/wow-client-options.component.html @@ -21,7 +21,7 @@ | translate : { clientTypeName: (clientTypeName | translate)?.toLowerCase(), - clientFolderName: clientFolderName + clientFolderName: executableName } }} diff --git a/wowup-electron/src/app/components/wow-client-options/wow-client-options.component.ts b/wowup-electron/src/app/components/wow-client-options/wow-client-options.component.ts index 2d48fe80..2d4b472a 100644 --- a/wowup-electron/src/app/components/wow-client-options/wow-client-options.component.ts +++ b/wowup-electron/src/app/components/wow-client-options/wow-client-options.component.ts @@ -14,6 +14,7 @@ import { WowInstallation } from "../../models/wowup/wow-installation"; import { WarcraftInstallationService } from "../../services/warcraft/warcraft-installation.service"; import { getEnumList, getEnumName } from "../../utils/enum.utils"; import { ConfirmDialogComponent } from "../confirm-dialog/confirm-dialog.component"; +import { WarcraftService } from "../../services/warcraft/warcraft.service"; @Component({ selector: "app-wow-client-options", @@ -61,6 +62,10 @@ export class WowClientOptionsComponent implements OnInit, OnDestroy { } } + public get executableName(): string { + return this._warcraftService.getExecutableName(this.installation.clientType); + } + public get wowLogoImage(): string { switch (this.installation.clientType) { case WowClientType.Beta: @@ -79,7 +84,8 @@ export class WowClientOptionsComponent implements OnInit, OnDestroy { public constructor( private _dialog: MatDialog, private _translateService: TranslateService, - private _warcraftInstallationService: WarcraftInstallationService + private _warcraftInstallationService: WarcraftInstallationService, + private _warcraftService: WarcraftService ) { this.addonChannelInfos = this.getAddonChannelInfos(); } diff --git a/wowup-electron/src/assets/i18n/en.json b/wowup-electron/src/assets/i18n/en.json index d4fe7784..8e35e261 100644 --- a/wowup-electron/src/assets/i18n/en.json +++ b/wowup-electron/src/assets/i18n/en.json @@ -442,7 +442,7 @@ "MESSAGE": "Are you sure you want to remove the installation at \"{location}\"? This will remove all stored addon information for this client.\n\nYour addon folders will not be removed.", "TITLE": "Remove World of Warcraft Installation?" }, - "CLIENT_TYPE_INPUT_HINT": "The folder that contains the {clientTypeName} client folder \"{clientFolderName}\"", + "CLIENT_TYPE_INPUT_HINT": "Select the {clientTypeName} application \"{clientFolderName}\"", "CLIENT_TYPE_PATH_LABEL": "{clientTypeName} path", "DEFAULT_ADDON_CHANNEL_LABEL": "Default Addon Channel", "DEFAULT_ADDON_CHANNEL_SELECT_LABEL": "Addon Channel",