From 660f25eda7239e43681dcc1f0b84db91de7824ac Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Mon, 28 Nov 2011 16:20:46 +0100 Subject: [PATCH] Error messages now look more like common dialogs --- com.woltlab.wcf/template/headInclude.tpl | 1 + wcfsetup/install/files/js/WCF.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) 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(); - $('

Der Server antwortete: ' + data.message + '

Stacktrace:

' + data.stacktrace + '

').wcfDialog(); + $('

' + data.message + '

Stacktrace:

' + data.stacktrace + '

').wcfDialog({ title: WCF.Language.get('wcf.global.error.title') }); } // failed to parse JSON catch (e) { var $randomID = WCF.getRandomID(); - $('

Der Server antwortete: ' + jqXHR.responseText + '.

').wcfDialog(); + $('

' + jqXHR.responseText + '.

').wcfDialog({ title: WCF.Language.get('wcf.global.error.title') }); } this._after(); -- 2.20.1