Fixed language variables for package installation

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index 694798a93ee8427272fb729a976ef730db1c07d3..c29741b4baa27db4e6dc1dc8f8c653fd6b37c630 100644 (file)
--- 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 32050e89967e7d6fa4e40459546da558585fe607..2612d6f2e6c17fc7e63ce0b3a107c04334188c05 100644 (file)
--- 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();
        });
        //]]>