From e730016d4cdbb606bf379bae927c1a20cadc78eb Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 5 Dec 2012 21:36:20 +0100
Subject: [PATCH] Bunch of fixes + added language variables for page menu

---
 .../files/acp/templates/pageMenuItemList.tpl  |  4 ++--
 wcfsetup/install/files/js/WCF.js              |  6 +++++
 .../data/language/LanguageEditor.class.php    |  6 ++---
 .../system/template/TemplateEngine.class.php  |  2 +-
 wcfsetup/install/lang/de.xml                  | 24 +++++++++++++++++++
 5 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl b/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl
index 2b472eef60..ad698b0fd6 100644
--- a/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl
@@ -42,7 +42,7 @@
 								<span class="statusDisplay sortableButtonContainer">
 									<img src="{@$__wcf->getPath()}icon/{if $menuItem->isDisabled}disabled{else}enabled{/if}.svg" alt="" title="{lang}wcf.global.button.{if $menuItem->isDisabled}enable{else}disable{/if}{/lang}" class="icon16 jsToggleButton jsTooltip pointer" data-object-id="{@$menuItem->menuItemID}" data-disable-message="{lang}wcf.global.button.disable{/lang}" data-enable-message="{lang}wcf.global.button.enable{/lang}" />
 									<a href="{link controller='PageMenuItemEdit' id=$menuItem->menuItemID}{/link}" class="jsTooltip" title="{lang}wcf.global.button.edit{/lang}"><img src="{@$__wcf->getPath()}icon/edit.svg" alt="" class="icon16" /></a>
-									<img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 jsDeleteButton jsTooltip pointer" data-object-id="{@$menuItem->menuItemID}" data-confirm-message="{lang}wcf.acp.pageMenu.delete.sure{/lang}" />
+									<img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 jsDeleteButton jsTooltip pointer" data-object-id="{@$menuItem->menuItemID}" data-confirm-message="{lang __menuItem=$menuItem}wcf.acp.pageMenu.delete.sure{/lang}" />
 								</span>
 							</span>
 							{if $menuItem|count}
@@ -54,7 +54,7 @@
 												<span class="statusDisplay sortableButtonContainer">
 													<img src="{@$__wcf->getPath()}icon/{if $childMenuItem->isDisabled}disabled{else}enabled{/if}.svg" alt="" title="{lang}wcf.global.button.{if $childMenuItem->isDisabled}enable{else}disable{/if}{/lang}" class="icon16 jsToggleButton jsTooltip pointer" data-object-id="{@$childMenuItem->menuItemID}" data-disable-message="{lang}wcf.global.button.disable{/lang}" data-enable-message="{lang}wcf.global.button.enable{/lang}" />
 													<a href="{link controller='PageMenuItemEdit' id=$childMenuItem->menuItemID}{/link}" class="jsTooltip" title="{lang}wcf.global.button.edit{/lang}"><img src="{@$__wcf->getPath()}icon/edit.svg" alt="" class="icon16" /></a>
-													<img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 jsDeleteButton jsTooltip pointer" data-object-id="{@$childMenuItem->menuItemID}" data-confirm-message="{lang}wcf.acp.pageMenu.delete.sure{/lang}" />
+													<img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 jsDeleteButton jsTooltip pointer" data-object-id="{@$childMenuItem->menuItemID}" data-confirm-message="{lang __menuItem=$childMenuItem}wcf.acp.pageMenu.delete.sure{/lang}" />
 												</span>
 											</span>
 										</li>
diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index 994b348687..dae84af16d 100755
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -5028,8 +5028,11 @@ WCF.System.Confirmation = {
 		
 		this._callback = callback;
 		this._parameters = parameters;
+		
+		var $render = true;
 		if (this._dialog === null) {
 			this._createDialog();
+			$render = false;
 		}
 		
 		this._dialog.find('#wcfSystemConfirmationContent').empty().hide();
@@ -5043,6 +5046,9 @@ WCF.System.Confirmation = {
 			onShow: $.proxy(this._show, this),
 			title: WCF.Language.get('wcf.global.confirmation.title')
 		});
+		if ($render) {
+			this._dialog.wcfDialog('render');
+		}
 		
 		this._visible = true;
 	},
diff --git a/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php b/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php
index 24e755ea5e..b82b6765f3 100644
--- a/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php
+++ b/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php
@@ -319,14 +319,12 @@ class LanguageEditor extends DatabaseObjectEditor implements IEditableCachedObje
 	 *
 	 * @param 	string		$languageID
 	 * @param 	string		$category
-	 * @param 	string		$packageID
 	 */
-	public static function deleteLanguageFiles($languageID = '.*', $category = '.*', $packageID = '.*') {
+	public static function deleteLanguageFiles($languageID = '.*', $category = '.*') {
 		if ($category != '.*') $category = preg_quote($category, '~');
 		if ($languageID != '.*') $languageID = intval($languageID);
-		if ($packageID != '.*') $packageID = intval($packageID);
 
-		DirectoryUtil::getInstance(WCF_DIR.'language/')->removePattern(new Regex($packageID.'_'.$languageID.'_'.$category.'\.php$'));
+		DirectoryUtil::getInstance(WCF_DIR.'language/')->removePattern(new Regex($languageID.'_'.$category.'\.php$'));
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
index 07e6c1d5a7..1b644cbfad 100755
--- a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
+++ b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
@@ -630,7 +630,7 @@ class TemplateEngine extends SingletonFactory {
 		if (empty($compileDir)) $compileDir = WCF_DIR.'templates/compiled/';
 		
 		// delete compiled templates
-		DirectoryUtil::getInstance($compileDir)->removePattern(new Regex('.*_.*_.*\.php$'));
+		DirectoryUtil::getInstance($compileDir)->removePattern(new Regex('.*_.*\.php$'));
 	}
 	
 	/**
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 622e0c93d9..a69660497f 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -194,6 +194,9 @@
 		<item name="wcf.acp.menu.link.package.server.list"><![CDATA[Server auflisten]]></item>
 		<item name="wcf.acp.menu.link.package.list"><![CDATA[Pakete auflisten]]></item>
 		<item name="wcf.acp.menu.link.package.autoupdate"><![CDATA[Automatisches Update]]></item>
+		<item name="wcf.acp.menu.link.pageMenu"><![CDATA[Seitenmenü]]></item>
+		<item name="wcf.acp.menu.link.pageMenu.add"><![CDATA[Menüpunkt hinzufügen]]></item>
+		<item name="wcf.acp.menu.link.pageMenu.list"><![CDATA[Menüpunkte auflisten]]></item>
 		<item name="wcf.acp.menu.link.system"><![CDATA[System]]></item>
 		<item name="wcf.acp.menu.link.user"><![CDATA[Benutzer]]></item>
 		<item name="wcf.acp.menu.link.user.add"><![CDATA[Benutzer hinzufügen]]></item>
@@ -394,6 +397,27 @@
 		<item name="wcf.acp.package.version"><![CDATA[Version]]></item>
 	</category>
 	
+	<category name="wcf.acp.pageMenu">
+		<item name="wcf.acp.pageMenu.add"><![CDATA[Menüpunkt hinzufügen]]></item>
+		<item name="wcf.acp.pageMenu.advanced"><![CDATA[Erweitert]]></item>
+		<item name="wcf.acp.pageMenu.data"><![CDATA[Allgemein]]></item>
+		<item name="wcf.acp.pageMenu.delete.sure"><![CDATA[Möchten Sie den Menüpunkt „{$__menuItem}“ und alle Untermenüpunkte wirklich löschen?]]></item>
+		<item name="wcf.acp.pageMenu.footer"><![CDATA[Fußzeile]]></item>
+		<item name="wcf.acp.pageMenu.header"><![CDATA[Hauptmenü]]></item>
+		<item name="wcf.acp.pageMenu.isDisabled"><![CDATA[Menüpunkt deaktivieren]]></item>
+		<item name="wcf.acp.pageMenu.isLandingPage"><![CDATA[Startseite Ihrer Website]]></item>
+		<item name="wcf.acp.pageMenu.isLandingPage.description"><![CDATA[Beim direkten Aufruf Ihrer Website wird diese Menüpunkt aufgerufen.]]></item>
+		<item name="wcf.acp.pageMenu.list"><![CDATA[Menüpunkte auflisten]]></item>
+		<item name="wcf.acp.pageMenu.menuItemLink"><![CDATA[Link]]></item>
+		<item name="wcf.acp.pageMenu.menuPosition"><![CDATA[Position]]></item>
+		<item name="wcf.acp.pageMenu.menuPosition.footer"><![CDATA[Fußzeile]]></item>
+		<item name="wcf.acp.pageMenu.menuPosition.header"><![CDATA[Hauptmenü]]></item>
+		<item name="wcf.acp.pageMenu.newWindow"><![CDATA[Link in neuem Fenster öffnen]]></item>
+		<item name="wcf.acp.pageMenu.pageMenuItem"><![CDATA[Name]]></item>
+		<item name="wcf.acp.pageMenu.parentMenuItem"><![CDATA[Übergeordneter Menüpunkt]]></item>
+		<item name="wcf.acp.pageMenu.showOrder"><![CDATA[Reihenfolge]]></item>
+	</category>
+	
 	<category name="wcf.acp.search">
 		<item name="wcf.acp.search.provider.com.woltlab.wcf.menuItem"><![CDATA[Seiten]]></item>
 		<item name="wcf.acp.search.provider.com.woltlab.wcf.option"><![CDATA[Optionen]]></item>
-- 
2.20.1