From 328111b8cea57379ac1e42f1114b7a3a80a6e98f Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Sun, 26 May 2013 16:51:46 +0200 Subject: [PATCH] Fixed language variables for package installation --- wcfsetup/install/files/acp/js/WCF.ACP.js | 11 +---------- .../files/acp/templates/packageInstallationSetup.tpl | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js index 694798a93e..c29741b4ba 100644 --- a/wcfsetup/install/files/acp/js/WCF.ACP.js +++ b/wcfsetup/install/files/acp/js/WCF.ACP.js @@ -383,21 +383,12 @@ WCF.ACP.Package.Installation = Class.extend({ */ init: function(queueID, actionName, allowRollback, isUpdate) { this._actionName = (actionName) ? actionName : 'InstallPackage'; - if (this._actionName === 'Setup') { - // 'Setup' is an alias for 'InstallPackage' used during WCFSetup - this._actionName = 'InstallPackage'; - } this._allowRollback = (allowRollback === true) ? true : false; this._queueID = queueID; switch (this._actionName) { case 'InstallPackage': - if (isUpdate) { - this._dialogTitle = 'wcf.acp.package.update.title'; - } - else { - this._dialogTitle = 'wcf.acp.package.installation.title'; - } + this._dialogTitle = 'wcf.acp.package.' + (isUpdate ? 'update' : 'install') + '.title'; break; case 'UninstallPackage': diff --git a/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl b/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl index 32050e8996..2612d6f2e6 100644 --- a/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl +++ b/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl @@ -5,7 +5,7 @@ $(function() { WCF.Language.add('wcf.acp.package.install.title', '{lang}wcf.acp.package.install.title{/lang}'); - var $installation = new WCF.ACP.Package.Installation({@$queueID}, 'Setup'); + var $installation = new WCF.ACP.Package.Installation({@$queueID}); $installation.prepareInstallation(); }); //]]> -- 2.20.1