From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Fri, 13 May 2022 09:17:27 +0000 (+0200)
Subject: Remove long-deprecated JavaScript template events from `headInclude.tpl`
X-Git-Tag: 6.0.0_Alpha_1~1298^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a5c441a61209584360c5917871536500ef7a12bd;p=GitHub%2FWoltLab%2FWCF.git

Remove long-deprecated JavaScript template events from `headInclude.tpl`
---

diff --git a/com.woltlab.wcf/templates/headInclude.tpl b/com.woltlab.wcf/templates/headInclude.tpl
index da2b9a2b88..77c659a6df 100644
--- a/com.woltlab.wcf/templates/headInclude.tpl
+++ b/com.woltlab.wcf/templates/headInclude.tpl
@@ -10,19 +10,6 @@
 
 {include file='headIncludeJavaScript'}
 
-<script data-relocate="true">
-	WCF.Language.addObject({
-		{* dummy language item to preserve compatibility with WCF 2.0, move this to headIncludeJavaScript *}
-		'wcf.global.error.title': '{jslang}wcf.global.error.title{/jslang}'
-		
-		{* DEPRECATED -- PLEASE USE javascriptLanguageImport@headIncludeJavaScript *}
-		{event name='javascriptLanguageImport'}
-	});
-</script>
-
-{* DEPRECATED -- PLEASE USE javascriptInclude@headIncludeJavaScript *}
-{event name='javascriptInclude'}
-
 <!-- Icons -->
 <link rel="apple-touch-icon" sizes="180x180" href="{$__wcf->getStyleHandler()->getStyle()->getFaviconAppleTouchIcon()}">
 <link rel="manifest" href="{@$__wcf->getStyleHandler()->getStyle()->getFaviconManifest()}">
@@ -30,11 +17,4 @@
 <meta name="msapplication-config" content="{@$__wcf->getStyleHandler()->getStyle()->getFaviconBrowserconfig()}">
 <meta name="theme-color" content="{$__wcf->getStyleHandler()->getStyle()->getVariable('wcfPageThemeColor', true)}">
 
-<script data-relocate="true">
-	$(function() {
-		{* DEPRECATED -- PLEASE USE javascriptInit@headIncludeJavaScript *}
-		{event name='javascriptInit'}
-	});
-</script>
-
 {@HEAD_CODE}
diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
index 4ff9f992da..9f110a68aa 100644
--- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@ -96,6 +96,7 @@ window.addEventListener('pageshow', function(event) {
 			'wcf.global.decimalPoint': '{jslang}wcf.global.decimalPoint{/jslang}',
 			'wcf.global.error.ajax.network': '{jslang __literal=true}wcf.global.error.ajax.network{/jslang}',
 			'wcf.global.error.timeout': '{jslang}wcf.global.error.timeout{/jslang}',
+			'wcf.global.error.title': '{jslang}wcf.global.error.title{/jslang}'
 			'wcf.global.form.error.empty': '{jslang}wcf.global.form.error.empty{/jslang}',
 			'wcf.global.form.error.greaterThan': '{jslang __literal=true}wcf.global.form.error.greaterThan{/jslang}',
 			'wcf.global.form.error.lessThan': '{jslang __literal=true}wcf.global.form.error.lessThan{/jslang}',