From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 28 Nov 2011 15:20:46 +0000 (+0100)
Subject: Error messages now look more like common dialogs
X-Git-Tag: 2.0.0_Beta_1~1545^2~5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=660f25eda7239e43681dcc1f0b84db91de7824ac;p=GitHub%2FWoltLab%2FWCF.git

Error messages now look more like common dialogs
---

diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl
index 7a6f184dd4..f2cdfd88c5 100644
--- a/com.woltlab.wcf/template/headInclude.tpl
+++ b/com.woltlab.wcf/template/headInclude.tpl
@@ -48,6 +48,7 @@
 	$(function() {
 		WCF.Language.addObject({
 			'wcf.global.button.next': '{lang}wcf.global.button.next{/lang}',
+			'wcf.global.error.title': '{lang}wcf.global.error.title{/lang}',
 			'wcf.global.loading': '{lang}wcf.global.loading{/lang}',
 			'wcf.date.relative.minutes': '{capture assign=relativeMinutes}{lang}wcf.date.relative.minutes{/lang}{/capture}{@$relativeMinutes|encodeJS}',
 			'wcf.date.relative.hours': '{capture assign=relativeHours}{lang}wcf.date.relative.hours{/lang}{/capture}{@$relativeHours|encodeJS}',
diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index b675a32640..f2ee853af7 100644
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -1064,12 +1064,12 @@ WCF.Action.Proxy.prototype = {
 			}
 			
 			var $randomID = WCF.getRandomID();
-			$('<div class="ajaxDebugMessage" id="' + $randomID + '" title="HTTP/1.0 ' + jqXHR.status + ' ' + errorThrown + '"><p>Der Server antwortete: ' + data.message + '</p><p>Stacktrace:</p><p>' + data.stacktrace + '</p></div>').wcfDialog();
+			$('<div class="ajaxDebugMessage" id="' + $randomID + '"><p>' + data.message + '</p><p>Stacktrace:</p><p>' + data.stacktrace + '</p></div>').wcfDialog({ title: WCF.Language.get('wcf.global.error.title') });
 		}
 		// failed to parse JSON
 		catch (e) {
 			var $randomID = WCF.getRandomID();
-			$('<div class="ajaxDebugMessage" id="' + $randomID + '" title="HTTP/1.0 ' + jqXHR.status + ' ' + errorThrown + '"><p style="padding: 3px;">Der Server antwortete: ' + jqXHR.responseText + '.</p></div>').wcfDialog();
+			$('<div class="ajaxDebugMessage" id="' + $randomID + '"><p style="padding: 3px;">' + jqXHR.responseText + '.</p></div>').wcfDialog({ title: WCF.Language.get('wcf.global.error.title') });
 		}
 		
 		this._after();