Corrects lang vars/menu item during package installation

diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
index 27dfb1df8d2b41ee94f638329d372384d12fea26..852312fea8e61c3986f9cfc280852ac9082a374e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
@@ -42,33 +42,33 @@
 {/if}
 
 <fieldset>
-       <legend>{lang}wcf.acp.package.view.properties{/lang}</legend>
+       <legend>{lang}wcf.acp.package.information.properties{/lang}</legend>
 
        <dl>
-               <dt>{lang}wcf.acp.package.view.identifier{/lang}</dt>
+               <dt>{lang}wcf.acp.package.identifier{/lang}</dt>
                <dd>{$archive->getPackageInfo('name')}</dd>
        </dl>
        
        <dl>
-               <dt>{lang}wcf.acp.package.install.version{/lang}</dt>
+               <dt>{lang}wcf.acp.package.version{/lang}</dt>
                <dd>{$archive->getPackageInfo('version')}</dd>
        </dl>
 
        <dl>
-               <dt>{lang}wcf.acp.package.view.date{/lang}</dt>
+               <dt>{lang}wcf.acp.package.date{/lang}</dt>
                <dd>{@$archive->getPackageInfo('date')|date}</dd>
        </dl>
 
        {if $archive->getPackageInfo('packageURL') != ''}
                <dl>
-                       <dt>{lang}wcf.acp.package.view.url{/lang}</dt>
+                       <dt>{lang}wcf.acp.package.url{/lang}</dt>
                        <dd><a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$archive->getPackageInfo('packageURL')|rawurlencode}" class="wcf-externalURL">{$archive->getPackageInfo('packageURL')}</a></dd>
                </dl>
        {/if}
        
        <dl>
-               <dt>{lang}wcf.acp.package.view.author{/lang}</dt>
-               <dd>{if $archive->getPackageInfo('authorURL')}<a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$archive->getPackageInfo('authorURL')|rawurlencode}" class="wcf-externalURL">{$archive->getPackageInfo('author')}</a>{else}{$archive->getPackageInfo('author')}{/if}</dd>
+               <dt>{lang}wcf.acp.package.author{/lang}</dt>
+               <dd>{if $archive->getAuthorInfo('authorURL')}<a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$archive->getAuthorInfo('authorURL')|rawurlencode}" class="wcf-externalURL">{$archive->getAuthorInfo('author')}</a>{else}{$archive->getAuthorInfo('author')}{/if}</dd>
        </dl>
        
        {event name='propertyFields'}
@@ -106,14 +106,14 @@
 {if $requiredPackages|count > 0}
        <div class="wcf-border wcf-boxTitle">
                <hgroup>
-                       <h1>{lang}wcf.acp.package.view.requiredPackages{/lang} <span class="wcf-badge" title="{lang}wcf.acp.package.view.requiredPackages.description{/lang}">{#$requiredPackages|count}</span></h1>
+                       <h1>{lang}wcf.acp.package.dependencies.required{/lang} <span class="wcf-badge" title="{lang}wcf.acp.package.view.requiredPackages.description{/lang}">{#$requiredPackages|count}</span></h1>
                </hgroup>
                
                <table class="wcf-table">
                        <thead>
                                <tr>
-                                       <th class="columnTitle">{lang}wcf.acp.package.list.name{/lang}</th>
-                                       <th class="columnDigits">{lang}wcf.acp.package.list.version{/lang}</th>
+                                       <th class="columnTitle">{lang}wcf.acp.package.name{/lang}</th>
+                                       <th class="columnDigits">{lang}wcf.acp.package.version{/lang}</th>
                                </tr>
                        </thead>
                        

diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
index e92e785f7b78c9aa17c48d8a6c0f5b6e3de947b0..106bbc0250ea1b6c436cbff921ae0b7989c6e8a3 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
@@ -630,7 +630,7 @@ class PackageInstallationDispatcher {
                        $updatableInstances = $this->getArchive()->getUpdatableInstances();
                }
                
-               ACPMenu::getInstance()->setActiveMenuItem('wcf.acp.menu.link.package');
+               ACPMenu::getInstance()->setActiveMenuItem('wcf.acp.menu.link.package.install');
                WCF::getTPL()->assign(array(
                        'archive' => $this->getArchive(),
                        'requiredPackages' => $requirements,