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 016fabbb02f5d38cd5b3e94b3ca2744f929feca3..5fac5d04b8f6038bc632e5dfa804c3c3dccd0f99 100755 (executable)
--- 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 67949b13cfbd7151998fe0fa4ce2d2290b07c1e7..e674eccfdb4265230954fbdf8484c07ec2dbc924 100644 (file)
--- 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 2f464a350229c25d6c4bedd322cd27148e41157f..7e243e99c6cc778545e2cc690d6580027e335725 100644 (file)
--- 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>