From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 24 Feb 2012 15:13:56 +0000 (+0100)
Subject: Improved update dialog
X-Git-Tag: 2.0.0_Beta_1~1309^2~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7f4589b6d26883f8cc4a8068d3996aa5a34a30ee;p=GitHub%2FWoltLab%2FWCF.git

Improved update dialog

Closes #445
---

diff --git a/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
index 016fabbb02..5fac5d04b8 100755
--- a/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
@@ -254,7 +254,10 @@ class PackageStartInstallForm extends ACPForm {
 	 */
 	public function show() {
 		if ($this->action == 'install') WCF::getSession()->checkPermissions(array('admin.system.package.canInstallPackage'));
-		else WCF::getSession()->checkPermissions(array('admin.system.package.canUpdatePackage'));
+		else {
+			WCF::getSession()->checkPermissions(array('admin.system.package.canUpdatePackage'));
+			$this->activeMenuItem = 'wcf.acp.menu.link.package';
+		}
 		
 		// check master password
 		WCFACP::checkMasterPassword();
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 67949b13cf..e674eccfdb 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -307,7 +307,7 @@
 		<item name="wcf.acp.package.source.download"><![CDATA[Paket herunterladen]]></item>
 		<item name="wcf.acp.package.source.upload"><![CDATA[Paket hochladen]]></item>
 		<item name="wcf.acp.package.startInstall"><![CDATA[Paket installieren]]></item>
-		<item name="wcf.acp.package.startUpdate"><![CDATA[Paket aktualisieren]]></item>
+		<item name="wcf.acp.package.startUpdate"><![CDATA[Paket &bdquo;{$package->packageName}&ldquo; aktualisieren]]></item>
 		<item name="wcf.acp.package.type.application"><![CDATA[Anwendung]]></item>
 		<item name="wcf.acp.package.type.other"><![CDATA[Basispaket]]></item>
 		<item name="wcf.acp.package.type.plugin"><![CDATA[Erweiterung]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 2f464a3502..7e243e99c6 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -307,7 +307,7 @@
 		<item name="wcf.acp.package.source.download"><![CDATA[Download package]]></item>
 		<item name="wcf.acp.package.source.upload"><![CDATA[Upload package]]></item>
 		<item name="wcf.acp.package.startInstall"><![CDATA[Install package]]></item>
-		<item name="wcf.acp.package.startUpdate"><![CDATA[Update package]]></item>
+		<item name="wcf.acp.package.startUpdate"><![CDATA[Update package &ldquo;{$package->packageName}&rdquo;]]></item>
 		<item name="wcf.acp.package.type.application"><![CDATA[Application]]></item>
 		<item name="wcf.acp.package.type.other"><![CDATA[Base package]]></item>
 		<item name="wcf.acp.package.type.plugin"><![CDATA[Extension]]></item>