Fixed some small issues

diff --git a/com.woltlab.wcf/template/breadcrumbs.tpl b/com.woltlab.wcf/template/breadcrumbs.tpl
index 11da7f477bf9b662cb65f98e882dae408f2cca8f..03c27bd5fe0862452f8c12eaf4d699d53f6af86b 100644 (file)
--- a/com.woltlab.wcf/template/breadcrumbs.tpl
+++ b/com.woltlab.wcf/template/breadcrumbs.tpl
@@ -1,3 +1,4 @@
+{if $__wcf->getBreadcrumbs()->get()|count}
 <nav class="breadcrumbs">
        <ul>
                {foreach from=$__wcf->getBreadcrumbs()->get() item=$breadcrumb}
@@ -6,4 +7,5 @@
                        </li>
                {/foreach}
        </ul>
-</nav>
\ No newline at end of file
+</nav>
+{/if}
\ No newline at end of file

diff --git a/com.woltlab.wcf/template/mainMenu.tpl b/com.woltlab.wcf/template/mainMenu.tpl
index a2cbdf62df740b82eb7a55c796bf8f14f730a761..d89fee18176a1df337f266bf24ca6ad495255361 100644 (file)
--- a/com.woltlab.wcf/template/mainMenu.tpl
+++ b/com.woltlab.wcf/template/mainMenu.tpl
@@ -2,12 +2,12 @@
        <nav id="mainMenu" class="mainMenu">
                <ul>
                        {foreach from=$__wcf->getPageMenu()->getMenuItems('header') item=menuItem}
-                               <li{if $__wcf->getPageMenu()->getActiveMenuItem() == $menuItem->menuItem} class="activeMenuItem"{/if}><a href="{$menuItem->menuItemLink}">{$menuItem->menuItem} <span class="badge">{#$menuItem->getProcessor()->getNotifications()}</span></a> 
+                               <li{if $__wcf->getPageMenu()->getActiveMenuItem() == $menuItem->menuItem} class="activeMenuItem"{/if}><a href="{$menuItem->menuItemLink}">{lang}{$menuItem->menuItem}{/lang} <span class="badge">{#$menuItem->getProcessor()->getNotifications()}</span></a> 
                                
                                {if $__wcf->getPageMenu()->getMenuItems($menuItem->menuItem)|count > 0}
                                        <ul>
                                                {foreach from=$__wcf->getPageMenu()->getMenuItems($menuItem->menuItem) item=subMenuItem}
-                                                       <li><a href="{$subMenuItem->menuItemLink}">{$subMenuItem->menuItem}</a> <span class="badge">{#$subMenuItem->getProcessor()->getNotifications()}</span></li>
+                                                       <li><a href="{$subMenuItem->menuItemLink}">{lang}{$subMenuItem->menuItem}{/lang}</a> <span class="badge">{#$subMenuItem->getProcessor()->getNotifications()}</span></li>
                                                {/foreach}
                                        </ul>
                                {/if}

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 07e22ba198cd9644e044f336be0b8d5edb66a4aa..2c7237e7cc39187da22a79647fa64289154e0044 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -86,7 +86,7 @@
                                        <div>
                                                <ul>
                                                        <li id="userMenu" class="userMenu"><!-- ToDo: We need an ID and/or class for each list here, this ID may also change! -->
-                                                               <span class="dropdownCaption">{lang}wcf.acp.user.userNote{/lang}</span>
+                                                               <span class="dropdownCaption">{lang}wcf.user.userNote{/lang}</span>
                                                                <ul class="dropdown">
                                                                        <li><a href="{link controller='Logout'}t={@SECURITY_TOKEN}{/link}" onclick="return confirm('{lang}wcf.user.logout.sure{/lang}')">{lang}wcf.user.logout{/lang}</a></li>
                                                                </ul>

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 935b019b4ad3af68febf0f069d469c719708ca86..296c78cf28460545578acc177317ab5d23699709 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -346,7 +346,6 @@
                <item name="wcf.acp.user.sendMail.markedUsers"><![CDATA[E-Mail an folgende Benutzer senden]]></item>
                <item name="wcf.acp.user.sendMail.subject"><![CDATA[Betreff]]></item>
                <item name="wcf.acp.user.sendMail.text"><![CDATA[Nachricht]]></item>
-               <item name="wcf.acp.user.userNote"><![CDATA[Hallo {$__wcf->user->username}!]]></item>
        </category>
        
        <category name="wcf.date">
@@ -553,5 +552,6 @@
                <item name="wcf.user.visibleLanguages"><![CDATA[Zeige Inhalte in folgenden Sprachen an]]></item>
                <item name="wcf.user.visibleLanguages.description"><![CDATA[Wählen Sie, in welchen Sprachen erstellte Inhalte angezeigt werden sollen.]]></item>
                <item name="wcf.user.userID"><![CDATA[Benutzer-ID]]></item>
+               <item name="wcf.user.userNote"><![CDATA[Hallo {$__wcf->user->username}!]]></item>
        </category>
 </language>
\ No newline at end of file

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 5ac5d4a5a1b0b62010c97e49f85d17e1a419cf58..0af34e94ef25ccad465cfe3b3dbba0b88aeac1d1 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -346,7 +346,6 @@
                <item name="wcf.acp.user.sendMail.markedUsers"><![CDATA[Send an e-mail to the following users]]></item>
                <item name="wcf.acp.user.sendMail.subject"><![CDATA[Subject]]></item>
                <item name="wcf.acp.user.sendMail.text"><![CDATA[Message]]></item>
-               <item name="wcf.acp.user.userNote"><![CDATA[Welcome {$__wcf->user->username}.]]></item>
        </category>
        
        <category name="wcf.date">
@@ -513,5 +512,6 @@
                <item name="wcf.user.visibleLanguages"><![CDATA[Show content in the following languages]]></item>
                <item name="wcf.user.visibleLanguages.description"><![CDATA[Select the content languages that should be used.]]></item>
                <item name="wcf.user.userID"><![CDATA[User ID]]></item>
+               <item name="wcf.user.userNote"><![CDATA[Welcome {$__wcf->user->username}.]]></item>
        </category>
 </language>
\ No newline at end of file