From 864512ec9a7872bce03188c163e4b5b21e007df1 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 31 Oct 2011 18:55:36 +0100
Subject: [PATCH] Fixed some small issues

---
 com.woltlab.wcf/template/breadcrumbs.tpl        | 4 +++-
 com.woltlab.wcf/template/mainMenu.tpl           | 4 ++--
 wcfsetup/install/files/acp/templates/header.tpl | 2 +-
 wcfsetup/install/lang/de.xml                    | 2 +-
 wcfsetup/install/lang/en.xml                    | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/com.woltlab.wcf/template/breadcrumbs.tpl b/com.woltlab.wcf/template/breadcrumbs.tpl
index 11da7f477b..03c27bd5fe 100644
--- 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 a2cbdf62df..d89fee1817 100644
--- 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 07e22ba198..2c7237e7cc 100644
--- 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 935b019b4a..296c78cf28 100644
--- 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 5ac5d4a5a1..0af34e94ef 100644
--- 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
-- 
2.20.1