From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 23 Aug 2020 23:01:43 +0000 (+0200)
Subject: Template plugin for the assignment of language variables in javascript code
X-Git-Tag: 5.3.0_Alpha_1~24^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e2e8c155da8b54690190c4d96a87f4c30e64fe78;p=GitHub%2FWoltLab%2FWCF.git

Template plugin for the assignment of language variables in javascript code

Closes #3530
---

diff --git a/com.woltlab.wcf/templates/__commentJavaScript.tpl b/com.woltlab.wcf/templates/__commentJavaScript.tpl
index 3e6d952a8a..aa34a48960 100644
--- a/com.woltlab.wcf/templates/__commentJavaScript.tpl
+++ b/com.woltlab.wcf/templates/__commentJavaScript.tpl
@@ -1,17 +1,17 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.comment.add': '{lang}wcf.comment.add{/lang}',
-			'wcf.comment.button.response.add': '{lang}wcf.comment.button.response.add{/lang}',
-			'wcf.comment.delete.confirmMessage': '{lang}wcf.comment.delete.confirmMessage{/lang}',
-			'wcf.comment.description': '{lang}wcf.comment.description{/lang}',
-			'wcf.comment.guestDialog.title': '{lang}wcf.comment.guestDialog.title{/lang}',
-			'wcf.comment.more': '{lang}wcf.comment.more{/lang}',
-			'wcf.comment.response.add': '{lang}wcf.comment.response.add{/lang}',
-			'wcf.comment.response.more': '{lang}wcf.comment.response.more{/lang}',
-			'wcf.message.error.editorAlreadyInUse': '{lang}wcf.message.error.editorAlreadyInUse{/lang}',
-			'wcf.moderation.report.reportContent': '{lang}wcf.moderation.report.reportContent{/lang}',
-			'wcf.moderation.report.success': '{lang}wcf.moderation.report.success{/lang}'
+			'wcf.comment.add': '{jslang}wcf.comment.add{/jslang}',
+			'wcf.comment.button.response.add': '{jslang}wcf.comment.button.response.add{/jslang}',
+			'wcf.comment.delete.confirmMessage': '{jslang}wcf.comment.delete.confirmMessage{/jslang}',
+			'wcf.comment.description': '{jslang}wcf.comment.description{/jslang}',
+			'wcf.comment.guestDialog.title': '{jslang}wcf.comment.guestDialog.title{/jslang}',
+			'wcf.comment.more': '{jslang}wcf.comment.more{/jslang}',
+			'wcf.comment.response.add': '{jslang}wcf.comment.response.add{/jslang}',
+			'wcf.comment.response.more': '{jslang}wcf.comment.response.more{/jslang}',
+			'wcf.message.error.editorAlreadyInUse': '{jslang}wcf.message.error.editorAlreadyInUse{/jslang}',
+			'wcf.moderation.report.reportContent': '{jslang}wcf.moderation.report.reportContent{/jslang}',
+			'wcf.moderation.report.success': '{jslang}wcf.moderation.report.success{/jslang}'
 		});
 		
 		new {if $commentHandlerClass|isset}{@$commentHandlerClass}{else}WCF.Comment.Handler{/if}('{@$commentContainerID}');
diff --git a/com.woltlab.wcf/templates/__labelFormField.tpl b/com.woltlab.wcf/templates/__labelFormField.tpl
index 6ce59f485a..a3ca75b729 100644
--- a/com.woltlab.wcf/templates/__labelFormField.tpl
+++ b/com.woltlab.wcf/templates/__labelFormField.tpl
@@ -26,8 +26,8 @@
 <script data-relocate="true">
 	require(['Dom/Util', 'Language', 'WoltLabSuite/Core/Form/Builder/Field/Controller/Label'], function(DomUtil, Language, FormBuilderFieldLabel) {
 		Language.addObject({
-			'wcf.label.none': '{lang}wcf.label.none{/lang}',
-			'wcf.label.withoutSelection': '{lang}wcf.label.withoutSelection{/lang}'
+			'wcf.label.none': '{jslang}wcf.label.none{/jslang}',
+			'wcf.label.withoutSelection': '{jslang}wcf.label.withoutSelection{/jslang}'
 		});
 		
 		new FormBuilderFieldLabel(
diff --git a/com.woltlab.wcf/templates/__messageFormPoll.tpl b/com.woltlab.wcf/templates/__messageFormPoll.tpl
index e1d8fddc0c..c03f5b9f89 100644
--- a/com.woltlab.wcf/templates/__messageFormPoll.tpl
+++ b/com.woltlab.wcf/templates/__messageFormPoll.tpl
@@ -2,8 +2,8 @@
 	<script data-relocate="true">
 		$(function() {
 			WCF.Language.addObject({
-				'wcf.poll.button.addOption': '{lang}wcf.poll.button.addOption{/lang}',
-				'wcf.poll.button.removeOption': '{lang}wcf.poll.button.removeOption{/lang}'
+				'wcf.poll.button.addOption': '{jslang}wcf.poll.button.addOption{/jslang}',
+				'wcf.poll.button.removeOption': '{jslang}wcf.poll.button.removeOption{/jslang}'
 			});
 			
 			new WCF.Poll.Management('pollOptionContainer', [ {implode from=$pollOptions item=pollOption}{ optionID: {@$pollOption[optionID]}, optionValue: '{$pollOption[optionValue]|encodeJS}' }{/implode} ], {@POLL_MAX_OPTIONS});
diff --git a/com.woltlab.wcf/templates/__messageFormPollInline.tpl b/com.woltlab.wcf/templates/__messageFormPollInline.tpl
index 48f4719005..20c654c789 100644
--- a/com.woltlab.wcf/templates/__messageFormPollInline.tpl
+++ b/com.woltlab.wcf/templates/__messageFormPollInline.tpl
@@ -2,10 +2,10 @@
 	<script data-relocate="true">
 		$(function() {
 			WCF.Language.addObject({
-				'wcf.poll.button.addOption': '{lang}wcf.poll.button.addOption{/lang}',
-				'wcf.poll.button.removeOption': '{lang}wcf.poll.button.removeOption{/lang}',
-				'wcf.poll.endTime.error.invalid': '{lang}wcf.poll.endTime.error.invalid{/lang}',
-				'wcf.poll.maxVotes.error.invalid': '{lang}wcf.poll.maxVotes.error.invalid{/lang}'
+				'wcf.poll.button.addOption': '{jslang}wcf.poll.button.addOption{/jslang}',
+				'wcf.poll.button.removeOption': '{jslang}wcf.poll.button.removeOption{/jslang}',
+				'wcf.poll.endTime.error.invalid': '{jslang}wcf.poll.endTime.error.invalid{/jslang}',
+				'wcf.poll.maxVotes.error.invalid': '{jslang}wcf.poll.maxVotes.error.invalid{/jslang}'
 			});
 			
 			new WCF.Poll.Management(
@@ -70,4 +70,4 @@
 		
 		{event name='fields'}
 	</div>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/com.woltlab.wcf/templates/__messageQuoteManager.tpl b/com.woltlab.wcf/templates/__messageQuoteManager.tpl
index 45abd51bfe..e8c9c7b0da 100644
--- a/com.woltlab.wcf/templates/__messageQuoteManager.tpl
+++ b/com.woltlab.wcf/templates/__messageQuoteManager.tpl
@@ -1,12 +1,12 @@
 WCF.Language.addObject({
-	'wcf.message.quote.insertAllQuotes': '{lang}wcf.message.quote.insertAllQuotes{/lang}',
-	'wcf.message.quote.insertSelectedQuotes': '{lang}wcf.message.quote.insertSelectedQuotes{/lang}',
-	'wcf.message.quote.manageQuotes': '{lang}wcf.message.quote.manageQuotes{/lang}',
-	'wcf.message.quote.quoteSelected': '{lang}wcf.message.quote.quoteSelected{/lang}',
-	'wcf.message.quote.quoteAndReply': '{lang}wcf.message.quote.quoteAndReply{/lang}',
-	'wcf.message.quote.removeAllQuotes': '{lang}wcf.message.quote.removeAllQuotes{/lang}',
-	'wcf.message.quote.removeSelectedQuotes': '{lang}wcf.message.quote.removeSelectedQuotes{/lang}',
-	'wcf.message.quote.showQuotes': '{lang __literal=true}wcf.message.quote.showQuotes{/lang}'
+	'wcf.message.quote.insertAllQuotes': '{jslang}wcf.message.quote.insertAllQuotes{/jslang}',
+	'wcf.message.quote.insertSelectedQuotes': '{jslang}wcf.message.quote.insertSelectedQuotes{/jslang}',
+	'wcf.message.quote.manageQuotes': '{jslang}wcf.message.quote.manageQuotes{/jslang}',
+	'wcf.message.quote.quoteSelected': '{jslang}wcf.message.quote.quoteSelected{/jslang}',
+	'wcf.message.quote.quoteAndReply': '{jslang}wcf.message.quote.quoteAndReply{/jslang}',
+	'wcf.message.quote.removeAllQuotes': '{jslang}wcf.message.quote.removeAllQuotes{/jslang}',
+	'wcf.message.quote.removeSelectedQuotes': '{jslang}wcf.message.quote.removeSelectedQuotes{/jslang}',
+	'wcf.message.quote.showQuotes': '{jslang __literal=true}wcf.message.quote.showQuotes{/jslang}'
 });
 
 {if !$wysiwygSelector|isset}{assign var=wysiwygSelector value=''}{/if}
diff --git a/com.woltlab.wcf/templates/__multipleSelectionFormField.tpl b/com.woltlab.wcf/templates/__multipleSelectionFormField.tpl
index 81e6cdcc7d..c13cdd7bef 100644
--- a/com.woltlab.wcf/templates/__multipleSelectionFormField.tpl
+++ b/com.woltlab.wcf/templates/__multipleSelectionFormField.tpl
@@ -2,13 +2,13 @@
 	<script data-relocate="true">
 		require(['Language', 'WoltLabSuite/Core/Ui/ItemList/Filter'], function(Language, UiItemListFilter) {
 			Language.addObject({
-				'wcf.global.filter.button.visibility': '{lang}wcf.global.filter.button.visibility{/lang}',
-				'wcf.global.filter.button.clear': '{lang}wcf.global.filter.button.clear{/lang}',
-				'wcf.global.filter.error.noMatches': '{lang}wcf.global.filter.error.noMatches{/lang}',
-				'wcf.global.filter.placeholder': '{lang}wcf.global.filter.placeholder{/lang}',
-				'wcf.global.filter.visibility.activeOnly': '{lang}wcf.global.filter.visibility.activeOnly{/lang}',
-				'wcf.global.filter.visibility.highlightActive': '{lang}wcf.global.filter.visibility.highlightActive{/lang}',
-				'wcf.global.filter.visibility.showAll': '{lang}wcf.global.filter.visibility.showAll{/lang}'
+				'wcf.global.filter.button.visibility': '{jslang}wcf.global.filter.button.visibility{/jslang}',
+				'wcf.global.filter.button.clear': '{jslang}wcf.global.filter.button.clear{/jslang}',
+				'wcf.global.filter.error.noMatches': '{jslang}wcf.global.filter.error.noMatches{/jslang}',
+				'wcf.global.filter.placeholder': '{jslang}wcf.global.filter.placeholder{/jslang}',
+				'wcf.global.filter.visibility.activeOnly': '{jslang}wcf.global.filter.visibility.activeOnly{/jslang}',
+				'wcf.global.filter.visibility.highlightActive': '{jslang}wcf.global.filter.visibility.highlightActive{/jslang}',
+				'wcf.global.filter.visibility.showAll': '{jslang}wcf.global.filter.visibility.showAll{/jslang}'
 			});
 			
 			new UiItemListFilter('{@$field->getPrefixedId()}_list');
diff --git a/com.woltlab.wcf/templates/__pollOptionsFormField.tpl b/com.woltlab.wcf/templates/__pollOptionsFormField.tpl
index 290b083de0..e4df57bf6d 100644
--- a/com.woltlab.wcf/templates/__pollOptionsFormField.tpl
+++ b/com.woltlab.wcf/templates/__pollOptionsFormField.tpl
@@ -3,9 +3,9 @@
 <script data-relocate="true">
 	require(['Dom/Traverse', 'Dom/Util', 'Language', 'WoltLabSuite/Core/Ui/Poll/Editor'], function(DomTraverse, DomUtil, Language, UiPollEditor) {
 		Language.addObject({
-			'wcf.poll.button.addOption': '{lang}wcf.poll.button.addOption{/lang}',
-			'wcf.poll.button.removeOption': '{lang}wcf.poll.button.removeOption{/lang}',
-			'wcf.poll.maxVotes.error.invalid': '{lang}wcf.poll.maxVotes.error.invalid{/lang}'
+			'wcf.poll.button.addOption': '{jslang}wcf.poll.button.addOption{/jslang}',
+			'wcf.poll.button.removeOption': '{jslang}wcf.poll.button.removeOption{/jslang}',
+			'wcf.poll.maxVotes.error.invalid': '{jslang}wcf.poll.maxVotes.error.invalid{/jslang}'
 		});
 		
 		new UiPollEditor(
diff --git a/com.woltlab.wcf/templates/__singleSelectionFormField.tpl b/com.woltlab.wcf/templates/__singleSelectionFormField.tpl
index c3209915a6..6c4f0aad70 100644
--- a/com.woltlab.wcf/templates/__singleSelectionFormField.tpl
+++ b/com.woltlab.wcf/templates/__singleSelectionFormField.tpl
@@ -2,13 +2,13 @@
 	<script data-relocate="true">
 		require(['Language', 'WoltLabSuite/Core/Ui/ItemList/Filter'], function(Language, UiItemListFilter) {
 			Language.addObject({
-				'wcf.global.filter.button.visibility': '{lang}wcf.global.filter.button.visibility{/lang}',
-				'wcf.global.filter.button.clear': '{lang}wcf.global.filter.button.clear{/lang}',
-				'wcf.global.filter.error.noMatches': '{lang}wcf.global.filter.error.noMatches{/lang}',
-				'wcf.global.filter.placeholder': '{lang}wcf.global.filter.placeholder{/lang}',
-				'wcf.global.filter.visibility.activeOnly': '{lang}wcf.global.filter.visibility.activeOnly{/lang}',
-				'wcf.global.filter.visibility.highlightActive': '{lang}wcf.global.filter.visibility.highlightActive{/lang}',
-				'wcf.global.filter.visibility.showAll': '{lang}wcf.global.filter.visibility.showAll{/lang}'
+				'wcf.global.filter.button.visibility': '{jslang}wcf.global.filter.button.visibility{/jslang}',
+				'wcf.global.filter.button.clear': '{jslang}wcf.global.filter.button.clear{/jslang}',
+				'wcf.global.filter.error.noMatches': '{jslang}wcf.global.filter.error.noMatches{/jslang}',
+				'wcf.global.filter.placeholder': '{jslang}wcf.global.filter.placeholder{/jslang}',
+				'wcf.global.filter.visibility.activeOnly': '{jslang}wcf.global.filter.visibility.activeOnly{/jslang}',
+				'wcf.global.filter.visibility.highlightActive': '{jslang}wcf.global.filter.visibility.highlightActive{/jslang}',
+				'wcf.global.filter.visibility.showAll': '{jslang}wcf.global.filter.visibility.showAll{/jslang}'
 			});
 			
 			new UiItemListFilter('{@$field->getPrefixedId()}_list');
diff --git a/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl b/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl
index c3c821a901..a23046b3b6 100644
--- a/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl
+++ b/com.woltlab.wcf/templates/__wysiwygAttachmentFormField.tpl
@@ -41,17 +41,17 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.attachment.upload.error.invalidExtension': '{lang}wcf.attachment.upload.error.invalidExtension{/lang}',
-			'wcf.attachment.upload.error.tooLarge': '{lang}wcf.attachment.upload.error.tooLarge{/lang}',
-			'wcf.attachment.upload.error.reachedLimit': '{lang}wcf.attachment.upload.error.reachedLimit{/lang}',
-			'wcf.attachment.upload.error.reachedRemainingLimit': '{lang}wcf.attachment.upload.error.reachedRemainingLimit{/lang}',
-			'wcf.attachment.upload.error.uploadFailed': '{lang}wcf.attachment.upload.error.uploadFailed{/lang}',
-			'wcf.attachment.upload.error.uploadPhpLimit': '{lang}wcf.attachment.upload.error.uploadPhpLimit{/lang}',
-			'wcf.attachment.insert': '{lang}wcf.attachment.insert{/lang}',
-			'wcf.attachment.insertAll': '{lang}wcf.attachment.insertAll{/lang}',
-			'wcf.attachment.insertFull': '{lang}wcf.attachment.insertFull{/lang}',
-			'wcf.attachment.insertThumbnail': '{lang}wcf.attachment.insertThumbnail{/lang}',
-			'wcf.attachment.delete.sure': '{lang}wcf.attachment.delete.sure{/lang}'
+			'wcf.attachment.upload.error.invalidExtension': '{jslang}wcf.attachment.upload.error.invalidExtension{/jslang}',
+			'wcf.attachment.upload.error.tooLarge': '{jslang}wcf.attachment.upload.error.tooLarge{/jslang}',
+			'wcf.attachment.upload.error.reachedLimit': '{jslang}wcf.attachment.upload.error.reachedLimit{/jslang}',
+			'wcf.attachment.upload.error.reachedRemainingLimit': '{jslang}wcf.attachment.upload.error.reachedRemainingLimit{/jslang}',
+			'wcf.attachment.upload.error.uploadFailed': '{jslang}wcf.attachment.upload.error.uploadFailed{/jslang}',
+			'wcf.attachment.upload.error.uploadPhpLimit': '{jslang}wcf.attachment.upload.error.uploadPhpLimit{/jslang}',
+			'wcf.attachment.insert': '{jslang}wcf.attachment.insert{/jslang}',
+			'wcf.attachment.insertAll': '{jslang}wcf.attachment.insertAll{/jslang}',
+			'wcf.attachment.insertFull': '{jslang}wcf.attachment.insertFull{/jslang}',
+			'wcf.attachment.insertThumbnail': '{jslang}wcf.attachment.insertThumbnail{/jslang}',
+			'wcf.attachment.delete.sure': '{jslang}wcf.attachment.delete.sure{/jslang}'
 		});
 		
 		new WCF.Attachment.Upload(
diff --git a/com.woltlab.wcf/templates/__wysiwygCmsToolbar.tpl b/com.woltlab.wcf/templates/__wysiwygCmsToolbar.tpl
index 81f2deba4b..6fca00a9fd 100644
--- a/com.woltlab.wcf/templates/__wysiwygCmsToolbar.tpl
+++ b/com.woltlab.wcf/templates/__wysiwygCmsToolbar.tpl
@@ -1,16 +1,16 @@
 <script data-relocate="true">
 	require(['Language'], function (Language) {
 		Language.addObject({
-			'wcf.article.search': '{lang}wcf.article.search{/lang}',
-			'wcf.article.search.error.tooShort': '{lang}wcf.article.search.error.tooShort{/lang}',
-			'wcf.article.search.error.noResults': '{lang}wcf.article.search.error.noResults{/lang}',
-			'wcf.article.search.name': '{lang}wcf.article.search.name{/lang}',
-			'wcf.article.search.results': '{lang}wcf.article.search.results{/lang}',
-			'wcf.page.search': '{lang}wcf.page.search{/lang}',
-			'wcf.page.search.error.tooShort': '{lang}wcf.page.search.error.tooShort{/lang}',
-			'wcf.page.search.error.noResults': '{lang}wcf.page.search.error.noResults{/lang}',
-			'wcf.page.search.name': '{lang}wcf.page.search.name{/lang}',
-			'wcf.page.search.results': '{lang}wcf.page.search.results{/lang}',
+			'wcf.article.search': '{jslang}wcf.article.search{/jslang}',
+			'wcf.article.search.error.tooShort': '{jslang}wcf.article.search.error.tooShort{/jslang}',
+			'wcf.article.search.error.noResults': '{jslang}wcf.article.search.error.noResults{/jslang}',
+			'wcf.article.search.name': '{jslang}wcf.article.search.name{/jslang}',
+			'wcf.article.search.results': '{jslang}wcf.article.search.results{/jslang}',
+			'wcf.page.search': '{jslang}wcf.page.search{/jslang}',
+			'wcf.page.search.error.tooShort': '{jslang}wcf.page.search.error.tooShort{/jslang}',
+			'wcf.page.search.error.noResults': '{jslang}wcf.page.search.error.noResults{/jslang}',
+			'wcf.page.search.name': '{jslang}wcf.page.search.name{/jslang}',
+			'wcf.page.search.results': '{jslang}wcf.page.search.results{/jslang}',
 		});
 	})
 </script>
diff --git a/com.woltlab.wcf/templates/__wysiwygPreviewFormButton.tpl b/com.woltlab.wcf/templates/__wysiwygPreviewFormButton.tpl
index 6501f1538e..d61999dfcd 100644
--- a/com.woltlab.wcf/templates/__wysiwygPreviewFormButton.tpl
+++ b/com.woltlab.wcf/templates/__wysiwygPreviewFormButton.tpl
@@ -7,7 +7,7 @@
 <script data-relocate="true">
 	require(['Language'], function(Language) {
 		Language.addObject({
-			'wcf.global.preview': '{lang}wcf.global.preview{/lang}'
+			'wcf.global.preview': '{jslang}wcf.global.preview{/jslang}'
 		});
 		
 		new WCF.Message.DefaultPreview({
diff --git a/com.woltlab.wcf/templates/aclPermissions.tpl b/com.woltlab.wcf/templates/aclPermissions.tpl
index bff372d5e1..a1a07d3483 100644
--- a/com.woltlab.wcf/templates/aclPermissions.tpl
+++ b/com.woltlab.wcf/templates/aclPermissions.tpl
@@ -1,11 +1,11 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.acl.option.deny': '{lang}wcf.acl.option.deny{/lang}',
-			'wcf.acl.option.fullAccess': '{lang}wcf.acl.option.fullAccess{/lang}',
-			'wcf.acl.option.grant': '{lang}wcf.acl.option.grant{/lang}',
-			'wcf.acl.search.user.description': '{lang}wcf.acl.search.user.description{/lang}',
-			'wcf.acl.search.description': '{lang}wcf.acl.search.description{/lang}'
+			'wcf.acl.option.deny': '{jslang}wcf.acl.option.deny{/jslang}',
+			'wcf.acl.option.fullAccess': '{jslang}wcf.acl.option.fullAccess{/jslang}',
+			'wcf.acl.option.grant': '{jslang}wcf.acl.option.grant{/jslang}',
+			'wcf.acl.search.user.description': '{jslang}wcf.acl.search.user.description{/jslang}',
+			'wcf.acl.search.description': '{jslang}wcf.acl.search.description{/jslang}'
 		});
 	});
-</script>
\ No newline at end of file
+</script>
diff --git a/com.woltlab.wcf/templates/article.tpl b/com.woltlab.wcf/templates/article.tpl
index 0f9968fc49..f4f44b5078 100644
--- a/com.woltlab.wcf/templates/article.tpl
+++ b/com.woltlab.wcf/templates/article.tpl
@@ -375,8 +375,8 @@
 	<script data-relocate="true">
 		$(function() {
 			WCF.Language.addObject({
-				'wcf.moderation.report.reportContent': '{lang}wcf.moderation.report.reportContent{/lang}',
-				'wcf.moderation.report.success': '{lang}wcf.moderation.report.success{/lang}'
+				'wcf.moderation.report.reportContent': '{jslang}wcf.moderation.report.reportContent{/jslang}',
+				'wcf.moderation.report.success': '{jslang}wcf.moderation.report.success{/jslang}'
 			});
 			new WCF.Moderation.Report.Content('com.woltlab.wcf.article', '.jsReportArticle');
 		});
diff --git a/com.woltlab.wcf/templates/articleAdd.tpl b/com.woltlab.wcf/templates/articleAdd.tpl
index e7bec299fb..962ee2d86b 100644
--- a/com.woltlab.wcf/templates/articleAdd.tpl
+++ b/com.woltlab.wcf/templates/articleAdd.tpl
@@ -52,10 +52,10 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Ui/User/Search/Input', 'WoltLabSuite/Core/Acp/Ui/Article/InlineEditor'], function(Language, UiUserSearchInput, AcpUiArticleInlineEditor) {
 		Language.addObject({
-			'wcf.acp.article.i18n.source': '{lang}wcf.acp.article.i18n.source{/lang}',
-			'wcf.acp.article.i18n.toI18n.confirmMessage': '{lang}wcf.acp.article.i18n.toI18n.confirmMessage{/lang}',
-			'wcf.acp.article.i18n.fromI18n.confirmMessage': '{lang}wcf.acp.article.i18n.fromI18n.confirmMessage{/lang}',
-			'wcf.message.status.deleted': '{lang}wcf.message.status.deleted{/lang}',
+			'wcf.acp.article.i18n.source': '{jslang}wcf.acp.article.i18n.source{/jslang}',
+			'wcf.acp.article.i18n.toI18n.confirmMessage': '{jslang}wcf.acp.article.i18n.toI18n.confirmMessage{/jslang}',
+			'wcf.acp.article.i18n.fromI18n.confirmMessage': '{jslang}wcf.acp.article.i18n.fromI18n.confirmMessage{/jslang}',
+			'wcf.message.status.deleted': '{jslang}wcf.message.status.deleted{/jslang}',
 		});
 		
 		new UiUserSearchInput(elBySel('input[name="username"]'));
@@ -490,7 +490,7 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.label.none': '{lang}wcf.label.none{/lang}',
+			'wcf.label.none': '{jslang}wcf.label.none{/jslang}',
 		});
 		
 		{if !$labelGroups|empty}
diff --git a/com.woltlab.wcf/templates/articleAddDialog.tpl b/com.woltlab.wcf/templates/articleAddDialog.tpl
index 35cb520d56..a0a5fcf752 100644
--- a/com.woltlab.wcf/templates/articleAddDialog.tpl
+++ b/com.woltlab.wcf/templates/articleAddDialog.tpl
@@ -18,7 +18,7 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Acp/Ui/Article/Add'], function(Language, AcpUiArticleAdd) {
 		Language.addObject({
-			'wcf.acp.article.add': '{lang}wcf.acp.article.add{/lang}'
+			'wcf.acp.article.add': '{jslang}wcf.acp.article.add{/jslang}'
 		});
 		
 		AcpUiArticleAdd.init('{link controller='ArticleAdd' encode=false}{literal}isMultilingual={$isMultilingual}{/literal}{if $categoryID}&categoryID={@$categoryID}{/if}{/link}');
diff --git a/com.woltlab.wcf/templates/articleList.tpl b/com.woltlab.wcf/templates/articleList.tpl
index 1e7c297af5..18849b803a 100644
--- a/com.woltlab.wcf/templates/articleList.tpl
+++ b/com.woltlab.wcf/templates/articleList.tpl
@@ -60,8 +60,8 @@
 		<script data-relocate="true">
 			$(function() {
 				WCF.Language.addObject({
-					'wcf.label.none': '{lang}wcf.label.none{/lang}',
-					'wcf.label.withoutSelection': '{lang}wcf.label.withoutSelection{/lang}'
+					'wcf.label.none': '{jslang}wcf.label.none{/jslang}',
+					'wcf.label.withoutSelection': '{jslang}wcf.label.withoutSelection{/jslang}'
 				});
 				
 				new WCF.Label.Chooser({ {implode from=$labelIDs key=groupID item=labelID}{@$groupID}: {@$labelID}{/implode} }, '#sidebarForm', undefined, true);
diff --git a/com.woltlab.wcf/templates/avatarEdit.tpl b/com.woltlab.wcf/templates/avatarEdit.tpl
index 0ebe55c328..fe7d1d8f6f 100644
--- a/com.woltlab.wcf/templates/avatarEdit.tpl
+++ b/com.woltlab.wcf/templates/avatarEdit.tpl
@@ -79,12 +79,12 @@
 	<script data-relocate="true">
 		$(function() {
 			WCF.Language.addObject({
-				'wcf.user.avatar.upload.error.invalidExtension': '{lang}wcf.user.avatar.upload.error.invalidExtension{/lang}',
-				'wcf.user.avatar.upload.error.tooSmall': '{lang}wcf.user.avatar.upload.error.tooSmall{/lang}',
-				'wcf.user.avatar.upload.error.tooLarge': '{lang}wcf.user.avatar.upload.error.tooLarge{/lang}',
-				'wcf.user.avatar.upload.error.uploadFailed': '{lang}wcf.user.avatar.upload.error.uploadFailed{/lang}',
-				'wcf.user.avatar.upload.error.badImage': '{lang}wcf.user.avatar.upload.error.badImage{/lang}',
-				'wcf.user.avatar.upload.success': '{lang}wcf.user.avatar.upload.success{/lang}'
+				'wcf.user.avatar.upload.error.invalidExtension': '{jslang}wcf.user.avatar.upload.error.invalidExtension{/jslang}',
+				'wcf.user.avatar.upload.error.tooSmall': '{jslang}wcf.user.avatar.upload.error.tooSmall{/jslang}',
+				'wcf.user.avatar.upload.error.tooLarge': '{jslang}wcf.user.avatar.upload.error.tooLarge{/jslang}',
+				'wcf.user.avatar.upload.error.uploadFailed': '{jslang}wcf.user.avatar.upload.error.uploadFailed{/jslang}',
+				'wcf.user.avatar.upload.error.badImage': '{jslang}wcf.user.avatar.upload.error.badImage{/jslang}',
+				'wcf.user.avatar.upload.success': '{jslang}wcf.user.avatar.upload.success{/jslang}'
 			});
 			
 			{if !$__wcf->user->disableAvatar}
diff --git a/com.woltlab.wcf/templates/boxRecentActivity.tpl b/com.woltlab.wcf/templates/boxRecentActivity.tpl
index eae61fc798..abc41fcf1d 100644
--- a/com.woltlab.wcf/templates/boxRecentActivity.tpl
+++ b/com.woltlab.wcf/templates/boxRecentActivity.tpl
@@ -32,8 +32,8 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Ui/User/Activity/Recent'], function (Language, UiUserActivityRecent) {
 		Language.addObject({
-			'wcf.user.recentActivity.more': '{lang}wcf.user.recentActivity.more{/lang}',
-			'wcf.user.recentActivity.noMoreEntries': '{lang}wcf.user.recentActivity.noMoreEntries{/lang}'
+			'wcf.user.recentActivity.more': '{jslang}wcf.user.recentActivity.more{/jslang}',
+			'wcf.user.recentActivity.noMoreEntries': '{jslang}wcf.user.recentActivity.noMoreEntries{/jslang}'
 		});
 		
 		new UiUserActivityRecent('boxRecentActivity{@$boxID}');
diff --git a/com.woltlab.wcf/templates/categoryArticleList.tpl b/com.woltlab.wcf/templates/categoryArticleList.tpl
index 527b13f3f8..60b3e32636 100644
--- a/com.woltlab.wcf/templates/categoryArticleList.tpl
+++ b/com.woltlab.wcf/templates/categoryArticleList.tpl
@@ -58,8 +58,8 @@
 		<script data-relocate="true">
 			$(function() {
 				WCF.Language.addObject({
-					'wcf.label.none': '{lang}wcf.label.none{/lang}',
-					'wcf.label.withoutSelection': '{lang}wcf.label.withoutSelection{/lang}'
+					'wcf.label.none': '{jslang}wcf.label.none{/jslang}',
+					'wcf.label.withoutSelection': '{jslang}wcf.label.withoutSelection{/jslang}'
 				});
 				
 				new WCF.Label.Chooser({ {implode from=$labelIDs key=groupID item=labelID}{@$groupID}: {@$labelID}{/implode} }, '#sidebarForm', undefined, true);
@@ -113,7 +113,7 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.user.objectWatch.manageSubscription': '{lang}wcf.user.objectWatch.manageSubscription{/lang}'
+			'wcf.user.objectWatch.manageSubscription': '{jslang}wcf.user.objectWatch.manageSubscription{/jslang}'
 		});
 		
 		new WCF.User.ObjectWatch.Subscribe();
diff --git a/com.woltlab.wcf/templates/codeMetaCode.tpl b/com.woltlab.wcf/templates/codeMetaCode.tpl
index 103950f3db..67e183bcaa 100644
--- a/com.woltlab.wcf/templates/codeMetaCode.tpl
+++ b/com.woltlab.wcf/templates/codeMetaCode.tpl
@@ -22,8 +22,8 @@
 	<script data-relocate="true">
 		require(['Language', 'WoltLabSuite/Core/Bbcode/Collapsible', 'WoltLabSuite/Core/Bbcode/Code'], function (Language, BbcodeCollapsible, BbcodeCode) {
 			Language.addObject({
-				'wcf.message.bbcode.code.copy': '{lang}wcf.message.bbcode.code.copy{/lang}',
-				'wcf.message.bbcode.code.copy.success': '{lang}wcf.message.bbcode.code.copy.success{/lang}'
+				'wcf.message.bbcode.code.copy': '{jslang}wcf.message.bbcode.code.copy{/jslang}',
+				'wcf.message.bbcode.code.copy.success': '{jslang}wcf.message.bbcode.code.copy.success{/jslang}'
 			});
 			BbcodeCollapsible.observe();
 			BbcodeCode.processAll();
diff --git a/com.woltlab.wcf/templates/fontAwesomeJavaScript.tpl b/com.woltlab.wcf/templates/fontAwesomeJavaScript.tpl
index 7bc89c3680..f7088beb4a 100644
--- a/com.woltlab.wcf/templates/fontAwesomeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/fontAwesomeJavaScript.tpl
@@ -1,10 +1,10 @@
 <script>
 	require(['Language', 'WoltLabSuite/Core/Ui/Style/FontAwesome'], function (Language, UiStyleFontAwesome) {
 		Language.addObject({
-			'wcf.global.filter.button.clear': '{lang}wcf.global.filter.button.clear{/lang}',
-			'wcf.global.filter.error.noMatches': '{lang}wcf.global.filter.error.noMatches{/lang}',
-			'wcf.global.filter.placeholder': '{lang}wcf.global.filter.placeholder{/lang}',
-			'wcf.global.fontAwesome.selectIcon': '{lang}wcf.global.fontAwesome.selectIcon{/lang}'
+			'wcf.global.filter.button.clear': '{jslang}wcf.global.filter.button.clear{/jslang}',
+			'wcf.global.filter.error.noMatches': '{jslang}wcf.global.filter.error.noMatches{/jslang}',
+			'wcf.global.filter.placeholder': '{jslang}wcf.global.filter.placeholder{/jslang}',
+			'wcf.global.fontAwesome.selectIcon': '{jslang}wcf.global.fontAwesome.selectIcon{/jslang}'
 		});
 		
 		UiStyleFontAwesome.setup({@$__wcf->getStyleHandler()->getIcons(true)});
diff --git a/com.woltlab.wcf/templates/googleMapsJavaScript.tpl b/com.woltlab.wcf/templates/googleMapsJavaScript.tpl
index 36c1cc79d5..0d3bcfbbf4 100644
--- a/com.woltlab.wcf/templates/googleMapsJavaScript.tpl
+++ b/com.woltlab.wcf/templates/googleMapsJavaScript.tpl
@@ -7,20 +7,20 @@
 	<script data-relocate="true">
 		$(function() {
 			WCF.Language.addObject({
-				'wcf.map.noLocationSuggestions': '{lang}wcf.map.noLocationSuggestions{/lang}',
-				'wcf.map.route.error.not_found': '{lang}wcf.map.route.error.not_found{/lang}',
-				'wcf.map.route.error.over_query_limit': '{lang}wcf.map.route.error.over_query_limit{/lang}',
-				'wcf.map.route.error.request_denied': '{lang}wcf.map.route.error.request_denied{/lang}',
-				'wcf.map.route.origin': '{lang}wcf.map.route.origin{/lang}',
-				'wcf.map.route.planner': '{lang}wcf.map.route.planner{/lang}',
-				'wcf.map.route.travelMode': '{lang}wcf.map.route.travelMode{/lang}',
-				'wcf.map.route.travelMode.bicycling': '{lang}wcf.map.route.travelMode.bicycling{/lang}',
-				'wcf.map.route.travelMode.driving': '{lang}wcf.map.route.travelMode.driving{/lang}',
-				'wcf.map.route.travelMode.transit': '{lang}wcf.map.route.travelMode.transit{/lang}',
-				'wcf.map.route.travelMode.walking': '{lang}wcf.map.route.travelMode.walking{/lang}',
-				'wcf.map.route.viewOnGoogleMaps': '{lang}wcf.map.route.viewOnGoogleMaps{/lang}',
-				'wcf.map.showLocationSuggestions': '{lang}wcf.map.showLocationSuggestions{/lang}',
-				'wcf.map.useLocationSuggestion': '{lang}wcf.map.useLocationSuggestion{/lang}'
+				'wcf.map.noLocationSuggestions': '{jslang}wcf.map.noLocationSuggestions{/jslang}',
+				'wcf.map.route.error.not_found': '{jslang}wcf.map.route.error.not_found{/jslang}',
+				'wcf.map.route.error.over_query_limit': '{jslang}wcf.map.route.error.over_query_limit{/jslang}',
+				'wcf.map.route.error.request_denied': '{jslang}wcf.map.route.error.request_denied{/jslang}',
+				'wcf.map.route.origin': '{jslang}wcf.map.route.origin{/jslang}',
+				'wcf.map.route.planner': '{jslang}wcf.map.route.planner{/jslang}',
+				'wcf.map.route.travelMode': '{jslang}wcf.map.route.travelMode{/jslang}',
+				'wcf.map.route.travelMode.bicycling': '{jslang}wcf.map.route.travelMode.bicycling{/jslang}',
+				'wcf.map.route.travelMode.driving': '{jslang}wcf.map.route.travelMode.driving{/jslang}',
+				'wcf.map.route.travelMode.transit': '{jslang}wcf.map.route.travelMode.transit{/jslang}',
+				'wcf.map.route.travelMode.walking': '{jslang}wcf.map.route.travelMode.walking{/jslang}',
+				'wcf.map.route.viewOnGoogleMaps': '{jslang}wcf.map.route.viewOnGoogleMaps{/jslang}',
+				'wcf.map.showLocationSuggestions': '{jslang}wcf.map.showLocationSuggestions{/jslang}',
+				'wcf.map.useLocationSuggestion': '{jslang}wcf.map.useLocationSuggestion{/jslang}'
 			});
 			
 			WCF.Location.GoogleMaps.Settings.set({
diff --git a/com.woltlab.wcf/templates/groupedUserList.tpl b/com.woltlab.wcf/templates/groupedUserList.tpl
index dc8a742f20..89c21e9941 100644
--- a/com.woltlab.wcf/templates/groupedUserList.tpl
+++ b/com.woltlab.wcf/templates/groupedUserList.tpl
@@ -24,13 +24,13 @@
 <script data-relocate="true">
 		$(function() {
 			WCF.Language.addObject({
-				'wcf.user.button.follow': '{lang}wcf.user.button.follow{/lang}',
-				'wcf.user.button.ignore': '{lang}wcf.user.button.ignore{/lang}',
-				'wcf.user.button.unfollow': '{lang}wcf.user.button.unfollow{/lang}',
-				'wcf.user.button.unignore': '{lang}wcf.user.button.unignore{/lang}'
+				'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
+				'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
+				'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
+				'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
 			});
 			
 			new WCF.User.Action.Follow($('.jsGroupedUserList > li'));
 			new WCF.User.Action.Ignore($('.jsGroupedUserList > li'));
 		});
-</script>
\ No newline at end of file
+</script>
diff --git a/com.woltlab.wcf/templates/groupedUserReactionList.tpl b/com.woltlab.wcf/templates/groupedUserReactionList.tpl
index 25a5a5d0c2..e55095362c 100644
--- a/com.woltlab.wcf/templates/groupedUserReactionList.tpl
+++ b/com.woltlab.wcf/templates/groupedUserReactionList.tpl
@@ -24,13 +24,13 @@
 <script data-relocate="true">
 		$(function() {
 			WCF.Language.addObject({
-				'wcf.user.button.follow': '{lang}wcf.user.button.follow{/lang}',
-				'wcf.user.button.ignore': '{lang}wcf.user.button.ignore{/lang}',
-				'wcf.user.button.unfollow': '{lang}wcf.user.button.unfollow{/lang}',
-				'wcf.user.button.unignore': '{lang}wcf.user.button.unignore{/lang}'
+				'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
+				'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
+				'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
+				'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
 			});
 			
 			new WCF.User.Action.Follow($('.jsGroupedUserList > li'));
 			new WCF.User.Action.Ignore($('.jsGroupedUserList > li'));
 		});
-</script>
\ No newline at end of file
+</script>
diff --git a/com.woltlab.wcf/templates/headInclude.tpl b/com.woltlab.wcf/templates/headInclude.tpl
index f54caa9768..744e17f52c 100644
--- a/com.woltlab.wcf/templates/headInclude.tpl
+++ b/com.woltlab.wcf/templates/headInclude.tpl
@@ -14,7 +14,7 @@
 <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': '{lang}wcf.global.error.title{/lang}'
+		'wcf.global.error.title': '{jslang}wcf.global.error.title{/jslang}'
 		
 		{* DEPRECATED -- PLEASE USE javascriptLanguageImport@headIncludeJavaScript *}
 		{event name='javascriptLanguageImport'}
diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
index 03e128c4f8..634055da28 100644
--- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@ -52,93 +52,93 @@ window.addEventListener('pageshow', function(event) {
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/BootstrapFrontend', 'User'], function(Language, BootstrapFrontend, User) {
 		Language.addObject({
-			'__days': [ '{lang}wcf.date.day.sunday{/lang}', '{lang}wcf.date.day.monday{/lang}', '{lang}wcf.date.day.tuesday{/lang}', '{lang}wcf.date.day.wednesday{/lang}', '{lang}wcf.date.day.thursday{/lang}', '{lang}wcf.date.day.friday{/lang}', '{lang}wcf.date.day.saturday{/lang}' ],
-			'__daysShort': [ '{lang}wcf.date.day.sun{/lang}', '{lang}wcf.date.day.mon{/lang}', '{lang}wcf.date.day.tue{/lang}', '{lang}wcf.date.day.wed{/lang}', '{lang}wcf.date.day.thu{/lang}', '{lang}wcf.date.day.fri{/lang}', '{lang}wcf.date.day.sat{/lang}' ],
-			'__months': [ '{lang}wcf.date.month.january{/lang}', '{lang}wcf.date.month.february{/lang}', '{lang}wcf.date.month.march{/lang}', '{lang}wcf.date.month.april{/lang}', '{lang}wcf.date.month.may{/lang}', '{lang}wcf.date.month.june{/lang}', '{lang}wcf.date.month.july{/lang}', '{lang}wcf.date.month.august{/lang}', '{lang}wcf.date.month.september{/lang}', '{lang}wcf.date.month.october{/lang}', '{lang}wcf.date.month.november{/lang}', '{lang}wcf.date.month.december{/lang}' ], 
-			'__monthsShort': [ '{lang}wcf.date.month.short.jan{/lang}', '{lang}wcf.date.month.short.feb{/lang}', '{lang}wcf.date.month.short.mar{/lang}', '{lang}wcf.date.month.short.apr{/lang}', '{lang}wcf.date.month.short.may{/lang}', '{lang}wcf.date.month.short.jun{/lang}', '{lang}wcf.date.month.short.jul{/lang}', '{lang}wcf.date.month.short.aug{/lang}', '{lang}wcf.date.month.short.sep{/lang}', '{lang}wcf.date.month.short.oct{/lang}', '{lang}wcf.date.month.short.nov{/lang}', '{lang}wcf.date.month.short.dec{/lang}' ],
-			'wcf.clipboard.item.unmarkAll': '{lang}wcf.clipboard.item.unmarkAll{/lang}',
-			'wcf.clipboard.item.markAll': '{lang}wcf.clipboard.item.markAll{/lang}',
-			'wcf.clipboard.item.mark': '{lang}wcf.clipboard.item.mark{/lang}',
-			'wcf.date.relative.now': '{lang __literal=true}wcf.date.relative.now{/lang}',
-			'wcf.date.relative.minutes': '{capture assign=relativeMinutes}{lang __literal=true}wcf.date.relative.minutes{/lang}{/capture}{@$relativeMinutes|encodeJS}',
-			'wcf.date.relative.hours': '{capture assign=relativeHours}{lang __literal=true}wcf.date.relative.hours{/lang}{/capture}{@$relativeHours|encodeJS}',
-			'wcf.date.relative.pastDays': '{capture assign=relativePastDays}{lang __literal=true}wcf.date.relative.pastDays{/lang}{/capture}{@$relativePastDays|encodeJS}',
-			'wcf.date.dateFormat': '{"wcf.date.dateFormat"|language|encodeJS}',
-			'wcf.date.dateTimeFormat': '{lang}wcf.date.dateTimeFormat{/lang}',
-			'wcf.date.shortDateTimeFormat': '{lang}wcf.date.shortDateTimeFormat{/lang}',
-			'wcf.date.hour': '{lang}wcf.date.hour{/lang}',
-			'wcf.date.minute': '{lang}wcf.date.minute{/lang}',
-			'wcf.date.timeFormat': '{lang}wcf.date.timeFormat{/lang}',
-			'wcf.date.firstDayOfTheWeek': '{lang}wcf.date.firstDayOfTheWeek{/lang}',
-			'wcf.global.button.add': '{lang}wcf.global.button.add{/lang}',
-			'wcf.global.button.cancel': '{lang}wcf.global.button.cancel{/lang}',
-			'wcf.global.button.close': '{lang}wcf.global.button.close{/lang}',
-			'wcf.global.button.collapsible': '{lang}wcf.global.button.collapsible{/lang}',
-			'wcf.global.button.delete': '{lang}wcf.global.button.delete{/lang}',
-			'wcf.global.button.disable': '{lang}wcf.global.button.disable{/lang}',
-			'wcf.global.button.disabledI18n': '{lang}wcf.global.button.disabledI18n{/lang}',
-			'wcf.global.button.edit': '{lang}wcf.global.button.edit{/lang}',
-			'wcf.global.button.enable': '{lang}wcf.global.button.enable{/lang}',
-			'wcf.global.button.hide': '{lang}wcf.global.button.hide{/lang}',
-			'wcf.global.button.insert': '{lang}wcf.global.button.insert{/lang}',
-			'wcf.global.button.next': '{lang}wcf.global.button.next{/lang}',
-			'wcf.global.button.preview': '{lang}wcf.global.button.preview{/lang}',
-			'wcf.global.button.reset': '{lang}wcf.global.button.reset{/lang}',
-			'wcf.global.button.save': '{lang}wcf.global.button.save{/lang}',
-			'wcf.global.button.search': '{lang}wcf.global.button.search{/lang}',
-			'wcf.global.button.submit': '{lang}wcf.global.button.submit{/lang}',
-			'wcf.global.button.upload': '{lang}wcf.global.button.upload{/lang}',
-			'wcf.global.confirmation.cancel': '{lang}wcf.global.confirmation.cancel{/lang}',
-			'wcf.global.confirmation.confirm': '{lang}wcf.global.confirmation.confirm{/lang}',
-			'wcf.global.confirmation.title': '{lang}wcf.global.confirmation.title{/lang}',
-			'wcf.global.decimalPoint': '{capture assign=decimalPoint}{lang}wcf.global.decimalPoint{/lang}{/capture}{$decimalPoint|encodeJS}',
-			'wcf.global.error.timeout': '{lang}wcf.global.error.timeout{/lang}',
-			'wcf.global.form.error.empty': '{lang}wcf.global.form.error.empty{/lang}',
-			'wcf.global.form.error.greaterThan': '{lang __literal=true}wcf.global.form.error.greaterThan{/lang}',
-			'wcf.global.form.error.lessThan': '{lang __literal=true}wcf.global.form.error.lessThan{/lang}',
-			'wcf.global.form.error.multilingual': '{lang}wcf.global.form.error.multilingual{/lang}',
-			'wcf.global.form.input.maxItems': '{lang}wcf.global.form.input.maxItems{/lang}',
-			'wcf.global.language.noSelection': '{lang}wcf.global.language.noSelection{/lang}',
-			'wcf.global.loading': '{lang}wcf.global.loading{/lang}',
-			'wcf.global.noSelection': '{lang}wcf.global.noSelection{/lang}',
-			'wcf.global.select': '{lang}wcf.global.select{/lang}',
-			'wcf.page.jumpTo': '{lang}wcf.page.jumpTo{/lang}',
-			'wcf.page.jumpTo.description': '{lang}wcf.page.jumpTo.description{/lang}',
-			'wcf.global.page.pagination': '{lang}wcf.global.page.pagination{/lang}',
-			'wcf.global.page.next': '{capture assign=pageNext}{lang}wcf.global.page.next{/lang}{/capture}{@$pageNext|encodeJS}',
-			'wcf.global.page.previous': '{capture assign=pagePrevious}{lang}wcf.global.page.previous{/lang}{/capture}{@$pagePrevious|encodeJS}',
-			'wcf.global.pageDirection': '{lang}wcf.global.pageDirection{/lang}',
-			'wcf.global.reason': '{lang}wcf.global.reason{/lang}',
-			'wcf.global.scrollUp': '{lang}wcf.global.scrollUp{/lang}',
-			'wcf.global.success': '{lang}wcf.global.success{/lang}',
-			'wcf.global.success.add': '{lang}wcf.global.success.add{/lang}',
-			'wcf.global.success.edit': '{lang}wcf.global.success.edit{/lang}',
-			'wcf.global.thousandsSeparator': '{capture assign=thousandsSeparator}{lang}wcf.global.thousandsSeparator{/lang}{/capture}{@$thousandsSeparator|encodeJS}',
-			'wcf.page.pagePosition': '{lang __literal=true}wcf.page.pagePosition{/lang}',
-			'wcf.style.changeStyle': '{lang}wcf.style.changeStyle{/lang}',
-			'wcf.user.activityPoint': '{lang}wcf.user.activityPoint{/lang}',
-			'wcf.user.panel.markAllAsRead': '{lang}wcf.user.panel.markAllAsRead{/lang}',
-			'wcf.user.panel.markAsRead': '{lang}wcf.user.panel.markAsRead{/lang}',
-			'wcf.user.panel.settings': '{lang}wcf.user.panel.settings{/lang}',
-			'wcf.user.panel.showAll': '{lang}wcf.user.panel.showAll{/lang}',
-			'wcf.menu.page': '{lang}wcf.menu.page{/lang}',
-			'wcf.menu.user': '{lang}wcf.menu.user{/lang}',
-			'wcf.global.button.showMenu': '{lang}wcf.global.button.showMenu{/lang}',
-			'wcf.global.button.hideMenu': '{lang}wcf.global.button.hideMenu{/lang}',
-			'wcf.date.datePicker': '{lang}wcf.date.datePicker{/lang}',
-			'wcf.date.datePicker.previousMonth': '{lang}wcf.date.datePicker.previousMonth{/lang}',
-			'wcf.date.datePicker.nextMonth': '{lang}wcf.date.datePicker.nextMonth{/lang}',
-			'wcf.date.datePicker.month': '{lang}wcf.date.datePicker.month{/lang}',
-			'wcf.date.datePicker.year': '{lang}wcf.date.datePicker.year{/lang}',
-			'wcf.date.datePicker.hour': '{lang}wcf.date.datePicker.hour{/lang}',
-			'wcf.date.datePicker.minute': '{lang}wcf.date.datePicker.minute{/lang}'
+			'__days': [ '{jslang}wcf.date.day.sunday{/jslang}', '{jslang}wcf.date.day.monday{/jslang}', '{jslang}wcf.date.day.tuesday{/jslang}', '{jslang}wcf.date.day.wednesday{/jslang}', '{jslang}wcf.date.day.thursday{/jslang}', '{jslang}wcf.date.day.friday{/jslang}', '{jslang}wcf.date.day.saturday{/jslang}' ],
+			'__daysShort': [ '{jslang}wcf.date.day.sun{/jslang}', '{jslang}wcf.date.day.mon{/jslang}', '{jslang}wcf.date.day.tue{/jslang}', '{jslang}wcf.date.day.wed{/jslang}', '{jslang}wcf.date.day.thu{/jslang}', '{jslang}wcf.date.day.fri{/jslang}', '{jslang}wcf.date.day.sat{/jslang}' ],
+			'__months': [ '{jslang}wcf.date.month.january{/jslang}', '{jslang}wcf.date.month.february{/jslang}', '{jslang}wcf.date.month.march{/jslang}', '{jslang}wcf.date.month.april{/jslang}', '{jslang}wcf.date.month.may{/jslang}', '{jslang}wcf.date.month.june{/jslang}', '{jslang}wcf.date.month.july{/jslang}', '{jslang}wcf.date.month.august{/jslang}', '{jslang}wcf.date.month.september{/jslang}', '{jslang}wcf.date.month.october{/jslang}', '{jslang}wcf.date.month.november{/jslang}', '{jslang}wcf.date.month.december{/jslang}' ], 
+			'__monthsShort': [ '{jslang}wcf.date.month.short.jan{/jslang}', '{jslang}wcf.date.month.short.feb{/jslang}', '{jslang}wcf.date.month.short.mar{/jslang}', '{jslang}wcf.date.month.short.apr{/jslang}', '{jslang}wcf.date.month.short.may{/jslang}', '{jslang}wcf.date.month.short.jun{/jslang}', '{jslang}wcf.date.month.short.jul{/jslang}', '{jslang}wcf.date.month.short.aug{/jslang}', '{jslang}wcf.date.month.short.sep{/jslang}', '{jslang}wcf.date.month.short.oct{/jslang}', '{jslang}wcf.date.month.short.nov{/jslang}', '{jslang}wcf.date.month.short.dec{/jslang}' ],
+			'wcf.clipboard.item.unmarkAll': '{jslang}wcf.clipboard.item.unmarkAll{/jslang}',
+			'wcf.clipboard.item.markAll': '{jslang}wcf.clipboard.item.markAll{/jslang}',
+			'wcf.clipboard.item.mark': '{jslang}wcf.clipboard.item.mark{/jslang}',
+			'wcf.date.relative.now': '{jslang __literal=true}wcf.date.relative.now{/jslang}',
+			'wcf.date.relative.minutes': '{jslang __literal=true}wcf.date.relative.minutes{/jslang}',
+			'wcf.date.relative.hours': '{jslang __literal=true}wcf.date.relative.hours{/jslang}',
+			'wcf.date.relative.pastDays': '{jslang __literal=true}wcf.date.relative.pastDays{/jslang}',
+			'wcf.date.dateFormat': '{jslang}wcf.date.dateFormat{/jslang}',
+			'wcf.date.dateTimeFormat': '{jslang}wcf.date.dateTimeFormat{/jslang}',
+			'wcf.date.shortDateTimeFormat': '{jslang}wcf.date.shortDateTimeFormat{/jslang}',
+			'wcf.date.hour': '{jslang}wcf.date.hour{/jslang}',
+			'wcf.date.minute': '{jslang}wcf.date.minute{/jslang}',
+			'wcf.date.timeFormat': '{jslang}wcf.date.timeFormat{/jslang}',
+			'wcf.date.firstDayOfTheWeek': '{jslang}wcf.date.firstDayOfTheWeek{/jslang}',
+			'wcf.global.button.add': '{jslang}wcf.global.button.add{/jslang}',
+			'wcf.global.button.cancel': '{jslang}wcf.global.button.cancel{/jslang}',
+			'wcf.global.button.close': '{jslang}wcf.global.button.close{/jslang}',
+			'wcf.global.button.collapsible': '{jslang}wcf.global.button.collapsible{/jslang}',
+			'wcf.global.button.delete': '{jslang}wcf.global.button.delete{/jslang}',
+			'wcf.global.button.disable': '{jslang}wcf.global.button.disable{/jslang}',
+			'wcf.global.button.disabledI18n': '{jslang}wcf.global.button.disabledI18n{/jslang}',
+			'wcf.global.button.edit': '{jslang}wcf.global.button.edit{/jslang}',
+			'wcf.global.button.enable': '{jslang}wcf.global.button.enable{/jslang}',
+			'wcf.global.button.hide': '{jslang}wcf.global.button.hide{/jslang}',
+			'wcf.global.button.insert': '{jslang}wcf.global.button.insert{/jslang}',
+			'wcf.global.button.next': '{jslang}wcf.global.button.next{/jslang}',
+			'wcf.global.button.preview': '{jslang}wcf.global.button.preview{/jslang}',
+			'wcf.global.button.reset': '{jslang}wcf.global.button.reset{/jslang}',
+			'wcf.global.button.save': '{jslang}wcf.global.button.save{/jslang}',
+			'wcf.global.button.search': '{jslang}wcf.global.button.search{/jslang}',
+			'wcf.global.button.submit': '{jslang}wcf.global.button.submit{/jslang}',
+			'wcf.global.button.upload': '{jslang}wcf.global.button.upload{/jslang}',
+			'wcf.global.confirmation.cancel': '{jslang}wcf.global.confirmation.cancel{/jslang}',
+			'wcf.global.confirmation.confirm': '{jslang}wcf.global.confirmation.confirm{/jslang}',
+			'wcf.global.confirmation.title': '{jslang}wcf.global.confirmation.title{/jslang}',
+			'wcf.global.decimalPoint': '{jslang}wcf.global.decimalPoint{/jslang}',
+			'wcf.global.error.timeout': '{jslang}wcf.global.error.timeout{/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}',
+			'wcf.global.form.error.multilingual': '{jslang}wcf.global.form.error.multilingual{/jslang}',
+			'wcf.global.form.input.maxItems': '{jslang}wcf.global.form.input.maxItems{/jslang}',
+			'wcf.global.language.noSelection': '{jslang}wcf.global.language.noSelection{/jslang}',
+			'wcf.global.loading': '{jslang}wcf.global.loading{/jslang}',
+			'wcf.global.noSelection': '{jslang}wcf.global.noSelection{/jslang}',
+			'wcf.global.select': '{jslang}wcf.global.select{/jslang}',
+			'wcf.page.jumpTo': '{jslang}wcf.page.jumpTo{/jslang}',
+			'wcf.page.jumpTo.description': '{jslang}wcf.page.jumpTo.description{/jslang}',
+			'wcf.global.page.pagination': '{jslang}wcf.global.page.pagination{/jslang}',
+			'wcf.global.page.next': '{jslang}wcf.global.page.next{/jslang}',
+			'wcf.global.page.previous': '{jslang}wcf.global.page.previous{/jslang}',
+			'wcf.global.pageDirection': '{jslang}wcf.global.pageDirection{/jslang}',
+			'wcf.global.reason': '{jslang}wcf.global.reason{/jslang}',
+			'wcf.global.scrollUp': '{jslang}wcf.global.scrollUp{/jslang}',
+			'wcf.global.success': '{jslang}wcf.global.success{/jslang}',
+			'wcf.global.success.add': '{jslang}wcf.global.success.add{/jslang}',
+			'wcf.global.success.edit': '{jslang}wcf.global.success.edit{/jslang}',
+			'wcf.global.thousandsSeparator': '{jslang}wcf.global.thousandsSeparator{/jslang}',
+			'wcf.page.pagePosition': '{jslang __literal=true}wcf.page.pagePosition{/jslang}',
+			'wcf.style.changeStyle': '{jslang}wcf.style.changeStyle{/jslang}',
+			'wcf.user.activityPoint': '{jslang}wcf.user.activityPoint{/jslang}',
+			'wcf.user.panel.markAllAsRead': '{jslang}wcf.user.panel.markAllAsRead{/jslang}',
+			'wcf.user.panel.markAsRead': '{jslang}wcf.user.panel.markAsRead{/jslang}',
+			'wcf.user.panel.settings': '{jslang}wcf.user.panel.settings{/jslang}',
+			'wcf.user.panel.showAll': '{jslang}wcf.user.panel.showAll{/jslang}',
+			'wcf.menu.page': '{jslang}wcf.menu.page{/jslang}',
+			'wcf.menu.user': '{jslang}wcf.menu.user{/jslang}',
+			'wcf.global.button.showMenu': '{jslang}wcf.global.button.showMenu{/jslang}',
+			'wcf.global.button.hideMenu': '{jslang}wcf.global.button.hideMenu{/jslang}',
+			'wcf.date.datePicker': '{jslang}wcf.date.datePicker{/jslang}',
+			'wcf.date.datePicker.previousMonth': '{jslang}wcf.date.datePicker.previousMonth{/jslang}',
+			'wcf.date.datePicker.nextMonth': '{jslang}wcf.date.datePicker.nextMonth{/jslang}',
+			'wcf.date.datePicker.month': '{jslang}wcf.date.datePicker.month{/jslang}',
+			'wcf.date.datePicker.year': '{jslang}wcf.date.datePicker.year{/jslang}',
+			'wcf.date.datePicker.hour': '{jslang}wcf.date.datePicker.hour{/jslang}',
+			'wcf.date.datePicker.minute': '{jslang}wcf.date.datePicker.minute{/jslang}'
 			{if MODULE_LIKE}
-				,'wcf.like.button.like': '{lang}wcf.like.button.like{/lang}',
-				'wcf.like.button.dislike': '{lang}wcf.like.button.dislike{/lang}',
-				'wcf.like.tooltip': '{lang}wcf.like.jsTooltip{/lang}',
-				'wcf.like.summary': '{lang}wcf.like.summary{/lang}',
-				'wcf.like.details': '{lang}wcf.like.details{/lang}',
-				'wcf.reactions.react': '{lang}wcf.reactions.react{/lang}'
+				,'wcf.like.button.like': '{jslang}wcf.like.button.like{/jslang}',
+				'wcf.like.button.dislike': '{jslang}wcf.like.button.dislike{/jslang}',
+				'wcf.like.tooltip': '{jslang}wcf.like.jsTooltip{/jslang}',
+				'wcf.like.summary': '{jslang}wcf.like.summary{/jslang}',
+				'wcf.like.details': '{jslang}wcf.like.details{/jslang}',
+				'wcf.reactions.react': '{jslang}wcf.reactions.react{/jslang}'
 			{/if}
 			
 			{event name='javascriptLanguageImport'}
diff --git a/com.woltlab.wcf/templates/imageViewer.tpl b/com.woltlab.wcf/templates/imageViewer.tpl
index ae530070d8..595b0723c0 100644
--- a/com.woltlab.wcf/templates/imageViewer.tpl
+++ b/com.woltlab.wcf/templates/imageViewer.tpl
@@ -3,14 +3,14 @@
 		var $imageViewer = null;
 		$(function() {
 			WCF.Language.addObject({
-				'wcf.imageViewer.button.enlarge': '{lang}wcf.imageViewer.button.enlarge{/lang}',
-				'wcf.imageViewer.button.full': '{lang}wcf.imageViewer.button.full{/lang}',
-				'wcf.imageViewer.seriesIndex': '{lang __literal=true}wcf.imageViewer.seriesIndex{/lang}',
-				'wcf.imageViewer.counter': '{lang}wcf.imageViewer.counter{/lang}',
-				'wcf.imageViewer.close': '{lang}wcf.imageViewer.close{/lang}',
-				'wcf.imageViewer.enlarge': '{lang}wcf.imageViewer.enlarge{/lang}',
-				'wcf.imageViewer.next': '{lang}wcf.imageViewer.next{/lang}',
-				'wcf.imageViewer.previous': '{lang}wcf.imageViewer.previous{/lang}'
+				'wcf.imageViewer.button.enlarge': '{jslang}wcf.imageViewer.button.enlarge{/jslang}',
+				'wcf.imageViewer.button.full': '{jslang}wcf.imageViewer.button.full{/jslang}',
+				'wcf.imageViewer.seriesIndex': '{jslang __literal=true}wcf.imageViewer.seriesIndex{/jslang}',
+				'wcf.imageViewer.counter': '{jslang}wcf.imageViewer.counter{/jslang}',
+				'wcf.imageViewer.close': '{jslang}wcf.imageViewer.close{/jslang}',
+				'wcf.imageViewer.enlarge': '{jslang}wcf.imageViewer.enlarge{/jslang}',
+				'wcf.imageViewer.next': '{jslang}wcf.imageViewer.next{/jslang}',
+				'wcf.imageViewer.previous': '{jslang}wcf.imageViewer.previous{/jslang}'
 			});
 			
 			$imageViewer = new WCF.ImageViewer();
@@ -28,4 +28,4 @@
 	</script>
 	
 	{assign var=__imageViewerLoaded value=true}
-{/if}
\ No newline at end of file
+{/if}
diff --git a/com.woltlab.wcf/templates/mediaJavaScript.tpl b/com.woltlab.wcf/templates/mediaJavaScript.tpl
index 609991a1bf..b9016db077 100644
--- a/com.woltlab.wcf/templates/mediaJavaScript.tpl
+++ b/com.woltlab.wcf/templates/mediaJavaScript.tpl
@@ -1,28 +1,28 @@
 {if $__wcf->session->getPermission('admin.content.cms.canUseMedia')}
 	require(['Language', 'Permission'], function(Language, Permission) {
 		Language.addObject({
-			'wcf.global.button.insert': '{lang}wcf.global.button.insert{/lang}',
-			'wcf.media.button.replaceFile': '{lang}wcf.media.button.replaceFile{/lang}',
-			'wcf.media.button.select': '{lang}wcf.media.button.select{/lang}',
-			'wcf.media.delete.confirmMessage': '{lang __encode=true __literal=true}wcf.media.delete.confirmMessage{/lang}',
-			'wcf.media.imageDimensions.value': '{lang __literal=true}wcf.media.imageDimensions.value{/lang}',
-			'wcf.media.insert': '{lang}wcf.media.insert{/lang}',
-			'wcf.media.insert.imageSize': '{lang}wcf.media.insert.imageSize{/lang}',
-			'wcf.media.insert.imageSize.small': '{lang}wcf.media.insert.imageSize.small{/lang}',
-			'wcf.media.insert.imageSize.medium': '{lang}wcf.media.insert.imageSize.medium{/lang}',
-			'wcf.media.insert.imageSize.large': '{lang}wcf.media.insert.imageSize.large{/lang}',
-			'wcf.media.insert.imageSize.original': '{lang}wcf.media.insert.imageSize.original{/lang}',
-			'wcf.media.manager': '{lang}wcf.media.manager{/lang}',
-			'wcf.media.edit': '{lang}wcf.media.edit{/lang}',
-			'wcf.media.button.insert': '{lang}wcf.media.button.insert{/lang}',
-			'wcf.media.search.info.searchStringThreshold': '{lang __literal=true}wcf.media.search.info.searchStringThreshold{/lang}',
-			'wcf.media.search.noResults': '{lang}wcf.media.search.noResults{/lang}',
-			'wcf.media.upload.error.differentFileExtension': '{lang}wcf.media.upload.error.differentFileExtension{/lang}',
-			'wcf.media.upload.error.differentFileType': '{lang}wcf.media.upload.error.differentFileType{/lang}',
-			'wcf.media.upload.error.noImage': '{lang}wcf.media.upload.error.noImage{/lang}',
-			'wcf.media.upload.error.uploadFailed': '{lang}wcf.media.upload.error.uploadFailed{/lang}',
-			'wcf.media.upload.success': '{lang}wcf.media.upload.success{/lang}',
-			'wcf.media.setCategory': '{lang}wcf.media.setCategory{/lang}'
+			'wcf.global.button.insert': '{jslang}wcf.global.button.insert{/jslang}',
+			'wcf.media.button.replaceFile': '{jslang}wcf.media.button.replaceFile{/jslang}',
+			'wcf.media.button.select': '{jslang}wcf.media.button.select{/jslang}',
+			'wcf.media.delete.confirmMessage': '{jslang __encode=true __literal=true}wcf.media.delete.confirmMessage{/jslang}',
+			'wcf.media.imageDimensions.value': '{jslang __literal=true}wcf.media.imageDimensions.value{/jslang}',
+			'wcf.media.insert': '{jslang}wcf.media.insert{/jslang}',
+			'wcf.media.insert.imageSize': '{jslang}wcf.media.insert.imageSize{/jslang}',
+			'wcf.media.insert.imageSize.small': '{jslang}wcf.media.insert.imageSize.small{/jslang}',
+			'wcf.media.insert.imageSize.medium': '{jslang}wcf.media.insert.imageSize.medium{/jslang}',
+			'wcf.media.insert.imageSize.large': '{jslang}wcf.media.insert.imageSize.large{/jslang}',
+			'wcf.media.insert.imageSize.original': '{jslang}wcf.media.insert.imageSize.original{/jslang}',
+			'wcf.media.manager': '{jslang}wcf.media.manager{/jslang}',
+			'wcf.media.edit': '{jslang}wcf.media.edit{/jslang}',
+			'wcf.media.button.insert': '{jslang}wcf.media.button.insert{/jslang}',
+			'wcf.media.search.info.searchStringThreshold': '{jslang __literal=true}wcf.media.search.info.searchStringThreshold{/jslang}',
+			'wcf.media.search.noResults': '{jslang}wcf.media.search.noResults{/jslang}',
+			'wcf.media.upload.error.differentFileExtension': '{jslang}wcf.media.upload.error.differentFileExtension{/jslang}',
+			'wcf.media.upload.error.differentFileType': '{jslang}wcf.media.upload.error.differentFileType{/jslang}',
+			'wcf.media.upload.error.noImage': '{jslang}wcf.media.upload.error.noImage{/jslang}',
+			'wcf.media.upload.error.uploadFailed': '{jslang}wcf.media.upload.error.uploadFailed{/jslang}',
+			'wcf.media.upload.success': '{jslang}wcf.media.upload.success{/jslang}',
+			'wcf.media.setCategory': '{jslang}wcf.media.setCategory{/jslang}'
 		});
 		
 		Permission.add('admin.content.cms.canManageMedia', {if $__wcf->session->getPermission('admin.content.cms.canManageMedia')}true{else}false{/if});
diff --git a/com.woltlab.wcf/templates/membersList.tpl b/com.woltlab.wcf/templates/membersList.tpl
index cc0f1a0c6a..9fc6744d36 100644
--- a/com.woltlab.wcf/templates/membersList.tpl
+++ b/com.woltlab.wcf/templates/membersList.tpl
@@ -133,10 +133,10 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.user.button.follow': '{lang}wcf.user.button.follow{/lang}',
-			'wcf.user.button.ignore': '{lang}wcf.user.button.ignore{/lang}',
-			'wcf.user.button.unfollow': '{lang}wcf.user.button.unfollow{/lang}',
-			'wcf.user.button.unignore': '{lang}wcf.user.button.unignore{/lang}'
+			'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
+			'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
+			'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
+			'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
 		});
 		
 		new WCF.User.Action.Follow($('.userList > li'));
diff --git a/com.woltlab.wcf/templates/messageFormAttachments.tpl b/com.woltlab.wcf/templates/messageFormAttachments.tpl
index b0c41f4a25..59fdac98ce 100644
--- a/com.woltlab.wcf/templates/messageFormAttachments.tpl
+++ b/com.woltlab.wcf/templates/messageFormAttachments.tpl
@@ -42,17 +42,17 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.attachment.upload.error.invalidExtension': '{lang}wcf.attachment.upload.error.invalidExtension{/lang}',
-			'wcf.attachment.upload.error.tooLarge': '{lang}wcf.attachment.upload.error.tooLarge{/lang}',
-			'wcf.attachment.upload.error.reachedLimit': '{lang}wcf.attachment.upload.error.reachedLimit{/lang}',
-			'wcf.attachment.upload.error.reachedRemainingLimit': '{lang}wcf.attachment.upload.error.reachedRemainingLimit{/lang}',
-			'wcf.attachment.upload.error.uploadFailed': '{lang}wcf.attachment.upload.error.uploadFailed{/lang}',
-			'wcf.attachment.upload.error.uploadPhpLimit': '{lang}wcf.attachment.upload.error.uploadPhpLimit{/lang}',
-			'wcf.attachment.insert': '{lang}wcf.attachment.insert{/lang}',
-			'wcf.attachment.insertAll': '{lang}wcf.attachment.insertAll{/lang}',
-			'wcf.attachment.insertFull': '{lang}wcf.attachment.insertFull{/lang}',
-			'wcf.attachment.insertThumbnail': '{lang}wcf.attachment.insertThumbnail{/lang}',
-			'wcf.attachment.delete.sure': '{lang}wcf.attachment.delete.sure{/lang}'
+			'wcf.attachment.upload.error.invalidExtension': '{jslang}wcf.attachment.upload.error.invalidExtension{/jslang}',
+			'wcf.attachment.upload.error.tooLarge': '{jslang}wcf.attachment.upload.error.tooLarge{/jslang}',
+			'wcf.attachment.upload.error.reachedLimit': '{jslang}wcf.attachment.upload.error.reachedLimit{/jslang}',
+			'wcf.attachment.upload.error.reachedRemainingLimit': '{jslang}wcf.attachment.upload.error.reachedRemainingLimit{/jslang}',
+			'wcf.attachment.upload.error.uploadFailed': '{jslang}wcf.attachment.upload.error.uploadFailed{/jslang}',
+			'wcf.attachment.upload.error.uploadPhpLimit': '{jslang}wcf.attachment.upload.error.uploadPhpLimit{/jslang}',
+			'wcf.attachment.insert': '{jslang}wcf.attachment.insert{/jslang}',
+			'wcf.attachment.insertAll': '{jslang}wcf.attachment.insertAll{/jslang}',
+			'wcf.attachment.insertFull': '{jslang}wcf.attachment.insertFull{/jslang}',
+			'wcf.attachment.insertThumbnail': '{jslang}wcf.attachment.insertThumbnail{/jslang}',
+			'wcf.attachment.delete.sure': '{jslang}wcf.attachment.delete.sure{/jslang}'
 		});
 		
 		new WCF.Attachment.Upload(
diff --git a/com.woltlab.wcf/templates/messageFormPreviewButton.tpl b/com.woltlab.wcf/templates/messageFormPreviewButton.tpl
index 00175333c5..8ed7748182 100644
--- a/com.woltlab.wcf/templates/messageFormPreviewButton.tpl
+++ b/com.woltlab.wcf/templates/messageFormPreviewButton.tpl
@@ -8,7 +8,7 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.global.preview': '{lang}wcf.global.preview{/lang}' 
+			'wcf.global.preview': '{jslang}wcf.global.preview{/jslang}' 
 		});
 		
 		new WCF.Message.DefaultPreview({
@@ -18,4 +18,4 @@
 			messageObjectID: '{$previewMessageObjectID}'
 		});
 	});
-</script>
\ No newline at end of file
+</script>
diff --git a/com.woltlab.wcf/templates/moderationActivation.tpl b/com.woltlab.wcf/templates/moderationActivation.tpl
index d819d9f673..4c1bd05f0c 100644
--- a/com.woltlab.wcf/templates/moderationActivation.tpl
+++ b/com.woltlab.wcf/templates/moderationActivation.tpl
@@ -80,13 +80,13 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.moderation.activation.enableContent.confirmMessage': '{lang}wcf.moderation.activation.enableContent.confirmMessage{/lang}',
-			'wcf.moderation.activation.removeContent.confirmMessage': '{lang}wcf.moderation.activation.removeContent.confirmMessage{/lang}',
-			'wcf.moderation.assignedUser': '{lang}wcf.moderation.assignedUser{/lang}',
-			'wcf.moderation.assignedUser.error.notAffected': '{lang}wcf.moderation.assignedUser.error.notAffected{/lang}',
-			'wcf.moderation.status.outstanding': '{lang}wcf.moderation.status.outstanding{/lang}',
-			'wcf.moderation.status.processing': '{lang}wcf.moderation.status.processing{/lang}',
-			'wcf.user.username.error.notFound': '{lang __literal=true}wcf.user.username.error.notFound{/lang}'
+			'wcf.moderation.activation.enableContent.confirmMessage': '{jslang}wcf.moderation.activation.enableContent.confirmMessage{/jslang}',
+			'wcf.moderation.activation.removeContent.confirmMessage': '{jslang}wcf.moderation.activation.removeContent.confirmMessage{/jslang}',
+			'wcf.moderation.assignedUser': '{jslang}wcf.moderation.assignedUser{/jslang}',
+			'wcf.moderation.assignedUser.error.notAffected': '{jslang}wcf.moderation.assignedUser.error.notAffected{/jslang}',
+			'wcf.moderation.status.outstanding': '{jslang}wcf.moderation.status.outstanding{/jslang}',
+			'wcf.moderation.status.processing': '{jslang}wcf.moderation.status.processing{/jslang}',
+			'wcf.user.username.error.notFound': '{jslang __literal=true}wcf.user.username.error.notFound{/jslang}'
 		});
 		
 		new WCF.Moderation.Activation.Management({@$queue->queueID}, '{link controller='ModerationList' encode=false}{/link}');
diff --git a/com.woltlab.wcf/templates/moderationReport.tpl b/com.woltlab.wcf/templates/moderationReport.tpl
index b32b643700..8c3942d792 100644
--- a/com.woltlab.wcf/templates/moderationReport.tpl
+++ b/com.woltlab.wcf/templates/moderationReport.tpl
@@ -108,15 +108,15 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.moderation.assignedUser': '{lang}wcf.moderation.assignedUser{/lang}',
-			'wcf.moderation.assignedUser.error.notAffected': '{lang}wcf.moderation.assignedUser.error.notAffected{/lang}',
-			'wcf.moderation.report.removeContent.confirmMessage': '{lang}wcf.moderation.report.removeContent.confirmMessage{/lang}',
-			'wcf.moderation.report.removeContent.reason': '{lang}wcf.moderation.report.removeContent.reason{/lang}',
-			'wcf.moderation.report.removeReport.confirmMessage': '{lang}wcf.moderation.report.removeReport.confirmMessage{/lang}',
-			'wcf.moderation.report.removeReport.markAsJustified': '{lang}wcf.moderation.report.removeReport.markAsJustified{/lang}',
-			'wcf.moderation.status.outstanding': '{lang}wcf.moderation.status.outstanding{/lang}',
-			'wcf.moderation.status.processing': '{lang}wcf.moderation.status.processing{/lang}',
-			'wcf.user.username.error.notFound': '{lang __literal=true}wcf.user.username.error.notFound{/lang}'
+			'wcf.moderation.assignedUser': '{jslang}wcf.moderation.assignedUser{/jslang}',
+			'wcf.moderation.assignedUser.error.notAffected': '{jslang}wcf.moderation.assignedUser.error.notAffected{/jslang}',
+			'wcf.moderation.report.removeContent.confirmMessage': '{jslang}wcf.moderation.report.removeContent.confirmMessage{/jslang}',
+			'wcf.moderation.report.removeContent.reason': '{jslang}wcf.moderation.report.removeContent.reason{/jslang}',
+			'wcf.moderation.report.removeReport.confirmMessage': '{jslang}wcf.moderation.report.removeReport.confirmMessage{/jslang}',
+			'wcf.moderation.report.removeReport.markAsJustified': '{jslang}wcf.moderation.report.removeReport.markAsJustified{/jslang}',
+			'wcf.moderation.status.outstanding': '{jslang}wcf.moderation.status.outstanding{/jslang}',
+			'wcf.moderation.status.processing': '{jslang}wcf.moderation.status.processing{/jslang}',
+			'wcf.user.username.error.notFound': '{jslang __literal=true}wcf.user.username.error.notFound{/jslang}'
 		});
 		
 		new WCF.Moderation.Report.Management({@$queue->queueID}, '{link controller='ModerationList' encode=false}{/link}');
diff --git a/com.woltlab.wcf/templates/multipleLanguageInputJavascript.tpl b/com.woltlab.wcf/templates/multipleLanguageInputJavascript.tpl
index 2570fd2dd5..875d3f0106 100644
--- a/com.woltlab.wcf/templates/multipleLanguageInputJavascript.tpl
+++ b/com.woltlab.wcf/templates/multipleLanguageInputJavascript.tpl
@@ -2,7 +2,7 @@
 	<script data-relocate="true">
 		require(['Language', 'WoltLabSuite/Core/Language/Input', 'WoltLabSuite/Core/Language/Text'], function(Language, LanguageInput, LanguageText) {
 			Language.addObject({
-				'wcf.global.button.disabledI18n': '{lang}wcf.global.button.disabledI18n{/lang}'
+				'wcf.global.button.disabledI18n': '{jslang}wcf.global.button.disabledI18n{/jslang}'
 			});
 			
 			var availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };
diff --git a/com.woltlab.wcf/templates/notificationList.tpl b/com.woltlab.wcf/templates/notificationList.tpl
index be9a1508e1..33338e7f13 100644
--- a/com.woltlab.wcf/templates/notificationList.tpl
+++ b/com.woltlab.wcf/templates/notificationList.tpl
@@ -114,8 +114,8 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.user.notification.markAsConfirmed': '{lang}wcf.user.notification.markAsConfirmed{/lang}',
-			'wcf.user.notification.markAllAsConfirmed.confirmMessage': '{lang}wcf.user.notification.markAllAsConfirmed.confirmMessage{/lang}'
+			'wcf.user.notification.markAsConfirmed': '{jslang}wcf.user.notification.markAsConfirmed{/jslang}',
+			'wcf.user.notification.markAllAsConfirmed.confirmMessage': '{jslang}wcf.user.notification.markAllAsConfirmed.confirmMessage{/jslang}'
 		});
 		
 		new WCF.Notification.List();
diff --git a/com.woltlab.wcf/templates/notificationSettings.tpl b/com.woltlab.wcf/templates/notificationSettings.tpl
index e9e00713c4..c374d74ff2 100644
--- a/com.woltlab.wcf/templates/notificationSettings.tpl
+++ b/com.woltlab.wcf/templates/notificationSettings.tpl
@@ -66,9 +66,9 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Controller/User/Notification/Settings'], function(Language, ControllerUserNotificationSettings) {
 		Language.addObject({
-			'wcf.user.notification.mailNotificationType.daily': '{lang}wcf.user.notification.mailNotificationType.daily{/lang}',
-			'wcf.user.notification.mailNotificationType.instant': '{lang}wcf.user.notification.mailNotificationType.instant{/lang}',
-			'wcf.user.notification.mailNotificationType.none': '{lang}wcf.user.notification.mailNotificationType.none{/lang}'
+			'wcf.user.notification.mailNotificationType.daily': '{jslang}wcf.user.notification.mailNotificationType.daily{/jslang}',
+			'wcf.user.notification.mailNotificationType.instant': '{jslang}wcf.user.notification.mailNotificationType.instant{/jslang}',
+			'wcf.user.notification.mailNotificationType.none': '{jslang}wcf.user.notification.mailNotificationType.none{/jslang}'
 		});
 		
 		ControllerUserNotificationSettings.init();
diff --git a/com.woltlab.wcf/templates/pageHeaderUser.tpl b/com.woltlab.wcf/templates/pageHeaderUser.tpl
index f48e6f2749..c4927dc879 100644
--- a/com.woltlab.wcf/templates/pageHeaderUser.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderUser.tpl
@@ -238,9 +238,9 @@
 					<script data-relocate="true">
 						$(function() {
 							WCF.Language.addObject({
-								'wcf.user.button.login': '{lang}wcf.user.button.login{/lang}',
-								'wcf.user.button.register': '{lang}wcf.user.button.register{/lang}',
-								'wcf.user.login': '{lang}wcf.user.login{/lang}'
+								'wcf.user.button.login': '{jslang}wcf.user.button.login{/jslang}',
+								'wcf.user.button.register': '{jslang}wcf.user.button.register{/jslang}',
+								'wcf.user.login': '{jslang}wcf.user.login{/jslang}'
 							});
 							new WCF.User.Login(true);
 						});
diff --git a/com.woltlab.wcf/templates/recentActivities.tpl b/com.woltlab.wcf/templates/recentActivities.tpl
index e114312549..cb05498a4f 100644
--- a/com.woltlab.wcf/templates/recentActivities.tpl
+++ b/com.woltlab.wcf/templates/recentActivities.tpl
@@ -2,8 +2,8 @@
 	<script data-relocate="true">
 		$(function() {
 			WCF.Language.addObject({
-				'wcf.user.recentActivity.more': '{lang}wcf.user.recentActivity.more{/lang}',
-				'wcf.user.recentActivity.noMoreEntries': '{lang}wcf.user.recentActivity.noMoreEntries{/lang}'
+				'wcf.user.recentActivity.more': '{jslang}wcf.user.recentActivity.more{/jslang}',
+				'wcf.user.recentActivity.noMoreEntries': '{jslang}wcf.user.recentActivity.noMoreEntries{/jslang}'
 			});
 			
 			new WCF.User.RecentActivityLoader({@$userID});
diff --git a/com.woltlab.wcf/templates/recentActivityList.tpl b/com.woltlab.wcf/templates/recentActivityList.tpl
index 0577fd9c4a..c55b2b40a9 100644
--- a/com.woltlab.wcf/templates/recentActivityList.tpl
+++ b/com.woltlab.wcf/templates/recentActivityList.tpl
@@ -23,8 +23,8 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.user.recentActivity.more': '{lang}wcf.user.recentActivity.more{/lang}',
-			'wcf.user.recentActivity.noMoreEntries': '{lang}wcf.user.recentActivity.noMoreEntries{/lang}'
+			'wcf.user.recentActivity.more': '{jslang}wcf.user.recentActivity.more{/jslang}',
+			'wcf.user.recentActivity.noMoreEntries': '{jslang}wcf.user.recentActivity.noMoreEntries{/jslang}'
 		});
 		
 		new WCF.User.RecentActivityLoader(null);
diff --git a/com.woltlab.wcf/templates/register.tpl b/com.woltlab.wcf/templates/register.tpl
index 82e871a32c..056b74dd98 100644
--- a/com.woltlab.wcf/templates/register.tpl
+++ b/com.woltlab.wcf/templates/register.tpl
@@ -223,14 +223,14 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.global.form.error.empty': '{lang}wcf.global.form.error.empty{/lang}',
-			'wcf.user.username.error.invalid': '{lang}wcf.user.username.error.invalid{/lang}',
-			'wcf.user.username.error.notUnique': '{lang}wcf.user.username.error.notUnique{/lang}',
-			'wcf.user.email.error.invalid' : '{lang}wcf.user.email.error.invalid{/lang}',
-			'wcf.user.email.error.notUnique' : '{lang}wcf.user.email.error.notUnique{/lang}',
-			'wcf.user.confirmEmail.error.notEqual' : '{lang}wcf.user.confirmEmail.error.notEqual{/lang}',
-			'wcf.user.password.error.notSecure' : '{lang}wcf.user.password.error.notSecure{/lang}',
-			'wcf.user.confirmPassword.error.notEqual' : '{lang}wcf.user.confirmPassword.error.notEqual{/lang}'
+			'wcf.global.form.error.empty': '{jslang}wcf.global.form.error.empty{/jslang}',
+			'wcf.user.username.error.invalid': '{jslang}wcf.user.username.error.invalid{/jslang}',
+			'wcf.user.username.error.notUnique': '{jslang}wcf.user.username.error.notUnique{/jslang}',
+			'wcf.user.email.error.invalid' : '{jslang}wcf.user.email.error.invalid{/jslang}',
+			'wcf.user.email.error.notUnique' : '{jslang}wcf.user.email.error.notUnique{/jslang}',
+			'wcf.user.confirmEmail.error.notEqual' : '{jslang}wcf.user.confirmEmail.error.notEqual{/jslang}',
+			'wcf.user.password.error.notSecure' : '{jslang}wcf.user.password.error.notSecure{/jslang}',
+			'wcf.user.confirmPassword.error.notEqual' : '{jslang}wcf.user.confirmPassword.error.notEqual{/jslang}'
 		});
 		
 		new WCF.User.Registration.Validation.EmailAddress($('#{@$randomFieldNames[email]}'), $('#{@$randomFieldNames[confirmEmail]}'), null);
diff --git a/com.woltlab.wcf/templates/scrollablePageCheckboxList.tpl b/com.woltlab.wcf/templates/scrollablePageCheckboxList.tpl
index 18a6e86269..d248dab411 100644
--- a/com.woltlab.wcf/templates/scrollablePageCheckboxList.tpl
+++ b/com.woltlab.wcf/templates/scrollablePageCheckboxList.tpl
@@ -1,13 +1,13 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Ui/ItemList/Filter'], function(Language, UiItemListFilter) {
 		Language.addObject({
-			'wcf.global.filter.button.visibility': '{lang}wcf.global.filter.button.visibility{/lang}',
-			'wcf.global.filter.button.clear': '{lang}wcf.global.filter.button.clear{/lang}',
-			'wcf.global.filter.error.noMatches': '{lang}wcf.global.filter.error.noMatches{/lang}',
-			'wcf.global.filter.placeholder': '{lang}wcf.global.filter.placeholder{/lang}',
-			'wcf.global.filter.visibility.activeOnly': '{lang}wcf.global.filter.visibility.activeOnly{/lang}',
-			'wcf.global.filter.visibility.highlightActive': '{lang}wcf.global.filter.visibility.highlightActive{/lang}',
-			'wcf.global.filter.visibility.showAll': '{lang}wcf.global.filter.visibility.showAll{/lang}'
+			'wcf.global.filter.button.visibility': '{jslang}wcf.global.filter.button.visibility{/jslang}',
+			'wcf.global.filter.button.clear': '{jslang}wcf.global.filter.button.clear{/jslang}',
+			'wcf.global.filter.error.noMatches': '{jslang}wcf.global.filter.error.noMatches{/jslang}',
+			'wcf.global.filter.placeholder': '{jslang}wcf.global.filter.placeholder{/jslang}',
+			'wcf.global.filter.visibility.activeOnly': '{jslang}wcf.global.filter.visibility.activeOnly{/jslang}',
+			'wcf.global.filter.visibility.highlightActive': '{jslang}wcf.global.filter.visibility.highlightActive{/jslang}',
+			'wcf.global.filter.visibility.showAll': '{jslang}wcf.global.filter.visibility.showAll{/jslang}'
 		});
 		
 		new UiItemListFilter('{@$pageCheckboxListContainerID}');
diff --git a/com.woltlab.wcf/templates/signatureEdit.tpl b/com.woltlab.wcf/templates/signatureEdit.tpl
index 2049c5bff9..45065e2eb8 100644
--- a/com.woltlab.wcf/templates/signatureEdit.tpl
+++ b/com.woltlab.wcf/templates/signatureEdit.tpl
@@ -69,7 +69,7 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.global.preview': '{lang}wcf.global.preview{/lang}'
+			'wcf.global.preview': '{jslang}wcf.global.preview{/jslang}'
 		});
 		
 		new WCF.User.SignaturePreview('wcf\\data\\user\\UserProfileAction', 'text', 'previewButton');
diff --git a/com.woltlab.wcf/templates/spoilerMetaCode.tpl b/com.woltlab.wcf/templates/spoilerMetaCode.tpl
index aef1d4232d..6dfa845694 100644
--- a/com.woltlab.wcf/templates/spoilerMetaCode.tpl
+++ b/com.woltlab.wcf/templates/spoilerMetaCode.tpl
@@ -10,8 +10,8 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Bbcode/Spoiler'], function (Language, BbcodeSpoiler) {
 		Language.addObject({
-			'wcf.bbcode.spoiler.hide' : '{lang}wcf.bbcode.spoiler.hide{/lang}',
-			'wcf.bbcode.spoiler.show' : '{lang}wcf.bbcode.spoiler.show{/lang}'
+			'wcf.bbcode.spoiler.hide' : '{jslang}wcf.bbcode.spoiler.hide{/jslang}',
+			'wcf.bbcode.spoiler.show' : '{jslang}wcf.bbcode.spoiler.show{/jslang}'
 		});
 		
 		BbcodeSpoiler.observe();
diff --git a/com.woltlab.wcf/templates/team.tpl b/com.woltlab.wcf/templates/team.tpl
index 5be88c3716..e8b47c96de 100644
--- a/com.woltlab.wcf/templates/team.tpl
+++ b/com.woltlab.wcf/templates/team.tpl
@@ -28,10 +28,10 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.user.button.follow': '{lang}wcf.user.button.follow{/lang}',
-			'wcf.user.button.ignore': '{lang}wcf.user.button.ignore{/lang}',
-			'wcf.user.button.unfollow': '{lang}wcf.user.button.unfollow{/lang}',
-			'wcf.user.button.unignore': '{lang}wcf.user.button.unignore{/lang}'
+			'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
+			'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
+			'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
+			'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
 		});
 		
 		new WCF.User.Action.Follow($('.userList > li'));
diff --git a/com.woltlab.wcf/templates/unreadArticleList.tpl b/com.woltlab.wcf/templates/unreadArticleList.tpl
index db54d216f8..26f5e56607 100644
--- a/com.woltlab.wcf/templates/unreadArticleList.tpl
+++ b/com.woltlab.wcf/templates/unreadArticleList.tpl
@@ -35,8 +35,8 @@
 		<script data-relocate="true">
 			$(function() {
 				WCF.Language.addObject({
-					'wcf.label.none': '{lang}wcf.label.none{/lang}',
-					'wcf.label.withoutSelection': '{lang}wcf.label.withoutSelection{/lang}'
+					'wcf.label.none': '{jslang}wcf.label.none{/jslang}',
+					'wcf.label.withoutSelection': '{jslang}wcf.label.withoutSelection{/jslang}'
 				});
 				
 				new WCF.Label.Chooser({ {implode from=$labelIDs key=groupID item=labelID}{@$groupID}: {@$labelID}{/implode} }, '#sidebarForm', undefined, true);
diff --git a/com.woltlab.wcf/templates/uploadFieldComponent.tpl b/com.woltlab.wcf/templates/uploadFieldComponent.tpl
index bd736ee225..795d6c5a16 100644
--- a/com.woltlab.wcf/templates/uploadFieldComponent.tpl
+++ b/com.woltlab.wcf/templates/uploadFieldComponent.tpl
@@ -35,8 +35,8 @@
 <script data-relocate="true">
 	require(['WoltLabSuite/Core/Ui/File/Upload', 'Language'], function(Upload, Language) {
 		Language.addObject({
-			'wcf.upload.error.reachedRemainingLimit': '{lang __literal=true}wcf.upload.error.reachedRemainingLimit{/lang}',
-			'wcf.upload.error.noImage': '{lang}wcf.upload.error.noImage{/lang}'
+			'wcf.upload.error.reachedRemainingLimit': '{jslang __literal=true}wcf.upload.error.reachedRemainingLimit{/jslang}',
+			'wcf.upload.error.noImage': '{jslang}wcf.upload.error.noImage{/jslang}'
 		});
 		
 		new Upload("{$uploadFieldId}UploadButtonDiv", "{$uploadFieldId}uploadFileList", {
diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl
index 8841ad87df..50aee00090 100644
--- a/com.woltlab.wcf/templates/user.tpl
+++ b/com.woltlab.wcf/templates/user.tpl
@@ -6,39 +6,39 @@
 		{if $__wcf->getUser()->userID && $__wcf->getUser()->userID != $user->userID}
 			require(['Language', 'WoltLabSuite/Core/Ui/User/Editor', 'WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Ignore', 'WoltLabSuite/Core/Ui/User/Profile/Menu/Item/Follow'], function(Language, UiUserEditor, UiUserProfileMenuItemIgnore, UiUserProfileMenuItemFollow) {
 				Language.addObject({
-					'wcf.acp.user.disable': '{lang}wcf.acp.user.disable{/lang}',
-					'wcf.acp.user.enable': '{lang}wcf.acp.user.enable{/lang}',
-					'wcf.user.ban': '{lang}wcf.user.ban{/lang}',
+					'wcf.acp.user.disable': '{jslang}wcf.acp.user.disable{/jslang}',
+					'wcf.acp.user.enable': '{jslang}wcf.acp.user.enable{/jslang}',
+					'wcf.user.ban': '{jslang}wcf.user.ban{/jslang}',
 					'wcf.user.banned': '{"wcf.user.banned"|language|encodeJS}',
-					'wcf.user.ban.confirmMessage': '{lang}wcf.user.ban.confirmMessage{/lang}',
-					'wcf.user.ban.expires': '{lang}wcf.user.ban.expires{/lang}',
-					'wcf.user.ban.expires.description': '{lang}wcf.user.ban.expires.description{/lang}',
-					'wcf.user.ban.neverExpires': '{lang}wcf.user.ban.neverExpires{/lang}',
-					'wcf.user.ban.reason.description': '{lang}wcf.user.ban.reason.description{/lang}',
-					'wcf.user.button.follow': '{lang}wcf.user.button.follow{/lang}',
-					'wcf.user.button.unfollow': '{lang}wcf.user.button.unfollow{/lang}',
-					'wcf.user.button.ignore': '{lang}wcf.user.button.ignore{/lang}',
-					'wcf.user.button.unignore': '{lang}wcf.user.button.unignore{/lang}',
-					'wcf.user.disableAvatar': '{lang}wcf.user.disableAvatar{/lang}',
-					'wcf.user.disableAvatar.confirmMessage': '{lang}wcf.user.disableAvatar.confirmMessage{/lang}',
-					'wcf.user.disableAvatar.expires': '{lang}wcf.user.disableAvatar.expires{/lang}',
-					'wcf.user.disableAvatar.expires.description': '{lang}wcf.user.disableAvatar.expires.description{/lang}',
-					'wcf.user.disableAvatar.neverExpires': '{lang}wcf.user.disableAvatar.neverExpires{/lang}',
-					'wcf.user.disableCoverPhoto': '{lang}wcf.user.disableCoverPhoto{/lang}',
-					'wcf.user.disableCoverPhoto.confirmMessage': '{lang}wcf.user.disableCoverPhoto.confirmMessage{/lang}',
-					'wcf.user.disableCoverPhoto.expires': '{lang}wcf.user.disableCoverPhoto.expires{/lang}',
-					'wcf.user.disableCoverPhoto.expires.description': '{lang}wcf.user.disableCoverPhoto.expires.description{/lang}',
-					'wcf.user.disableCoverPhoto.neverExpires': '{lang}wcf.user.disableCoverPhoto.neverExpires{/lang}',
-					'wcf.user.disableSignature': '{lang}wcf.user.disableSignature{/lang}',
-					'wcf.user.disableSignature.confirmMessage': '{lang}wcf.user.disableSignature.confirmMessage{/lang}',
-					'wcf.user.disableSignature.expires': '{lang}wcf.user.disableSignature.expires{/lang}',
-					'wcf.user.disableSignature.expires.description': '{lang}wcf.user.disableSignature.expires.description{/lang}',
-					'wcf.user.disableSignature.neverExpires': '{lang}wcf.user.disableSignature.neverExpires{/lang}',
-					'wcf.user.edit': '{lang}wcf.user.edit{/lang}',
-					'wcf.user.enableAvatar': '{lang}wcf.user.enableAvatar{/lang}',
-					'wcf.user.enableCoverPhoto': '{lang}wcf.user.enableCoverPhoto{/lang}',
-					'wcf.user.enableSignature': '{lang}wcf.user.enableSignature{/lang}',
-					'wcf.user.unban': '{lang}wcf.user.unban{/lang}'
+					'wcf.user.ban.confirmMessage': '{jslang}wcf.user.ban.confirmMessage{/jslang}',
+					'wcf.user.ban.expires': '{jslang}wcf.user.ban.expires{/jslang}',
+					'wcf.user.ban.expires.description': '{jslang}wcf.user.ban.expires.description{/jslang}',
+					'wcf.user.ban.neverExpires': '{jslang}wcf.user.ban.neverExpires{/jslang}',
+					'wcf.user.ban.reason.description': '{jslang}wcf.user.ban.reason.description{/jslang}',
+					'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
+					'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
+					'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
+					'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}',
+					'wcf.user.disableAvatar': '{jslang}wcf.user.disableAvatar{/jslang}',
+					'wcf.user.disableAvatar.confirmMessage': '{jslang}wcf.user.disableAvatar.confirmMessage{/jslang}',
+					'wcf.user.disableAvatar.expires': '{jslang}wcf.user.disableAvatar.expires{/jslang}',
+					'wcf.user.disableAvatar.expires.description': '{jslang}wcf.user.disableAvatar.expires.description{/jslang}',
+					'wcf.user.disableAvatar.neverExpires': '{jslang}wcf.user.disableAvatar.neverExpires{/jslang}',
+					'wcf.user.disableCoverPhoto': '{jslang}wcf.user.disableCoverPhoto{/jslang}',
+					'wcf.user.disableCoverPhoto.confirmMessage': '{jslang}wcf.user.disableCoverPhoto.confirmMessage{/jslang}',
+					'wcf.user.disableCoverPhoto.expires': '{jslang}wcf.user.disableCoverPhoto.expires{/jslang}',
+					'wcf.user.disableCoverPhoto.expires.description': '{jslang}wcf.user.disableCoverPhoto.expires.description{/jslang}',
+					'wcf.user.disableCoverPhoto.neverExpires': '{jslang}wcf.user.disableCoverPhoto.neverExpires{/jslang}',
+					'wcf.user.disableSignature': '{jslang}wcf.user.disableSignature{/jslang}',
+					'wcf.user.disableSignature.confirmMessage': '{jslang}wcf.user.disableSignature.confirmMessage{/jslang}',
+					'wcf.user.disableSignature.expires': '{jslang}wcf.user.disableSignature.expires{/jslang}',
+					'wcf.user.disableSignature.expires.description': '{jslang}wcf.user.disableSignature.expires.description{/jslang}',
+					'wcf.user.disableSignature.neverExpires': '{jslang}wcf.user.disableSignature.neverExpires{/jslang}',
+					'wcf.user.edit': '{jslang}wcf.user.edit{/jslang}',
+					'wcf.user.enableAvatar': '{jslang}wcf.user.enableAvatar{/jslang}',
+					'wcf.user.enableCoverPhoto': '{jslang}wcf.user.enableCoverPhoto{/jslang}',
+					'wcf.user.enableSignature': '{jslang}wcf.user.enableSignature{/jslang}',
+					'wcf.user.unban': '{jslang}wcf.user.unban{/jslang}'
 				});
 				
 				{if $isAccessible}
@@ -58,7 +58,7 @@
 		$(function() {
 			{if $__wcf->getUser()->userID && $__wcf->getUser()->userID != $user->userID}
 				WCF.Language.addObject({
-					'wcf.user.activityPoint': '{lang}wcf.user.activityPoint{/lang}'
+					'wcf.user.activityPoint': '{jslang}wcf.user.activityPoint{/jslang}'
 				});
 			{/if}
 			
@@ -66,7 +66,7 @@
 			
 			{if $user->canEdit() || ($__wcf->getUser()->userID == $user->userID && $user->canEditOwnProfile())}
 				WCF.Language.addObject({
-					'wcf.user.editProfile': '{lang}wcf.user.editProfile{/lang}'
+					'wcf.user.editProfile': '{jslang}wcf.user.editProfile{/jslang}'
 				});
 				
 				var userProfileEditor = new WCF.User.Profile.Editor({@$user->userID}, {if $editOnInit}true{else}false{/if});
@@ -115,8 +115,8 @@
 			
 			{if $__wcf->session->getPermission('user.profile.canReportContent')}
 				WCF.Language.addObject({
-					'wcf.moderation.report.reportContent': '{lang}wcf.user.profile.report{/lang}',
-					'wcf.moderation.report.success': '{lang}wcf.moderation.report.success{/lang}'
+					'wcf.moderation.report.reportContent': '{jslang}wcf.user.profile.report{/jslang}',
+					'wcf.moderation.report.success': '{jslang}wcf.moderation.report.success{/jslang}'
 				});
 				new WCF.Moderation.Report.Content('com.woltlab.wcf.user', '.jsReportUser');
 			{/if}
@@ -370,11 +370,11 @@
 		<script data-relocate="true">
 			require(['Language', 'WoltLabSuite/Core/Ui/User/CoverPhoto/Upload'], function (Language, UiUserCoverPhotoUpload) {
 				Language.addObject({
-					'wcf.user.coverPhoto.delete.confirmMessage': '{lang}wcf.user.coverPhoto.delete.confirmMessage{/lang}',
-					'wcf.user.coverPhoto.upload.error.fileExtension': '{lang}wcf.user.coverPhoto.upload.error.fileExtension{/lang}',
-					'wcf.user.coverPhoto.upload.error.tooLarge': '{lang}wcf.user.coverPhoto.upload.error.tooLarge{/lang}',
-					'wcf.user.coverPhoto.upload.error.uploadFailed': '{lang}wcf.user.coverPhoto.upload.error.uploadFailed{/lang}',
-					'wcf.user.coverPhoto.upload.error.badImage': '{lang}wcf.user.coverPhoto.upload.error.badImage{/lang}'
+					'wcf.user.coverPhoto.delete.confirmMessage': '{jslang}wcf.user.coverPhoto.delete.confirmMessage{/jslang}',
+					'wcf.user.coverPhoto.upload.error.fileExtension': '{jslang}wcf.user.coverPhoto.upload.error.fileExtension{/jslang}',
+					'wcf.user.coverPhoto.upload.error.tooLarge': '{jslang}wcf.user.coverPhoto.upload.error.tooLarge{/jslang}',
+					'wcf.user.coverPhoto.upload.error.uploadFailed': '{jslang}wcf.user.coverPhoto.upload.error.uploadFailed{/jslang}',
+					'wcf.user.coverPhoto.upload.error.badImage': '{jslang}wcf.user.coverPhoto.upload.error.badImage{/jslang}'
 				});
 				
 				{if !$__wcf->user->disableCoverPhoto}
@@ -386,7 +386,7 @@
 	<script data-relocate="true">
 		require(['Language', 'WoltLabSuite/Core/Ui/User/CoverPhoto/Delete'], function (Language, UiUserCoverPhotoDelete) {
 			Language.addObject({
-				'wcf.user.coverPhoto.delete.confirmMessage': '{lang}wcf.user.coverPhoto.delete.confirmMessage{/lang}'
+				'wcf.user.coverPhoto.delete.confirmMessage': '{jslang}wcf.user.coverPhoto.delete.confirmMessage{/jslang}'
 			});
 			
 			UiUserCoverPhotoDelete.init({@$user->userID});
diff --git a/com.woltlab.wcf/templates/userBirthdayList.tpl b/com.woltlab.wcf/templates/userBirthdayList.tpl
index 245abdf21a..2ad11bec35 100644
--- a/com.woltlab.wcf/templates/userBirthdayList.tpl
+++ b/com.woltlab.wcf/templates/userBirthdayList.tpl
@@ -39,10 +39,10 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.user.button.follow': '{lang}wcf.user.button.follow{/lang}',
-			'wcf.user.button.ignore': '{lang}wcf.user.button.ignore{/lang}',
-			'wcf.user.button.unfollow': '{lang}wcf.user.button.unfollow{/lang}',
-			'wcf.user.button.unignore': '{lang}wcf.user.button.unignore{/lang}'
+			'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
+			'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
+			'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
+			'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
 		});
 		
 		new WCF.User.Action.Follow($('.jsGroupedUserList > li'));
diff --git a/com.woltlab.wcf/templates/userProfileLikes.tpl b/com.woltlab.wcf/templates/userProfileLikes.tpl
index 64f0b3c93d..0793793227 100644
--- a/com.woltlab.wcf/templates/userProfileLikes.tpl
+++ b/com.woltlab.wcf/templates/userProfileLikes.tpl
@@ -1,8 +1,8 @@
 <script data-relocate="true">
 	require(['WoltLabSuite/Core/Ui/Reaction/Profile/Loader', 'Language'], function(UiReactionProfileLoader, Language) {
 		Language.addObject({
-			'wcf.like.reaction.noMoreEntries': '{lang}wcf.like.reaction.noMoreEntries{/lang}',
-			'wcf.like.reaction.more': '{lang}wcf.like.reaction.more{/lang}'
+			'wcf.like.reaction.noMoreEntries': '{jslang}wcf.like.reaction.noMoreEntries{/jslang}',
+			'wcf.like.reaction.more': '{jslang}wcf.like.reaction.more{/jslang}'
 		});
 		
 		new UiReactionProfileLoader({@$userID});
@@ -26,4 +26,4 @@
 	</li>
 	
 	{include file='userProfileLikeItem'}
-</ul>
\ No newline at end of file
+</ul>
diff --git a/com.woltlab.wcf/templates/userProfilePreview.tpl b/com.woltlab.wcf/templates/userProfilePreview.tpl
index 3106c79bdd..217ac915df 100644
--- a/com.woltlab.wcf/templates/userProfilePreview.tpl
+++ b/com.woltlab.wcf/templates/userProfilePreview.tpl
@@ -51,10 +51,10 @@
 			<script data-relocate="true">
 				$(function() {
 					WCF.Language.addObject({
-						'wcf.user.button.follow': '{lang}wcf.user.button.follow{/lang}',
-						'wcf.user.button.ignore': '{lang}wcf.user.button.ignore{/lang}',
-						'wcf.user.button.unfollow': '{lang}wcf.user.button.unfollow{/lang}',
-						'wcf.user.button.unignore': '{lang}wcf.user.button.unignore{/lang}'
+						'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
+						'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
+						'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
+						'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
 					});
 					
 					new WCF.User.Action.Follow($('.userInformation'));
diff --git a/com.woltlab.wcf/templates/usersOnlineList.tpl b/com.woltlab.wcf/templates/usersOnlineList.tpl
index c4a3a5463c..513ef58d08 100644
--- a/com.woltlab.wcf/templates/usersOnlineList.tpl
+++ b/com.woltlab.wcf/templates/usersOnlineList.tpl
@@ -227,10 +227,10 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.user.button.follow': '{lang}wcf.user.button.follow{/lang}',
-			'wcf.user.button.ignore': '{lang}wcf.user.button.ignore{/lang}',
-			'wcf.user.button.unfollow': '{lang}wcf.user.button.unfollow{/lang}',
-			'wcf.user.button.unignore': '{lang}wcf.user.button.unignore{/lang}'
+			'wcf.user.button.follow': '{jslang}wcf.user.button.follow{/jslang}',
+			'wcf.user.button.ignore': '{jslang}wcf.user.button.ignore{/jslang}',
+			'wcf.user.button.unfollow': '{jslang}wcf.user.button.unfollow{/jslang}',
+			'wcf.user.button.unignore': '{jslang}wcf.user.button.unignore{/jslang}'
 		});
 		
 		new WCF.User.Action.Follow($('.userList > li'));
diff --git a/com.woltlab.wcf/templates/watchedArticleList.tpl b/com.woltlab.wcf/templates/watchedArticleList.tpl
index 6d6ca7a759..3249368cd9 100644
--- a/com.woltlab.wcf/templates/watchedArticleList.tpl
+++ b/com.woltlab.wcf/templates/watchedArticleList.tpl
@@ -33,8 +33,8 @@
 		<script data-relocate="true">
 			$(function() {
 				WCF.Language.addObject({
-					'wcf.label.none': '{lang}wcf.label.none{/lang}',
-					'wcf.label.withoutSelection': '{lang}wcf.label.withoutSelection{/lang}'
+					'wcf.label.none': '{jslang}wcf.label.none{/jslang}',
+					'wcf.label.withoutSelection': '{jslang}wcf.label.withoutSelection{/jslang}'
 				});
 				
 				new WCF.Label.Chooser({ {implode from=$labelIDs key=groupID item=labelID}{@$groupID}: {@$labelID}{/implode} }, '#sidebarForm', undefined, true);
diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl
index 9c4b104649..17c5ce2844 100644
--- a/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@ -56,65 +56,65 @@
 	], function () {
 		require(['Environment', 'Language', 'WoltLabSuite/Core/Ui/Redactor/Autosave', 'WoltLabSuite/Core/Ui/Redactor/Metacode'], function(Environment, Language, UiRedactorAutosave, UiRedactorMetacode) {
 			Language.addObject({
-				'wcf.attachment.dragAndDrop.dropHere': '{lang}wcf.attachment.dragAndDrop.dropHere{/lang}',
-				'wcf.attachment.dragAndDrop.dropNow': '{lang}wcf.attachment.dragAndDrop.dropNow{/lang}',
+				'wcf.attachment.dragAndDrop.dropHere': '{jslang}wcf.attachment.dragAndDrop.dropHere{/jslang}',
+				'wcf.attachment.dragAndDrop.dropNow': '{jslang}wcf.attachment.dragAndDrop.dropNow{/jslang}',
 				
-				'wcf.editor.autosave.discard': '{lang}wcf.editor.autosave.discard{/lang}',
-				'wcf.editor.autosave.keep': '{lang}wcf.editor.autosave.keep{/lang}',
-				'wcf.editor.autosave.restored': '{lang}wcf.editor.autosave.restored{/lang}',
+				'wcf.editor.autosave.discard': '{jslang}wcf.editor.autosave.discard{/jslang}',
+				'wcf.editor.autosave.keep': '{jslang}wcf.editor.autosave.keep{/jslang}',
+				'wcf.editor.autosave.restored': '{jslang}wcf.editor.autosave.restored{/jslang}',
 				
-				'wcf.editor.code.edit': '{lang}wcf.editor.code.edit{/lang}',
-				'wcf.editor.code.file': '{lang}wcf.editor.code.file{/lang}',
-				'wcf.editor.code.file.description': '{lang}wcf.editor.code.file.description{/lang}',
-				'wcf.editor.code.highlighter': '{lang}wcf.editor.code.highlighter{/lang}',
-				'wcf.editor.code.highlighter.description': '{lang}wcf.editor.code.highlighter.description{/lang}',
-				'wcf.editor.code.highlighter.detect': '{lang}wcf.editor.code.highlighter.detect{/lang}',
-				'wcf.editor.code.highlighter.plain': '{lang}wcf.editor.code.highlighter.plain{/lang}',
-				'wcf.editor.code.line': '{lang}wcf.editor.code.line{/lang}',
-				'wcf.editor.code.line.description': '{lang}wcf.editor.code.line.description{/lang}',
-				'wcf.editor.code.title': '{lang __literal=true}wcf.editor.code.title{/lang}',
+				'wcf.editor.code.edit': '{jslang}wcf.editor.code.edit{/jslang}',
+				'wcf.editor.code.file': '{jslang}wcf.editor.code.file{/jslang}',
+				'wcf.editor.code.file.description': '{jslang}wcf.editor.code.file.description{/jslang}',
+				'wcf.editor.code.highlighter': '{jslang}wcf.editor.code.highlighter{/jslang}',
+				'wcf.editor.code.highlighter.description': '{jslang}wcf.editor.code.highlighter.description{/jslang}',
+				'wcf.editor.code.highlighter.detect': '{jslang}wcf.editor.code.highlighter.detect{/jslang}',
+				'wcf.editor.code.highlighter.plain': '{jslang}wcf.editor.code.highlighter.plain{/jslang}',
+				'wcf.editor.code.line': '{jslang}wcf.editor.code.line{/jslang}',
+				'wcf.editor.code.line.description': '{jslang}wcf.editor.code.line.description{/jslang}',
+				'wcf.editor.code.title': '{jslang __literal=true}wcf.editor.code.title{/jslang}',
 				
-				'wcf.editor.html.description': '{lang}wcf.editor.html.description{/lang}',
-				'wcf.editor.html.title': '{lang}wcf.editor.html.title{/lang}',
+				'wcf.editor.html.description': '{jslang}wcf.editor.html.description{/jslang}',
+				'wcf.editor.html.title': '{jslang}wcf.editor.html.title{/jslang}',
 				
-				'wcf.editor.image.edit': '{lang}wcf.editor.image.edit{/lang}',
-				'wcf.editor.image.insert': '{lang}wcf.editor.image.insert{/lang}',
-				'wcf.editor.image.link': '{lang}wcf.editor.image.link{/lang}',
-				'wcf.editor.image.link.error.invalid': '{lang}wcf.editor.image.link.error.invalid{/lang}',
-				'wcf.editor.image.float': '{lang}wcf.editor.image.float{/lang}',
-				'wcf.editor.image.float.left': '{lang}wcf.editor.image.float.left{/lang}',
-				'wcf.editor.image.float.right': '{lang}wcf.editor.image.float.right{/lang}',
-				'wcf.editor.image.source': '{lang}wcf.editor.image.source{/lang}',
-				'wcf.editor.image.source.error.blocked': '{lang}wcf.editor.image.source.error.blocked{/lang}',
-				'wcf.editor.image.source.error.insecure': '{lang}wcf.editor.image.source.error.insecure{/lang}',
-				'wcf.editor.image.source.error.invalid': '{lang}wcf.editor.image.source.error.invalid{/lang}',
+				'wcf.editor.image.edit': '{jslang}wcf.editor.image.edit{/jslang}',
+				'wcf.editor.image.insert': '{jslang}wcf.editor.image.insert{/jslang}',
+				'wcf.editor.image.link': '{jslang}wcf.editor.image.link{/jslang}',
+				'wcf.editor.image.link.error.invalid': '{jslang}wcf.editor.image.link.error.invalid{/jslang}',
+				'wcf.editor.image.float': '{jslang}wcf.editor.image.float{/jslang}',
+				'wcf.editor.image.float.left': '{jslang}wcf.editor.image.float.left{/jslang}',
+				'wcf.editor.image.float.right': '{jslang}wcf.editor.image.float.right{/jslang}',
+				'wcf.editor.image.source': '{jslang}wcf.editor.image.source{/jslang}',
+				'wcf.editor.image.source.error.blocked': '{jslang}wcf.editor.image.source.error.blocked{/jslang}',
+				'wcf.editor.image.source.error.insecure': '{jslang}wcf.editor.image.source.error.insecure{/jslang}',
+				'wcf.editor.image.source.error.invalid': '{jslang}wcf.editor.image.source.error.invalid{/jslang}',
 				
-				'wcf.editor.link.add': '{lang}wcf.editor.link.add{/lang}',
-				'wcf.editor.link.edit': '{lang}wcf.editor.link.edit{/lang}',
-				'wcf.editor.link.error.invalid': '{lang}wcf.editor.link.error.invalid{/lang}',
-				'wcf.editor.link.url': '{lang}wcf.editor.link.url{/lang}',
-				'wcf.editor.link.text': '{lang}wcf.editor.link.text{/lang}',
+				'wcf.editor.link.add': '{jslang}wcf.editor.link.add{/jslang}',
+				'wcf.editor.link.edit': '{jslang}wcf.editor.link.edit{/jslang}',
+				'wcf.editor.link.error.invalid': '{jslang}wcf.editor.link.error.invalid{/jslang}',
+				'wcf.editor.link.url': '{jslang}wcf.editor.link.url{/jslang}',
+				'wcf.editor.link.text': '{jslang}wcf.editor.link.text{/jslang}',
 				
-				'wcf.editor.list.indent': '{lang}wcf.editor.list.indent{/lang}',
-				'wcf.editor.list.outdent': '{lang}wcf.editor.list.outdent{/lang}',
+				'wcf.editor.list.indent': '{jslang}wcf.editor.list.indent{/jslang}',
+				'wcf.editor.list.outdent': '{jslang}wcf.editor.list.outdent{/jslang}',
 				
-				'wcf.editor.quote.author': '{lang}wcf.editor.quote.author{/lang}',
-				'wcf.editor.quote.edit': '{lang}wcf.editor.quote.edit{/lang}',
-				'wcf.editor.quote.title': '{lang __literal=true}wcf.editor.quote.title{/lang}',
-				'wcf.editor.quote.url': '{lang}wcf.editor.quote.url{/lang}',
-				'wcf.editor.quote.url.description': '{lang}wcf.editor.quote.url.description{/lang}',
-				'wcf.editor.quote.url.error.invalid': '{lang}wcf.editor.quote.url.error.invalid{/lang}',
+				'wcf.editor.quote.author': '{jslang}wcf.editor.quote.author{/jslang}',
+				'wcf.editor.quote.edit': '{jslang}wcf.editor.quote.edit{/jslang}',
+				'wcf.editor.quote.title': '{jslang __literal=true}wcf.editor.quote.title{/jslang}',
+				'wcf.editor.quote.url': '{jslang}wcf.editor.quote.url{/jslang}',
+				'wcf.editor.quote.url.description': '{jslang}wcf.editor.quote.url.description{/jslang}',
+				'wcf.editor.quote.url.error.invalid': '{jslang}wcf.editor.quote.url.error.invalid{/jslang}',
 				
-				'wcf.editor.table.cols': '{lang}wcf.editor.table.cols{/lang}',
-				'wcf.editor.table.insertTable': '{lang}wcf.editor.table.insertTable{/lang}',
-				'wcf.editor.table.rows': '{lang}wcf.editor.table.rows{/lang}',
+				'wcf.editor.table.cols': '{jslang}wcf.editor.table.cols{/jslang}',
+				'wcf.editor.table.insertTable': '{jslang}wcf.editor.table.insertTable{/jslang}',
+				'wcf.editor.table.rows': '{jslang}wcf.editor.table.rows{/jslang}',
 				
-				'wcf.editor.source.error.active': '{lang}wcf.editor.source.error.active{/lang}',
+				'wcf.editor.source.error.active': '{jslang}wcf.editor.source.error.active{/jslang}',
 				
-				'wcf.editor.spoiler.label': '{lang}wcf.editor.spoiler.label{/lang}',
-				'wcf.editor.spoiler.label.description': '{lang}wcf.editor.spoiler.label.description{/lang}',
-				'wcf.editor.spoiler.edit': '{lang}wcf.editor.spoiler.edit{/lang}',
-				'wcf.editor.spoiler.title': '{lang __literal=true}wcf.editor.spoiler.title{/lang}'
+				'wcf.editor.spoiler.label': '{jslang}wcf.editor.spoiler.label{/jslang}',
+				'wcf.editor.spoiler.label.description': '{jslang}wcf.editor.spoiler.label.description{/jslang}',
+				'wcf.editor.spoiler.edit': '{jslang}wcf.editor.spoiler.edit{/jslang}',
+				'wcf.editor.spoiler.title': '{jslang __literal=true}wcf.editor.spoiler.title{/jslang}'
 			});
 			
 			var allowedInlineStyles = [], buttons = [], buttonMobile = [], buttonOptions = [], customButtons = [];
@@ -137,7 +137,7 @@
 			var config = {
 				buttons: buttons,
 				clipboardImageUpload: {if $__wcf->getBBCodeHandler()->isAvailableBBCode('attach')}true{else}false{/if},
-				direction: '{lang}wcf.global.pageDirection{/lang}',
+				direction: '{jslang}wcf.global.pageDirection{/jslang}',
 				formatting: ['p', 'h2', 'h3', 'h4'],
 				imageCaption: false,
 				imageUpload: {if $__wcf->getBBCodeHandler()->isAvailableBBCode('attach')}true{else}false{/if},
@@ -145,45 +145,45 @@
 				langs: {
 					wsc: {
 						// general
-						edit: '{lang}wcf.global.button.edit{/lang}',
+						edit: '{jslang}wcf.global.button.edit{/jslang}',
 						
 						// formatting dropdown
-						heading2: '{lang}wcf.editor.format.heading2{/lang}',
-						heading3: '{lang}wcf.editor.format.heading3{/lang}',
-						heading4: '{lang}wcf.editor.format.heading4{/lang}',
-						paragraph: '{lang}wcf.editor.format.paragraph{/lang}',
+						heading2: '{jslang}wcf.editor.format.heading2{/jslang}',
+						heading3: '{jslang}wcf.editor.format.heading3{/jslang}',
+						heading4: '{jslang}wcf.editor.format.heading4{/jslang}',
+						paragraph: '{jslang}wcf.editor.format.paragraph{/jslang}',
 						
 						// links
-						'link-edit': '{lang}wcf.editor.link.edit{/lang}',
-						'link-insert': '{lang}wcf.editor.link.add{/lang}',
-						unlink: '{lang}wcf.editor.link.unlink{/lang}',
+						'link-edit': '{jslang}wcf.editor.link.edit{/jslang}',
+						'link-insert': '{jslang}wcf.editor.link.add{/jslang}',
+						unlink: '{jslang}wcf.editor.link.unlink{/jslang}',
 						
 						// text alignment
-						'align-center': '{lang}wcf.editor.alignment.center{/lang}',
-						'align-justify': '{lang}wcf.editor.alignment.justify{/lang}',
-						'align-left': '{lang}wcf.editor.alignment.left{/lang}',
-						'align-right': '{lang}wcf.editor.alignment.right{/lang}',
+						'align-center': '{jslang}wcf.editor.alignment.center{/jslang}',
+						'align-justify': '{jslang}wcf.editor.alignment.justify{/jslang}',
+						'align-left': '{jslang}wcf.editor.alignment.left{/jslang}',
+						'align-right': '{jslang}wcf.editor.alignment.right{/jslang}',
 						
 						// table plugin
-						'add-head': '{lang}wcf.editor.table.addHead{/lang}',
-						'delete-column': '{lang}wcf.editor.table.deleteColumn{/lang}',
-						'delete-head': '{lang}wcf.editor.table.deleteHead{/lang}',
-						'delete-row': '{lang}wcf.editor.table.deleteRow{/lang}',
-						'delete-table': '{lang}wcf.editor.table.deleteTable{/lang}',
-						'insert-table': '{lang}wcf.editor.table.insertTable{/lang}',
-						'insert-column-left': '{lang}wcf.editor.table.insertColumnLeft{/lang}',
-						'insert-column-right': '{lang}wcf.editor.table.insertColumnRight{/lang}',
-						'insert-row-above': '{lang}wcf.editor.table.insertRowAbove{/lang}',
-						'insert-row-below': '{lang}wcf.editor.table.insertRowBelow{/lang}',
+						'add-head': '{jslang}wcf.editor.table.addHead{/jslang}',
+						'delete-column': '{jslang}wcf.editor.table.deleteColumn{/jslang}',
+						'delete-head': '{jslang}wcf.editor.table.deleteHead{/jslang}',
+						'delete-row': '{jslang}wcf.editor.table.deleteRow{/jslang}',
+						'delete-table': '{jslang}wcf.editor.table.deleteTable{/jslang}',
+						'insert-table': '{jslang}wcf.editor.table.insertTable{/jslang}',
+						'insert-column-left': '{jslang}wcf.editor.table.insertColumnLeft{/jslang}',
+						'insert-column-right': '{jslang}wcf.editor.table.insertColumnRight{/jslang}',
+						'insert-row-above': '{jslang}wcf.editor.table.insertRowAbove{/jslang}',
+						'insert-row-below': '{jslang}wcf.editor.table.insertRowBelow{/jslang}',
 						
 						// size
-						'remove-size': '{lang}wcf.editor.button.size.removeSize{/lang}',
+						'remove-size': '{jslang}wcf.editor.button.size.removeSize{/jslang}',
 						
 						// color
-						'remove-color': '{lang}wcf.editor.button.color.removeColor{/lang}',
+						'remove-color': '{jslang}wcf.editor.button.color.removeColor{/jslang}',
 						
 						// font
-						'remove-font': '{lang}wcf.editor.button.font.removeFont{/lang}'
+						'remove-font': '{jslang}wcf.editor.button.font.removeFont{/jslang}'
 					}
 				},
 				linkify: false,
diff --git a/wcfsetup/install/files/acp/templates/__boxAddContent.tpl b/wcfsetup/install/files/acp/templates/__boxAddContent.tpl
index fc615ab6e2..cf7319cad9 100644
--- a/wcfsetup/install/files/acp/templates/__boxAddContent.tpl
+++ b/wcfsetup/install/files/acp/templates/__boxAddContent.tpl
@@ -14,11 +14,11 @@
 			AcpUiCodeMirrorPage
 		) {
 			Language.addObject({
-				'wcf.page.search': '{lang}wcf.page.search{/lang}',
-				'wcf.page.search.error.tooShort': '{lang}wcf.page.search.error.tooShort{/lang}',
-				'wcf.page.search.error.noResults': '{lang}wcf.page.search.error.noResults{/lang}',
-				'wcf.page.search.name': '{lang}wcf.page.search.name{/lang}',
-				'wcf.page.search.results': '{lang}wcf.page.search.results{/lang}',
+				'wcf.page.search': '{jslang}wcf.page.search{/jslang}',
+				'wcf.page.search.error.tooShort': '{jslang}wcf.page.search.error.tooShort{/jslang}',
+				'wcf.page.search.error.noResults': '{jslang}wcf.page.search.error.noResults{/jslang}',
+				'wcf.page.search.name': '{jslang}wcf.page.search.name{/jslang}',
+				'wcf.page.search.results': '{jslang}wcf.page.search.results{/jslang}',
 			});
 			
 			new AcpUiCodeMirrorMedia('content{@$languageID}');
diff --git a/wcfsetup/install/files/acp/templates/__boxPipGui.tpl b/wcfsetup/install/files/acp/templates/__boxPipGui.tpl
index 8b7ce83734..14e7ee04ea 100644
--- a/wcfsetup/install/files/acp/templates/__boxPipGui.tpl
+++ b/wcfsetup/install/files/acp/templates/__boxPipGui.tpl
@@ -1,8 +1,8 @@
 <script data-relocate="true">
 	require(['Language'], function(Language) {
 		Language.addObject({
-			'wcf.acp.pip.box.visibilityExceptions.hiddenEverywhere': '{lang}wcf.acp.pip.box.visibilityExceptions.hiddenEverywhere{/lang}',
-			'wcf.acp.pip.box.visibilityExceptions.visibleEverywhere': '{lang}wcf.acp.pip.box.visibilityExceptions.visibleEverywhere{/lang}'
+			'wcf.acp.pip.box.visibilityExceptions.hiddenEverywhere': '{jslang}wcf.acp.pip.box.visibilityExceptions.hiddenEverywhere{/jslang}',
+			'wcf.acp.pip.box.visibilityExceptions.visibleEverywhere': '{jslang}wcf.acp.pip.box.visibilityExceptions.visibleEverywhere{/jslang}'
 		});
 		
 		var visibleEverywhere = elById('visibleEverywhere');
diff --git a/wcfsetup/install/files/acp/templates/__devtoolsProjectExcludedPackagesFormField.tpl b/wcfsetup/install/files/acp/templates/__devtoolsProjectExcludedPackagesFormField.tpl
index cbc3d856b2..4dbd802c3a 100644
--- a/wcfsetup/install/files/acp/templates/__devtoolsProjectExcludedPackagesFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__devtoolsProjectExcludedPackagesFormField.tpl
@@ -28,13 +28,13 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/ExcludedPackages'], function(Language, ExcludedPackagesFormField) {
 		Language.addObject({
-			'wcf.acp.devtools.project.packageIdentifier.error.duplicate': '{lang}wcf.acp.devtools.project.packageIdentifier.error.duplicate{/lang}',
-			'wcf.acp.devtools.project.packageIdentifier.error.format': '{lang}wcf.acp.devtools.project.packageIdentifier.error.format{/lang}',
-			'wcf.acp.devtools.project.packageIdentifier.error.maximumLength': '{lang}wcf.acp.devtools.project.packageIdentifier.error.maximumLength{/lang}',
-			'wcf.acp.devtools.project.packageIdentifier.error.minimumLength': '{lang}wcf.acp.devtools.project.packageIdentifier.error.minimumLength{/lang}',
-			'wcf.acp.devtools.project.packageVersion.error.format': '{lang}wcf.acp.devtools.project.packageVersion.error.format{/lang}',
-			'wcf.acp.devtools.project.packageVersion.error.maximumLength': '{lang}wcf.acp.devtools.project.packageVersion.error.maximumLength{/lang}',
-			'wcf.acp.devtools.project.excludedPackage.excludedPackage': '{capture assign=__languageItem}{lang __literal=true}wcf.acp.devtools.project.excludedPackage.excludedPackage{/lang}{/capture}{@$__languageItem|encodeJS}'
+			'wcf.acp.devtools.project.packageIdentifier.error.duplicate': '{jslang}wcf.acp.devtools.project.packageIdentifier.error.duplicate{/jslang}',
+			'wcf.acp.devtools.project.packageIdentifier.error.format': '{jslang}wcf.acp.devtools.project.packageIdentifier.error.format{/jslang}',
+			'wcf.acp.devtools.project.packageIdentifier.error.maximumLength': '{jslang}wcf.acp.devtools.project.packageIdentifier.error.maximumLength{/jslang}',
+			'wcf.acp.devtools.project.packageIdentifier.error.minimumLength': '{jslang}wcf.acp.devtools.project.packageIdentifier.error.minimumLength{/jslang}',
+			'wcf.acp.devtools.project.packageVersion.error.format': '{jslang}wcf.acp.devtools.project.packageVersion.error.format{/jslang}',
+			'wcf.acp.devtools.project.packageVersion.error.maximumLength': '{jslang}wcf.acp.devtools.project.packageVersion.error.maximumLength{/jslang}',
+			'wcf.acp.devtools.project.excludedPackage.excludedPackage': '{jslang __literal=true}wcf.acp.devtools.project.excludedPackage.excludedPackage{/jslang}'
 		});
 		
 		new ExcludedPackagesFormField('{@$field->getPrefixedId()}', [
diff --git a/wcfsetup/install/files/acp/templates/__devtoolsProjectInstallationJavaScript.tpl b/wcfsetup/install/files/acp/templates/__devtoolsProjectInstallationJavaScript.tpl
index 7c93c450ce..a8bd9c71bb 100644
--- a/wcfsetup/install/files/acp/templates/__devtoolsProjectInstallationJavaScript.tpl
+++ b/wcfsetup/install/files/acp/templates/__devtoolsProjectInstallationJavaScript.tpl
@@ -2,8 +2,8 @@
 	<script data-relocate="true">
 		require(['Language', 'WoltLabSuite/Core/Acp/Ui/Devtools/Project/Installation/Confirmation'], function(Language, DevtoolsProjectInstallationConfirmation) {
 			Language.addObject({
-				'wcf.acp.devtools.project.installPackage.confirmMessage': '{lang __literal=true}wcf.acp.devtools.project.installPackage.confirmMessage{/lang}',
-				'wcf.acp.package.install.title': '{lang}wcf.acp.package.install.title{/lang}'
+				'wcf.acp.devtools.project.installPackage.confirmMessage': '{jslang __literal=true}wcf.acp.devtools.project.installPackage.confirmMessage{/jslang}',
+				'wcf.acp.package.install.title': '{jslang}wcf.acp.package.install.title{/jslang}'
 			});
 			
 			DevtoolsProjectInstallationConfirmation.init({@$project->projectID}, '{@$project->name|encodeJS}');
diff --git a/wcfsetup/install/files/acp/templates/__devtoolsProjectInstructionsFormField.tpl b/wcfsetup/install/files/acp/templates/__devtoolsProjectInstructionsFormField.tpl
index c3edaf217e..98aea96113 100644
--- a/wcfsetup/install/files/acp/templates/__devtoolsProjectInstructionsFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__devtoolsProjectInstructionsFormField.tpl
@@ -169,18 +169,18 @@
 		Template
 	) {
 		Language.addObject({
-			'wcf.acp.devtools.project.instruction.delete.confirmMessages': '{lang}wcf.acp.devtools.project.instruction.delete.confirmMessages{/lang}',
-			'wcf.acp.devtools.project.instruction.edit': '{lang}wcf.acp.devtools.project.instruction.edit{/lang}',
-			'wcf.acp.devtools.project.instruction.instruction': '{capture assign=__languageItem}{lang __literal=true}wcf.acp.devtools.project.instruction.instruction{/lang}{/capture}{@$__languageItem|encodeJS}',
-			'wcf.acp.devtools.project.instruction.value.description': '{lang}wcf.acp.devtools.project.instruction.value.description{/lang}',
-			'wcf.acp.devtools.project.instruction.value.description.defaultFilename': '{lang __literal=true}wcf.acp.devtools.project.instruction.value.description.defaultFilename{/lang}',
-			'wcf.acp.devtools.project.instructions.delete.confirmMessages': '{lang}wcf.acp.devtools.project.instructions.delete.confirmMessages{/lang}',
-			'wcf.acp.devtools.project.instructions.edit': '{lang}wcf.acp.devtools.project.instructions.edit{/lang}',
-			'wcf.acp.devtools.project.instructions.instructions.description': '{lang}wcf.acp.devtools.project.instructions.instructions.description{/lang}',
-			'wcf.acp.devtools.project.instructions.type.install.title': '{lang}wcf.acp.devtools.project.instructions.type.install.title{/lang}',
-			'wcf.acp.devtools.project.instructions.type.update.error.duplicate': '{lang}wcf.acp.devtools.project.instructions.type.update.error.duplicate{/lang}',
-			'wcf.acp.devtools.project.instructions.type.update.title': '{lang __literal=true}wcf.acp.devtools.project.instructions.type.update.title{/lang}',
-			'wcf.global.form.error.noValidSelection': '{lang}wcf.global.form.error.noValidSelection{/lang}'
+			'wcf.acp.devtools.project.instruction.delete.confirmMessages': '{jslang}wcf.acp.devtools.project.instruction.delete.confirmMessages{/jslang}',
+			'wcf.acp.devtools.project.instruction.edit': '{jslang}wcf.acp.devtools.project.instruction.edit{/jslang}',
+			'wcf.acp.devtools.project.instruction.instruction': '{jslang __literal=true}wcf.acp.devtools.project.instruction.instruction{/jslang}',
+			'wcf.acp.devtools.project.instruction.value.description': '{jslang}wcf.acp.devtools.project.instruction.value.description{/jslang}',
+			'wcf.acp.devtools.project.instruction.value.description.defaultFilename': '{jslang __literal=true}wcf.acp.devtools.project.instruction.value.description.defaultFilename{/jslang}',
+			'wcf.acp.devtools.project.instructions.delete.confirmMessages': '{jslang}wcf.acp.devtools.project.instructions.delete.confirmMessages{/jslang}',
+			'wcf.acp.devtools.project.instructions.edit': '{jslang}wcf.acp.devtools.project.instructions.edit{/jslang}',
+			'wcf.acp.devtools.project.instructions.instructions.description': '{jslang}wcf.acp.devtools.project.instructions.instructions.description{/jslang}',
+			'wcf.acp.devtools.project.instructions.type.install.title': '{jslang}wcf.acp.devtools.project.instructions.type.install.title{/jslang}',
+			'wcf.acp.devtools.project.instructions.type.update.error.duplicate': '{jslang}wcf.acp.devtools.project.instructions.type.update.error.duplicate{/jslang}',
+			'wcf.acp.devtools.project.instructions.type.update.title': '{jslang __literal=true}wcf.acp.devtools.project.instructions.type.update.title{/jslang}',
+			'wcf.global.form.error.noValidSelection': '{jslang}wcf.global.form.error.noValidSelection{/jslang}'
 		});
 		
 		var instructionsTemplate = new Template('{@$instructionsTemplate|encodeJS}');
diff --git a/wcfsetup/install/files/acp/templates/__devtoolsProjectOptionalPackagesFormField.tpl b/wcfsetup/install/files/acp/templates/__devtoolsProjectOptionalPackagesFormField.tpl
index 38eb82cbe6..d6ad6838c7 100644
--- a/wcfsetup/install/files/acp/templates/__devtoolsProjectOptionalPackagesFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__devtoolsProjectOptionalPackagesFormField.tpl
@@ -22,13 +22,13 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/OptionalPackages'], function(Language, OptionalPackagesFormField) {
 		Language.addObject({
-			'wcf.acp.devtools.project.packageIdentifier.error.duplicate': '{lang}wcf.acp.devtools.project.packageIdentifier.error.duplicate{/lang}',
-			'wcf.acp.devtools.project.packageIdentifier.error.format': '{lang}wcf.acp.devtools.project.packageIdentifier.error.format{/lang}',
-			'wcf.acp.devtools.project.packageIdentifier.error.maximumLength': '{lang}wcf.acp.devtools.project.packageIdentifier.error.maximumLength{/lang}',
-			'wcf.acp.devtools.project.packageIdentifier.error.minimumLength': '{lang}wcf.acp.devtools.project.packageIdentifier.error.minimumLength{/lang}',
-			'wcf.acp.devtools.project.packageVersion.error.format': '{lang}wcf.acp.devtools.project.packageVersion.error.format{/lang}',
-			'wcf.acp.devtools.project.packageVersion.error.maximumLength': '{lang}wcf.acp.devtools.project.packageVersion.error.maximumLength{/lang}',
-			'wcf.acp.devtools.project.optionalPackage.optionalPackage': '{lang __literal=true}wcf.acp.devtools.project.optionalPackage.optionalPackage{/lang}'
+			'wcf.acp.devtools.project.packageIdentifier.error.duplicate': '{jslang}wcf.acp.devtools.project.packageIdentifier.error.duplicate{/jslang}',
+			'wcf.acp.devtools.project.packageIdentifier.error.format': '{jslang}wcf.acp.devtools.project.packageIdentifier.error.format{/jslang}',
+			'wcf.acp.devtools.project.packageIdentifier.error.maximumLength': '{jslang}wcf.acp.devtools.project.packageIdentifier.error.maximumLength{/jslang}',
+			'wcf.acp.devtools.project.packageIdentifier.error.minimumLength': '{jslang}wcf.acp.devtools.project.packageIdentifier.error.minimumLength{/jslang}',
+			'wcf.acp.devtools.project.packageVersion.error.format': '{jslang}wcf.acp.devtools.project.packageVersion.error.format{/jslang}',
+			'wcf.acp.devtools.project.packageVersion.error.maximumLength': '{jslang}wcf.acp.devtools.project.packageVersion.error.maximumLength{/jslang}',
+			'wcf.acp.devtools.project.optionalPackage.optionalPackage': '{jslang __literal=true}wcf.acp.devtools.project.optionalPackage.optionalPackage{/jslang}'
 		});
 		
 		new OptionalPackagesFormField('{@$field->getPrefixedId()}', [
diff --git a/wcfsetup/install/files/acp/templates/__devtoolsProjectRequiredPackagesFormField.tpl b/wcfsetup/install/files/acp/templates/__devtoolsProjectRequiredPackagesFormField.tpl
index 4632481630..916f4833fb 100644
--- a/wcfsetup/install/files/acp/templates/__devtoolsProjectRequiredPackagesFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__devtoolsProjectRequiredPackagesFormField.tpl
@@ -36,13 +36,13 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Acp/Form/Builder/Field/Devtools/Project/RequiredPackages'], function(Language, RequiredPackagesFormField) {
 		Language.addObject({
-			'wcf.acp.devtools.project.packageIdentifier.error.duplicate': '{lang}wcf.acp.devtools.project.packageIdentifier.error.duplicate{/lang}',
-			'wcf.acp.devtools.project.packageIdentifier.error.format': '{lang}wcf.acp.devtools.project.packageIdentifier.error.format{/lang}',
-			'wcf.acp.devtools.project.packageIdentifier.error.maximumLength': '{lang}wcf.acp.devtools.project.packageIdentifier.error.maximumLength{/lang}',
-			'wcf.acp.devtools.project.packageIdentifier.error.minimumLength': '{lang}wcf.acp.devtools.project.packageIdentifier.error.minimumLength{/lang}',
-			'wcf.acp.devtools.project.packageVersion.error.format': '{lang}wcf.acp.devtools.project.packageVersion.error.format{/lang}',
-			'wcf.acp.devtools.project.packageVersion.error.maximumLength': '{lang}wcf.acp.devtools.project.packageVersion.error.maximumLength{/lang}',
-			'wcf.acp.devtools.project.requiredPackage.requiredPackage': '{capture assign=__languageItem}{lang __literal=true}wcf.acp.devtools.project.requiredPackage.requiredPackage{/lang}{/capture}{@$__languageItem|encodeJS}'
+			'wcf.acp.devtools.project.packageIdentifier.error.duplicate': '{jslang}wcf.acp.devtools.project.packageIdentifier.error.duplicate{/jslang}',
+			'wcf.acp.devtools.project.packageIdentifier.error.format': '{jslang}wcf.acp.devtools.project.packageIdentifier.error.format{/jslang}',
+			'wcf.acp.devtools.project.packageIdentifier.error.maximumLength': '{jslang}wcf.acp.devtools.project.packageIdentifier.error.maximumLength{/jslang}',
+			'wcf.acp.devtools.project.packageIdentifier.error.minimumLength': '{jslang}wcf.acp.devtools.project.packageIdentifier.error.minimumLength{/jslang}',
+			'wcf.acp.devtools.project.packageVersion.error.format': '{jslang}wcf.acp.devtools.project.packageVersion.error.format{/jslang}',
+			'wcf.acp.devtools.project.packageVersion.error.maximumLength': '{jslang}wcf.acp.devtools.project.packageVersion.error.maximumLength{/jslang}',
+			'wcf.acp.devtools.project.requiredPackage.requiredPackage': '{jslang __literal=true}wcf.acp.devtools.project.requiredPackage.requiredPackage{/jslang}'
 		});
 		
 		new RequiredPackagesFormField('{@$field->getPrefixedId()}', [
diff --git a/wcfsetup/install/files/acp/templates/__labelFormField.tpl b/wcfsetup/install/files/acp/templates/__labelFormField.tpl
index 6ce59f485a..a3ca75b729 100644
--- a/wcfsetup/install/files/acp/templates/__labelFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__labelFormField.tpl
@@ -26,8 +26,8 @@
 <script data-relocate="true">
 	require(['Dom/Util', 'Language', 'WoltLabSuite/Core/Form/Builder/Field/Controller/Label'], function(DomUtil, Language, FormBuilderFieldLabel) {
 		Language.addObject({
-			'wcf.label.none': '{lang}wcf.label.none{/lang}',
-			'wcf.label.withoutSelection': '{lang}wcf.label.withoutSelection{/lang}'
+			'wcf.label.none': '{jslang}wcf.label.none{/jslang}',
+			'wcf.label.withoutSelection': '{jslang}wcf.label.withoutSelection{/jslang}'
 		});
 		
 		new FormBuilderFieldLabel(
diff --git a/wcfsetup/install/files/acp/templates/__menuPipGui.tpl b/wcfsetup/install/files/acp/templates/__menuPipGui.tpl
index a5086f51f6..14e9b3421a 100644
--- a/wcfsetup/install/files/acp/templates/__menuPipGui.tpl
+++ b/wcfsetup/install/files/acp/templates/__menuPipGui.tpl
@@ -1,8 +1,8 @@
 <script data-relocate="true">
 	require(['Language'], function(Language) {
 		Language.addObject({
-			'wcf.acp.pip.menu.boxVisibilityExceptions.hiddenEverywhere': '{lang}wcf.acp.pip.menu.boxVisibilityExceptions.hiddenEverywhere{/lang}',
-			'wcf.acp.pip.menu.boxVisibilityExceptions.visibleEverywhere': '{lang}wcf.acp.pip.menu.boxVisibilityExceptions.visibleEverywhere{/lang}'
+			'wcf.acp.pip.menu.boxVisibilityExceptions.hiddenEverywhere': '{jslang}wcf.acp.pip.menu.boxVisibilityExceptions.hiddenEverywhere{/jslang}',
+			'wcf.acp.pip.menu.boxVisibilityExceptions.visibleEverywhere': '{jslang}wcf.acp.pip.menu.boxVisibilityExceptions.visibleEverywhere{/jslang}'
 		});
 		
 		var boxVisibleEverywhere = elById('boxVisibleEverywhere');
diff --git a/wcfsetup/install/files/acp/templates/__messageQuoteManager.tpl b/wcfsetup/install/files/acp/templates/__messageQuoteManager.tpl
index 45abd51bfe..e8c9c7b0da 100644
--- a/wcfsetup/install/files/acp/templates/__messageQuoteManager.tpl
+++ b/wcfsetup/install/files/acp/templates/__messageQuoteManager.tpl
@@ -1,12 +1,12 @@
 WCF.Language.addObject({
-	'wcf.message.quote.insertAllQuotes': '{lang}wcf.message.quote.insertAllQuotes{/lang}',
-	'wcf.message.quote.insertSelectedQuotes': '{lang}wcf.message.quote.insertSelectedQuotes{/lang}',
-	'wcf.message.quote.manageQuotes': '{lang}wcf.message.quote.manageQuotes{/lang}',
-	'wcf.message.quote.quoteSelected': '{lang}wcf.message.quote.quoteSelected{/lang}',
-	'wcf.message.quote.quoteAndReply': '{lang}wcf.message.quote.quoteAndReply{/lang}',
-	'wcf.message.quote.removeAllQuotes': '{lang}wcf.message.quote.removeAllQuotes{/lang}',
-	'wcf.message.quote.removeSelectedQuotes': '{lang}wcf.message.quote.removeSelectedQuotes{/lang}',
-	'wcf.message.quote.showQuotes': '{lang __literal=true}wcf.message.quote.showQuotes{/lang}'
+	'wcf.message.quote.insertAllQuotes': '{jslang}wcf.message.quote.insertAllQuotes{/jslang}',
+	'wcf.message.quote.insertSelectedQuotes': '{jslang}wcf.message.quote.insertSelectedQuotes{/jslang}',
+	'wcf.message.quote.manageQuotes': '{jslang}wcf.message.quote.manageQuotes{/jslang}',
+	'wcf.message.quote.quoteSelected': '{jslang}wcf.message.quote.quoteSelected{/jslang}',
+	'wcf.message.quote.quoteAndReply': '{jslang}wcf.message.quote.quoteAndReply{/jslang}',
+	'wcf.message.quote.removeAllQuotes': '{jslang}wcf.message.quote.removeAllQuotes{/jslang}',
+	'wcf.message.quote.removeSelectedQuotes': '{jslang}wcf.message.quote.removeSelectedQuotes{/jslang}',
+	'wcf.message.quote.showQuotes': '{jslang __literal=true}wcf.message.quote.showQuotes{/jslang}'
 });
 
 {if !$wysiwygSelector|isset}{assign var=wysiwygSelector value=''}{/if}
diff --git a/wcfsetup/install/files/acp/templates/__multipleSelectionFormField.tpl b/wcfsetup/install/files/acp/templates/__multipleSelectionFormField.tpl
index 81e6cdcc7d..c13cdd7bef 100644
--- a/wcfsetup/install/files/acp/templates/__multipleSelectionFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__multipleSelectionFormField.tpl
@@ -2,13 +2,13 @@
 	<script data-relocate="true">
 		require(['Language', 'WoltLabSuite/Core/Ui/ItemList/Filter'], function(Language, UiItemListFilter) {
 			Language.addObject({
-				'wcf.global.filter.button.visibility': '{lang}wcf.global.filter.button.visibility{/lang}',
-				'wcf.global.filter.button.clear': '{lang}wcf.global.filter.button.clear{/lang}',
-				'wcf.global.filter.error.noMatches': '{lang}wcf.global.filter.error.noMatches{/lang}',
-				'wcf.global.filter.placeholder': '{lang}wcf.global.filter.placeholder{/lang}',
-				'wcf.global.filter.visibility.activeOnly': '{lang}wcf.global.filter.visibility.activeOnly{/lang}',
-				'wcf.global.filter.visibility.highlightActive': '{lang}wcf.global.filter.visibility.highlightActive{/lang}',
-				'wcf.global.filter.visibility.showAll': '{lang}wcf.global.filter.visibility.showAll{/lang}'
+				'wcf.global.filter.button.visibility': '{jslang}wcf.global.filter.button.visibility{/jslang}',
+				'wcf.global.filter.button.clear': '{jslang}wcf.global.filter.button.clear{/jslang}',
+				'wcf.global.filter.error.noMatches': '{jslang}wcf.global.filter.error.noMatches{/jslang}',
+				'wcf.global.filter.placeholder': '{jslang}wcf.global.filter.placeholder{/jslang}',
+				'wcf.global.filter.visibility.activeOnly': '{jslang}wcf.global.filter.visibility.activeOnly{/jslang}',
+				'wcf.global.filter.visibility.highlightActive': '{jslang}wcf.global.filter.visibility.highlightActive{/jslang}',
+				'wcf.global.filter.visibility.showAll': '{jslang}wcf.global.filter.visibility.showAll{/jslang}'
 			});
 			
 			new UiItemListFilter('{@$field->getPrefixedId()}_list');
diff --git a/wcfsetup/install/files/acp/templates/__objectTypePipGui.tpl b/wcfsetup/install/files/acp/templates/__objectTypePipGui.tpl
index 8630716113..672065ee66 100644
--- a/wcfsetup/install/files/acp/templates/__objectTypePipGui.tpl
+++ b/wcfsetup/install/files/acp/templates/__objectTypePipGui.tpl
@@ -1,9 +1,9 @@
 <script data-relocate="true">
 	require(['Language'], function(Language) {
 		Language.addObject({
-			'wcf.form.field.className.description.interface': '{lang __literal=true}wcf.form.field.className.description.interface{/lang}',
+			'wcf.form.field.className.description.interface': '{jslang __literal=true}wcf.form.field.className.description.interface{/jslang}',
 			{implode from=$definitionNames item=definitionName}
-				'wcf.acp.pip.objectType.definitionName.{@$definitionName}.description': '{lang __literal=true __optional=true}wcf.acp.pip.objectType.definitionName.{@$definitionName}.description{/lang}'
+				'wcf.acp.pip.objectType.definitionName.{@$definitionName}.description': '{jslang __literal=true __optional=true}wcf.acp.pip.objectType.definitionName.{@$definitionName}.description{/jslang}'
 			{/implode}
 		});
 		
@@ -31,4 +31,4 @@
 		
 		definitionID.addEventListener('change', update);
 	});
-</script>
\ No newline at end of file
+</script>
diff --git a/wcfsetup/install/files/acp/templates/__optionEmailSmtpTest.tpl b/wcfsetup/install/files/acp/templates/__optionEmailSmtpTest.tpl
index 6a22dc1a4a..d591f5266a 100644
--- a/wcfsetup/install/files/acp/templates/__optionEmailSmtpTest.tpl
+++ b/wcfsetup/install/files/acp/templates/__optionEmailSmtpTest.tpl
@@ -2,13 +2,13 @@
 	<script data-relocate="true">
 		require(['Language', 'WoltLabSuite/Core/Acp/Ui/Option/EmailSmtpTest'], function (Language, AcpUiOptionEmailSmtpTest) {
 			Language.addObject({
-				'wcf.acp.email.smtp.test': '{lang}wcf.acp.email.smtp.test{/lang}',
-				'wcf.acp.email.smtp.test.description': '{lang}wcf.acp.email.smtp.test.description{/lang}',
-				'wcf.acp.email.smtp.test.error.empty.host': '{lang}wcf.acp.email.smtp.test.error.empty.host{/lang}',
-				'wcf.acp.email.smtp.test.error.empty.password': '{lang}wcf.acp.email.smtp.test.error.empty.password{/lang}',
-				'wcf.acp.email.smtp.test.error.empty.user': '{lang}wcf.acp.email.smtp.test.error.empty.user{/lang}',
-				'wcf.acp.email.smtp.test.run': '{lang}wcf.acp.email.smtp.test.run{/lang}',
-				'wcf.acp.email.smtp.test.run.success': '{lang}wcf.acp.email.smtp.test.run.success{/lang}'
+				'wcf.acp.email.smtp.test': '{jslang}wcf.acp.email.smtp.test{/jslang}',
+				'wcf.acp.email.smtp.test.description': '{jslang}wcf.acp.email.smtp.test.description{/jslang}',
+				'wcf.acp.email.smtp.test.error.empty.host': '{jslang}wcf.acp.email.smtp.test.error.empty.host{/jslang}',
+				'wcf.acp.email.smtp.test.error.empty.password': '{jslang}wcf.acp.email.smtp.test.error.empty.password{/jslang}',
+				'wcf.acp.email.smtp.test.error.empty.user': '{jslang}wcf.acp.email.smtp.test.error.empty.user{/jslang}',
+				'wcf.acp.email.smtp.test.run': '{jslang}wcf.acp.email.smtp.test.run{/jslang}',
+				'wcf.acp.email.smtp.test.run.success': '{jslang}wcf.acp.email.smtp.test.run.success{/jslang}'
 			});
 			
 			AcpUiOptionEmailSmtpTest.init();
diff --git a/wcfsetup/install/files/acp/templates/__optionRewriteRules.tpl b/wcfsetup/install/files/acp/templates/__optionRewriteRules.tpl
index 2fc30b1bfd..7b0b73168d 100644
--- a/wcfsetup/install/files/acp/templates/__optionRewriteRules.tpl
+++ b/wcfsetup/install/files/acp/templates/__optionRewriteRules.tpl
@@ -2,9 +2,9 @@
 	<script data-relocate="true">
 		require(['Language', 'WoltLabSuite/Core/Acp/Ui/Option/RewriteGenerator'], function (Language, AcpUiOptionRewriteGenerator) {
 			Language.addObject({
-				'wcf.acp.rewrite': '{lang}wcf.acp.rewrite{/lang}',
-				'wcf.acp.rewrite.description': '{lang}wcf.acp.rewrite.description{/lang}',
-				'wcf.acp.rewrite.generate': '{lang}wcf.acp.rewrite.generate{/lang}'
+				'wcf.acp.rewrite': '{jslang}wcf.acp.rewrite{/jslang}',
+				'wcf.acp.rewrite.description': '{jslang}wcf.acp.rewrite.description{/jslang}',
+				'wcf.acp.rewrite.generate': '{jslang}wcf.acp.rewrite.generate{/jslang}'
 			});
 
 			AcpUiOptionRewriteGenerator.init();
diff --git a/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl b/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl
index b8ec64cd98..b34f5c6bd0 100644
--- a/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl
+++ b/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl
@@ -26,9 +26,9 @@
 	<script data-relocate="true">
 		require(['Dictionary', 'Language', 'WoltLabSuite/Core/Acp/Ui/Option/RewriteTest'], function (Dictionary, Language, AcpUiOptionRewriteTest) {
 			Language.addObject({
-				'wcf.acp.option.url_omit_index_php': '{lang}wcf.acp.option.url_omit_index_php{/lang}',
-				'wcf.acp.option.url_omit_index_php.test.status.failure': '{lang}wcf.acp.option.url_omit_index_php.test.status.failure{/lang}',
-				'wcf.acp.option.url_omit_index_php.test.status.success': '{lang}wcf.acp.option.url_omit_index_php.test.status.success{/lang}'
+				'wcf.acp.option.url_omit_index_php': '{jslang}wcf.acp.option.url_omit_index_php{/jslang}',
+				'wcf.acp.option.url_omit_index_php.test.status.failure': '{jslang}wcf.acp.option.url_omit_index_php.test.status.failure{/jslang}',
+				'wcf.acp.option.url_omit_index_php.test.status.success': '{jslang}wcf.acp.option.url_omit_index_php.test.status.success{/jslang}'
 			});
 			
 			var apps = Dictionary.fromObject({
diff --git a/wcfsetup/install/files/acp/templates/__pageAddContent.tpl b/wcfsetup/install/files/acp/templates/__pageAddContent.tpl
index 59ebbb5e73..bbcdea079b 100644
--- a/wcfsetup/install/files/acp/templates/__pageAddContent.tpl
+++ b/wcfsetup/install/files/acp/templates/__pageAddContent.tpl
@@ -18,11 +18,11 @@
 			AcpUiCodeMirrorPage
 		) {
 			Language.addObject({
-				'wcf.page.search': '{lang}wcf.page.search{/lang}',
-				'wcf.page.search.error.tooShort': '{lang}wcf.page.search.error.tooShort{/lang}',
-				'wcf.page.search.error.noResults': '{lang}wcf.page.search.error.noResults{/lang}',
-				'wcf.page.search.name': '{lang}wcf.page.search.name{/lang}',
-				'wcf.page.search.results': '{lang}wcf.page.search.results{/lang}',
+				'wcf.page.search': '{jslang}wcf.page.search{/jslang}',
+				'wcf.page.search.error.tooShort': '{jslang}wcf.page.search.error.tooShort{/jslang}',
+				'wcf.page.search.error.noResults': '{jslang}wcf.page.search.error.noResults{/jslang}',
+				'wcf.page.search.name': '{jslang}wcf.page.search.name{/jslang}',
+				'wcf.page.search.results': '{jslang}wcf.page.search.results{/jslang}',
 			});
 			
 			new AcpUiCodeMirrorMedia('{@$__pageContentID}');
diff --git a/wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl b/wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl
index 290b083de0..e4df57bf6d 100644
--- a/wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl
@@ -3,9 +3,9 @@
 <script data-relocate="true">
 	require(['Dom/Traverse', 'Dom/Util', 'Language', 'WoltLabSuite/Core/Ui/Poll/Editor'], function(DomTraverse, DomUtil, Language, UiPollEditor) {
 		Language.addObject({
-			'wcf.poll.button.addOption': '{lang}wcf.poll.button.addOption{/lang}',
-			'wcf.poll.button.removeOption': '{lang}wcf.poll.button.removeOption{/lang}',
-			'wcf.poll.maxVotes.error.invalid': '{lang}wcf.poll.maxVotes.error.invalid{/lang}'
+			'wcf.poll.button.addOption': '{jslang}wcf.poll.button.addOption{/jslang}',
+			'wcf.poll.button.removeOption': '{jslang}wcf.poll.button.removeOption{/jslang}',
+			'wcf.poll.maxVotes.error.invalid': '{jslang}wcf.poll.maxVotes.error.invalid{/jslang}'
 		});
 		
 		new UiPollEditor(
diff --git a/wcfsetup/install/files/acp/templates/__singleSelectionFormField.tpl b/wcfsetup/install/files/acp/templates/__singleSelectionFormField.tpl
index c3209915a6..6c4f0aad70 100644
--- a/wcfsetup/install/files/acp/templates/__singleSelectionFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__singleSelectionFormField.tpl
@@ -2,13 +2,13 @@
 	<script data-relocate="true">
 		require(['Language', 'WoltLabSuite/Core/Ui/ItemList/Filter'], function(Language, UiItemListFilter) {
 			Language.addObject({
-				'wcf.global.filter.button.visibility': '{lang}wcf.global.filter.button.visibility{/lang}',
-				'wcf.global.filter.button.clear': '{lang}wcf.global.filter.button.clear{/lang}',
-				'wcf.global.filter.error.noMatches': '{lang}wcf.global.filter.error.noMatches{/lang}',
-				'wcf.global.filter.placeholder': '{lang}wcf.global.filter.placeholder{/lang}',
-				'wcf.global.filter.visibility.activeOnly': '{lang}wcf.global.filter.visibility.activeOnly{/lang}',
-				'wcf.global.filter.visibility.highlightActive': '{lang}wcf.global.filter.visibility.highlightActive{/lang}',
-				'wcf.global.filter.visibility.showAll': '{lang}wcf.global.filter.visibility.showAll{/lang}'
+				'wcf.global.filter.button.visibility': '{jslang}wcf.global.filter.button.visibility{/jslang}',
+				'wcf.global.filter.button.clear': '{jslang}wcf.global.filter.button.clear{/jslang}',
+				'wcf.global.filter.error.noMatches': '{jslang}wcf.global.filter.error.noMatches{/jslang}',
+				'wcf.global.filter.placeholder': '{jslang}wcf.global.filter.placeholder{/jslang}',
+				'wcf.global.filter.visibility.activeOnly': '{jslang}wcf.global.filter.visibility.activeOnly{/jslang}',
+				'wcf.global.filter.visibility.highlightActive': '{jslang}wcf.global.filter.visibility.highlightActive{/jslang}',
+				'wcf.global.filter.visibility.showAll': '{jslang}wcf.global.filter.visibility.showAll{/jslang}'
 			});
 			
 			new UiItemListFilter('{@$field->getPrefixedId()}_list');
diff --git a/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl b/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl
index c3c821a901..a23046b3b6 100644
--- a/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__wysiwygAttachmentFormField.tpl
@@ -41,17 +41,17 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.attachment.upload.error.invalidExtension': '{lang}wcf.attachment.upload.error.invalidExtension{/lang}',
-			'wcf.attachment.upload.error.tooLarge': '{lang}wcf.attachment.upload.error.tooLarge{/lang}',
-			'wcf.attachment.upload.error.reachedLimit': '{lang}wcf.attachment.upload.error.reachedLimit{/lang}',
-			'wcf.attachment.upload.error.reachedRemainingLimit': '{lang}wcf.attachment.upload.error.reachedRemainingLimit{/lang}',
-			'wcf.attachment.upload.error.uploadFailed': '{lang}wcf.attachment.upload.error.uploadFailed{/lang}',
-			'wcf.attachment.upload.error.uploadPhpLimit': '{lang}wcf.attachment.upload.error.uploadPhpLimit{/lang}',
-			'wcf.attachment.insert': '{lang}wcf.attachment.insert{/lang}',
-			'wcf.attachment.insertAll': '{lang}wcf.attachment.insertAll{/lang}',
-			'wcf.attachment.insertFull': '{lang}wcf.attachment.insertFull{/lang}',
-			'wcf.attachment.insertThumbnail': '{lang}wcf.attachment.insertThumbnail{/lang}',
-			'wcf.attachment.delete.sure': '{lang}wcf.attachment.delete.sure{/lang}'
+			'wcf.attachment.upload.error.invalidExtension': '{jslang}wcf.attachment.upload.error.invalidExtension{/jslang}',
+			'wcf.attachment.upload.error.tooLarge': '{jslang}wcf.attachment.upload.error.tooLarge{/jslang}',
+			'wcf.attachment.upload.error.reachedLimit': '{jslang}wcf.attachment.upload.error.reachedLimit{/jslang}',
+			'wcf.attachment.upload.error.reachedRemainingLimit': '{jslang}wcf.attachment.upload.error.reachedRemainingLimit{/jslang}',
+			'wcf.attachment.upload.error.uploadFailed': '{jslang}wcf.attachment.upload.error.uploadFailed{/jslang}',
+			'wcf.attachment.upload.error.uploadPhpLimit': '{jslang}wcf.attachment.upload.error.uploadPhpLimit{/jslang}',
+			'wcf.attachment.insert': '{jslang}wcf.attachment.insert{/jslang}',
+			'wcf.attachment.insertAll': '{jslang}wcf.attachment.insertAll{/jslang}',
+			'wcf.attachment.insertFull': '{jslang}wcf.attachment.insertFull{/jslang}',
+			'wcf.attachment.insertThumbnail': '{jslang}wcf.attachment.insertThumbnail{/jslang}',
+			'wcf.attachment.delete.sure': '{jslang}wcf.attachment.delete.sure{/jslang}'
 		});
 		
 		new WCF.Attachment.Upload(
diff --git a/wcfsetup/install/files/acp/templates/__wysiwygCmsToolbar.tpl b/wcfsetup/install/files/acp/templates/__wysiwygCmsToolbar.tpl
index 81f2deba4b..6fca00a9fd 100644
--- a/wcfsetup/install/files/acp/templates/__wysiwygCmsToolbar.tpl
+++ b/wcfsetup/install/files/acp/templates/__wysiwygCmsToolbar.tpl
@@ -1,16 +1,16 @@
 <script data-relocate="true">
 	require(['Language'], function (Language) {
 		Language.addObject({
-			'wcf.article.search': '{lang}wcf.article.search{/lang}',
-			'wcf.article.search.error.tooShort': '{lang}wcf.article.search.error.tooShort{/lang}',
-			'wcf.article.search.error.noResults': '{lang}wcf.article.search.error.noResults{/lang}',
-			'wcf.article.search.name': '{lang}wcf.article.search.name{/lang}',
-			'wcf.article.search.results': '{lang}wcf.article.search.results{/lang}',
-			'wcf.page.search': '{lang}wcf.page.search{/lang}',
-			'wcf.page.search.error.tooShort': '{lang}wcf.page.search.error.tooShort{/lang}',
-			'wcf.page.search.error.noResults': '{lang}wcf.page.search.error.noResults{/lang}',
-			'wcf.page.search.name': '{lang}wcf.page.search.name{/lang}',
-			'wcf.page.search.results': '{lang}wcf.page.search.results{/lang}',
+			'wcf.article.search': '{jslang}wcf.article.search{/jslang}',
+			'wcf.article.search.error.tooShort': '{jslang}wcf.article.search.error.tooShort{/jslang}',
+			'wcf.article.search.error.noResults': '{jslang}wcf.article.search.error.noResults{/jslang}',
+			'wcf.article.search.name': '{jslang}wcf.article.search.name{/jslang}',
+			'wcf.article.search.results': '{jslang}wcf.article.search.results{/jslang}',
+			'wcf.page.search': '{jslang}wcf.page.search{/jslang}',
+			'wcf.page.search.error.tooShort': '{jslang}wcf.page.search.error.tooShort{/jslang}',
+			'wcf.page.search.error.noResults': '{jslang}wcf.page.search.error.noResults{/jslang}',
+			'wcf.page.search.name': '{jslang}wcf.page.search.name{/jslang}',
+			'wcf.page.search.results': '{jslang}wcf.page.search.results{/jslang}',
 		});
 	})
 </script>
diff --git a/wcfsetup/install/files/acp/templates/__wysiwygPreviewFormButton.tpl b/wcfsetup/install/files/acp/templates/__wysiwygPreviewFormButton.tpl
index 6501f1538e..d61999dfcd 100644
--- a/wcfsetup/install/files/acp/templates/__wysiwygPreviewFormButton.tpl
+++ b/wcfsetup/install/files/acp/templates/__wysiwygPreviewFormButton.tpl
@@ -7,7 +7,7 @@
 <script data-relocate="true">
 	require(['Language'], function(Language) {
 		Language.addObject({
-			'wcf.global.preview': '{lang}wcf.global.preview{/lang}'
+			'wcf.global.preview': '{jslang}wcf.global.preview{/jslang}'
 		});
 		
 		new WCF.Message.DefaultPreview({
diff --git a/wcfsetup/install/files/acp/templates/aclPermissions.tpl b/wcfsetup/install/files/acp/templates/aclPermissions.tpl
index 5f4986b0ba..00f6601f2d 100644
--- a/wcfsetup/install/files/acp/templates/aclPermissions.tpl
+++ b/wcfsetup/install/files/acp/templates/aclPermissions.tpl
@@ -2,11 +2,11 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.acl.option.deny': '{lang}wcf.acl.option.deny{/lang}',
-			'wcf.acl.option.fullAccess': '{lang}wcf.acl.option.fullAccess{/lang}',
-			'wcf.acl.option.grant': '{lang}wcf.acl.option.grant{/lang}',
-			'wcf.acl.search.user.description': '{lang}wcf.acl.search.user.description{/lang}',
-			'wcf.acl.search.description': '{lang}wcf.acl.search.description{/lang}',
+			'wcf.acl.option.deny': '{jslang}wcf.acl.option.deny{/jslang}',
+			'wcf.acl.option.fullAccess': '{jslang}wcf.acl.option.fullAccess{/jslang}',
+			'wcf.acl.option.grant': '{jslang}wcf.acl.option.grant{/jslang}',
+			'wcf.acl.search.user.description': '{jslang}wcf.acl.search.user.description{/jslang}',
+			'wcf.acl.search.description': '{jslang}wcf.acl.search.description{/jslang}',
 		});
 	});
-</script>
\ No newline at end of file
+</script>
diff --git a/wcfsetup/install/files/acp/templates/articleAdd.tpl b/wcfsetup/install/files/acp/templates/articleAdd.tpl
index e7bec299fb..962ee2d86b 100644
--- a/wcfsetup/install/files/acp/templates/articleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/articleAdd.tpl
@@ -52,10 +52,10 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Ui/User/Search/Input', 'WoltLabSuite/Core/Acp/Ui/Article/InlineEditor'], function(Language, UiUserSearchInput, AcpUiArticleInlineEditor) {
 		Language.addObject({
-			'wcf.acp.article.i18n.source': '{lang}wcf.acp.article.i18n.source{/lang}',
-			'wcf.acp.article.i18n.toI18n.confirmMessage': '{lang}wcf.acp.article.i18n.toI18n.confirmMessage{/lang}',
-			'wcf.acp.article.i18n.fromI18n.confirmMessage': '{lang}wcf.acp.article.i18n.fromI18n.confirmMessage{/lang}',
-			'wcf.message.status.deleted': '{lang}wcf.message.status.deleted{/lang}',
+			'wcf.acp.article.i18n.source': '{jslang}wcf.acp.article.i18n.source{/jslang}',
+			'wcf.acp.article.i18n.toI18n.confirmMessage': '{jslang}wcf.acp.article.i18n.toI18n.confirmMessage{/jslang}',
+			'wcf.acp.article.i18n.fromI18n.confirmMessage': '{jslang}wcf.acp.article.i18n.fromI18n.confirmMessage{/jslang}',
+			'wcf.message.status.deleted': '{jslang}wcf.message.status.deleted{/jslang}',
 		});
 		
 		new UiUserSearchInput(elBySel('input[name="username"]'));
@@ -490,7 +490,7 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.label.none': '{lang}wcf.label.none{/lang}',
+			'wcf.label.none': '{jslang}wcf.label.none{/jslang}',
 		});
 		
 		{if !$labelGroups|empty}
diff --git a/wcfsetup/install/files/acp/templates/articleAddDialog.tpl b/wcfsetup/install/files/acp/templates/articleAddDialog.tpl
index 35cb520d56..a0a5fcf752 100644
--- a/wcfsetup/install/files/acp/templates/articleAddDialog.tpl
+++ b/wcfsetup/install/files/acp/templates/articleAddDialog.tpl
@@ -18,7 +18,7 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Acp/Ui/Article/Add'], function(Language, AcpUiArticleAdd) {
 		Language.addObject({
-			'wcf.acp.article.add': '{lang}wcf.acp.article.add{/lang}'
+			'wcf.acp.article.add': '{jslang}wcf.acp.article.add{/jslang}'
 		});
 		
 		AcpUiArticleAdd.init('{link controller='ArticleAdd' encode=false}{literal}isMultilingual={$isMultilingual}{/literal}{if $categoryID}&categoryID={@$categoryID}{/if}{/link}');
diff --git a/wcfsetup/install/files/acp/templates/articleList.tpl b/wcfsetup/install/files/acp/templates/articleList.tpl
index aeb7a29d7e..1ead92767f 100644
--- a/wcfsetup/install/files/acp/templates/articleList.tpl
+++ b/wcfsetup/install/files/acp/templates/articleList.tpl
@@ -4,9 +4,9 @@
 	require(['Language', 'WoltLabSuite/Core/Controller/Clipboard', 'WoltLabSuite/Core/Ui/User/Search/Input', 'WoltLabSuite/Core/Acp/Ui/Article/InlineEditor'],
 		function(Language, ControllerClipboard, UiUserSearchInput, AcpUiArticleInlineEditor) {
 		Language.addObject({
-			'wcf.acp.article.publicationStatus.unpublished': '{lang}wcf.acp.article.publicationStatus.unpublished{/lang}',
-			'wcf.acp.article.setCategory': '{lang}wcf.acp.article.setCategory{/lang}',
-			'wcf.message.status.deleted': '{lang}wcf.message.status.deleted{/lang}'
+			'wcf.acp.article.publicationStatus.unpublished': '{jslang}wcf.acp.article.publicationStatus.unpublished{/jslang}',
+			'wcf.acp.article.setCategory': '{jslang}wcf.acp.article.setCategory{/jslang}',
+			'wcf.message.status.deleted': '{jslang}wcf.message.status.deleted{/jslang}'
 		});
 		
 		new UiUserSearchInput(elBySel('input[name="username"]'));
diff --git a/wcfsetup/install/files/acp/templates/boxAdd.tpl b/wcfsetup/install/files/acp/templates/boxAdd.tpl
index 5efe640ed6..ffbfafb357 100644
--- a/wcfsetup/install/files/acp/templates/boxAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/boxAdd.tpl
@@ -11,20 +11,20 @@
 	
 	require(['Dictionary', 'Language', 'WoltLabSuite/Core/Acp/Ui/Box/Handler'], function(Dictionary, Language, AcpUiBoxHandler) {
 		Language.addObject({
-			'wcf.page.pageObjectID': '{lang}wcf.page.pageObjectID{/lang}',
+			'wcf.page.pageObjectID': '{jslang}wcf.page.pageObjectID{/jslang}',
 			{foreach from=$pageNodeList item=pageNode}
 				{capture assign='pageObjectIDLanguageItem'}{lang __optional=true}wcf.page.pageObjectID.{@$pageNode->identifier}{/lang}{/capture}
 				{if $pageObjectIDLanguageItem}
-					'wcf.page.pageObjectID.{@$pageNode->identifier}': '{@$pageObjectIDLanguageItem}',
+					'wcf.page.pageObjectID.{@$pageNode->identifier}': '{@$pageObjectIDLanguageItem|encodeJS}',
 				{/if}
 				{capture assign='pageObjectIDLanguageItem'}{lang __optional=true}wcf.page.pageObjectID.search.{@$pageNode->identifier}{/lang}{/capture}
 				{if $pageObjectIDLanguageItem}
-					'wcf.page.pageObjectID.search.{@$pageNode->identifier}': '{@$pageObjectIDLanguageItem}',
+					'wcf.page.pageObjectID.search.{@$pageNode->identifier}': '{@$pageObjectIDLanguageItem|encodeJS}',
 				{/if}
 			{/foreach}
-			'wcf.page.pageObjectID.search.noResults': '{lang}wcf.page.pageObjectID.search.noResults{/lang}',
-			'wcf.page.pageObjectID.search.results': '{lang}wcf.page.pageObjectID.search.results{/lang}',
-			'wcf.page.pageObjectID.search.terms': '{lang}wcf.page.pageObjectID.search.terms{/lang}'
+			'wcf.page.pageObjectID.search.noResults': '{jslang}wcf.page.pageObjectID.search.noResults{/jslang}',
+			'wcf.page.pageObjectID.search.results': '{jslang}wcf.page.pageObjectID.search.results{/jslang}',
+			'wcf.page.pageObjectID.search.terms': '{jslang}wcf.page.pageObjectID.search.terms{/jslang}'
 		});
 		
 		var handlers = new Dictionary();
@@ -47,7 +47,7 @@
 	{if $action === 'edit'}
 		require(['Language', 'WoltLabSuite/Core/Acp/Ui/Box/Copy'], function (Language, AcpUiBoxCopy) {
 			Language.addObject({
-				'wcf.acp.box.copy': '{lang}wcf.acp.box.copy{/lang}'
+				'wcf.acp.box.copy': '{jslang}wcf.acp.box.copy{/jslang}'
 			});
 			
 			AcpUiBoxCopy.init();
diff --git a/wcfsetup/install/files/acp/templates/boxAddDialog.tpl b/wcfsetup/install/files/acp/templates/boxAddDialog.tpl
index d7d22ea9bc..679f71fd06 100644
--- a/wcfsetup/install/files/acp/templates/boxAddDialog.tpl
+++ b/wcfsetup/install/files/acp/templates/boxAddDialog.tpl
@@ -34,7 +34,7 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Acp/Ui/Box/Add'], function(Language, AcpUiBoxAdd) {
 		Language.addObject({
-			'wcf.acp.box.add': '{lang}wcf.acp.box.add{/lang}'
+			'wcf.acp.box.add': '{jslang}wcf.acp.box.add{/jslang}'
 		});
 		
 		AcpUiBoxAdd.init('{link controller='BoxAdd' encode=false}{literal}boxType={$boxType}&isMultilingual={$isMultilingual}{/literal}{/link}', {@$availableLanguages|count});
diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
index b6f8ae9e63..9d3852c637 100644
--- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
@@ -3,8 +3,8 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.acp.cronjob.log.clear.confirm': '{lang}wcf.acp.cronjob.log.clear.confirm{/lang}',
-			'wcf.acp.cronjob.log.error.details': '{lang}wcf.acp.cronjob.log.error.details{/lang}'
+			'wcf.acp.cronjob.log.clear.confirm': '{jslang}wcf.acp.cronjob.log.clear.confirm{/jslang}',
+			'wcf.acp.cronjob.log.error.details': '{jslang}wcf.acp.cronjob.log.error.details{/jslang}'
 		});
 		
 		new WCF.ACP.Cronjob.LogList();
diff --git a/wcfsetup/install/files/acp/templates/dataImport.tpl b/wcfsetup/install/files/acp/templates/dataImport.tpl
index 048f49a55e..b77a057bec 100644
--- a/wcfsetup/install/files/acp/templates/dataImport.tpl
+++ b/wcfsetup/install/files/acp/templates/dataImport.tpl
@@ -4,9 +4,9 @@
 	$(function() {
 		{if $queue|isset}
 			WCF.Language.addObject({
-				'wcf.acp.dataImport': '{lang}wcf.acp.dataImport{/lang}',
-				'wcf.acp.dataImport.completed': '{lang}wcf.acp.dataImport.completed{/lang}',
-				{implode from=$importers item=importer}'wcf.acp.dataImport.data.{@$importer}': '{lang}wcf.acp.dataImport.data.{@$importer}{/lang}'{/implode}
+				'wcf.acp.dataImport': '{jslang}wcf.acp.dataImport{/jslang}',
+				'wcf.acp.dataImport.completed': '{jslang}wcf.acp.dataImport.completed{/jslang}',
+				{implode from=$importers item=importer}'wcf.acp.dataImport.data.{@$importer}': '{jslang}wcf.acp.dataImport.data.{@$importer}{/jslang}'{/implode}
 			});
 			
 			var $queues = [ {implode from=$queue item=item}'{@$item}'{/implode} ];
diff --git a/wcfsetup/install/files/acp/templates/devtoolsNotificationTest.tpl b/wcfsetup/install/files/acp/templates/devtoolsNotificationTest.tpl
index 09acf84468..d35fccfcef 100644
--- a/wcfsetup/install/files/acp/templates/devtoolsNotificationTest.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsNotificationTest.tpl
@@ -32,7 +32,7 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Acp/Ui/Devtools/Notification/Test'], function(Language, AcpUiDevtoolsNotificationTest) {
 		Language.addObject({
-			'wcf.acp.devtools.notificationTest.button.test': '{lang}wcf.acp.devtools.notificationTest.button.test{/lang}'
+			'wcf.acp.devtools.notificationTest.button.test': '{jslang}wcf.acp.devtools.notificationTest.button.test{/jslang}'
 		});
 		
 		AcpUiDevtoolsNotificationTest.init();
diff --git a/wcfsetup/install/files/acp/templates/devtoolsProjectPipEntryList.tpl b/wcfsetup/install/files/acp/templates/devtoolsProjectPipEntryList.tpl
index 7e4ed668d5..0cecbc0ed5 100644
--- a/wcfsetup/install/files/acp/templates/devtoolsProjectPipEntryList.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsProjectPipEntryList.tpl
@@ -128,9 +128,9 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Acp/Ui/Devtools/Project/Pip/Entry/List'], function(Language, DevtoolsProjectPipEntryList) {
 		Language.addObject({
-			'wcf.acp.devtools.project.pip.entry.delete.addDeleteInstruction': '{lang}wcf.acp.devtools.project.pip.entry.delete.addDeleteInstruction{/lang}',
-			'wcf.acp.devtools.project.pip.entry.delete.addDeleteInstruction.description': '{lang}wcf.acp.devtools.project.pip.entry.delete.addDeleteInstruction.description{/lang}',
-			'wcf.acp.devtools.project.pip.entry.delete.confirmMessage': '{lang}wcf.acp.devtools.project.pip.entry.delete.confirmMessage{/lang}'
+			'wcf.acp.devtools.project.pip.entry.delete.addDeleteInstruction': '{jslang}wcf.acp.devtools.project.pip.entry.delete.addDeleteInstruction{/jslang}',
+			'wcf.acp.devtools.project.pip.entry.delete.addDeleteInstruction.description': '{jslang}wcf.acp.devtools.project.pip.entry.delete.addDeleteInstruction.description{/jslang}',
+			'wcf.acp.devtools.project.pip.entry.delete.confirmMessage': '{jslang}wcf.acp.devtools.project.pip.entry.delete.confirmMessage{/jslang}'
 		});
 		
 		new DevtoolsProjectPipEntryList('devtoolsProjectPipEntryList', '{@$project->projectID}', '{@$pip}', '{@$entryType}', {if $pipObject->getPip()->supportsDeleteInstruction()}true{else}false{/if});
diff --git a/wcfsetup/install/files/acp/templates/devtoolsProjectSync.tpl b/wcfsetup/install/files/acp/templates/devtoolsProjectSync.tpl
index 1b4650888d..72d8e60404 100644
--- a/wcfsetup/install/files/acp/templates/devtoolsProjectSync.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsProjectSync.tpl
@@ -81,8 +81,8 @@
 	<script data-relocate="true">
 		require(['Language', 'WoltLabSuite/Core/Acp/Ui/Devtools/Project/Sync'], function(Language, AcpUiDevtoolsProjectSync) {
 			Language.addObject({
-				'wcf.acp.devtools.sync.status.failure': '{lang}wcf.acp.devtools.sync.status.failure{/lang}',
-				'wcf.acp.devtools.sync.syncAll': '{lang}wcf.acp.devtools.sync.syncAll{/lang}'
+				'wcf.acp.devtools.sync.status.failure': '{jslang}wcf.acp.devtools.sync.status.failure{/jslang}',
+				'wcf.acp.devtools.sync.syncAll': '{jslang}wcf.acp.devtools.sync.syncAll{/jslang}'
 			});
 			
 			AcpUiDevtoolsProjectSync.init({$object->projectID});
diff --git a/wcfsetup/install/files/acp/templates/fontAwesomeJavaScript.tpl b/wcfsetup/install/files/acp/templates/fontAwesomeJavaScript.tpl
index 7bc89c3680..f7088beb4a 100644
--- a/wcfsetup/install/files/acp/templates/fontAwesomeJavaScript.tpl
+++ b/wcfsetup/install/files/acp/templates/fontAwesomeJavaScript.tpl
@@ -1,10 +1,10 @@
 <script>
 	require(['Language', 'WoltLabSuite/Core/Ui/Style/FontAwesome'], function (Language, UiStyleFontAwesome) {
 		Language.addObject({
-			'wcf.global.filter.button.clear': '{lang}wcf.global.filter.button.clear{/lang}',
-			'wcf.global.filter.error.noMatches': '{lang}wcf.global.filter.error.noMatches{/lang}',
-			'wcf.global.filter.placeholder': '{lang}wcf.global.filter.placeholder{/lang}',
-			'wcf.global.fontAwesome.selectIcon': '{lang}wcf.global.fontAwesome.selectIcon{/lang}'
+			'wcf.global.filter.button.clear': '{jslang}wcf.global.filter.button.clear{/jslang}',
+			'wcf.global.filter.error.noMatches': '{jslang}wcf.global.filter.error.noMatches{/jslang}',
+			'wcf.global.filter.placeholder': '{jslang}wcf.global.filter.placeholder{/jslang}',
+			'wcf.global.fontAwesome.selectIcon': '{jslang}wcf.global.fontAwesome.selectIcon{/jslang}'
 		});
 		
 		UiStyleFontAwesome.setup({@$__wcf->getStyleHandler()->getIcons(true)});
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index e8d515dd29..2d8c3ded6f 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<meta name="robots" content="noindex">
-	<title>{if $pageTitle|isset}{@$pageTitle|language} - {/if}{lang}wcf.global.acp{/lang}{if PACKAGE_ID} - {PAGE_TITLE|language}{/if}</title>
+	<title>{if $pageTitle|isset}{@$pageTitle|language} - {/if}{jslang}wcf.global.acp{/jslang}{if PACKAGE_ID} - {PAGE_TITLE|language}{/if}</title>
 	
 	{* work-around for Microsoft Edge that sometimes does not apply this style, if it was set via an external stylesheet *}
 	<style>ol, ul { list-style: none; }</style>
@@ -69,80 +69,80 @@
 	<script>
 		require(['Language', 'WoltLabSuite/Core/Acp/Bootstrap', 'User'], function(Language, AcpBootstrap, User) {
 			Language.addObject({
-				'__days': [ '{lang}wcf.date.day.sunday{/lang}', '{lang}wcf.date.day.monday{/lang}', '{lang}wcf.date.day.tuesday{/lang}', '{lang}wcf.date.day.wednesday{/lang}', '{lang}wcf.date.day.thursday{/lang}', '{lang}wcf.date.day.friday{/lang}', '{lang}wcf.date.day.saturday{/lang}' ],
-				'__daysShort': [ '{lang}wcf.date.day.sun{/lang}', '{lang}wcf.date.day.mon{/lang}', '{lang}wcf.date.day.tue{/lang}', '{lang}wcf.date.day.wed{/lang}', '{lang}wcf.date.day.thu{/lang}', '{lang}wcf.date.day.fri{/lang}', '{lang}wcf.date.day.sat{/lang}' ],
-				'__months': [ '{lang}wcf.date.month.january{/lang}', '{lang}wcf.date.month.february{/lang}', '{lang}wcf.date.month.march{/lang}', '{lang}wcf.date.month.april{/lang}', '{lang}wcf.date.month.may{/lang}', '{lang}wcf.date.month.june{/lang}', '{lang}wcf.date.month.july{/lang}', '{lang}wcf.date.month.august{/lang}', '{lang}wcf.date.month.september{/lang}', '{lang}wcf.date.month.october{/lang}', '{lang}wcf.date.month.november{/lang}', '{lang}wcf.date.month.december{/lang}' ], 
-				'__monthsShort': [ '{lang}wcf.date.month.short.jan{/lang}', '{lang}wcf.date.month.short.feb{/lang}', '{lang}wcf.date.month.short.mar{/lang}', '{lang}wcf.date.month.short.apr{/lang}', '{lang}wcf.date.month.short.may{/lang}', '{lang}wcf.date.month.short.jun{/lang}', '{lang}wcf.date.month.short.jul{/lang}', '{lang}wcf.date.month.short.aug{/lang}', '{lang}wcf.date.month.short.sep{/lang}', '{lang}wcf.date.month.short.oct{/lang}', '{lang}wcf.date.month.short.nov{/lang}', '{lang}wcf.date.month.short.dec{/lang}' ],
-				'wcf.acp.search.noResults': '{lang}wcf.acp.search.noResults{/lang}',
-				'wcf.clipboard.item.unmarkAll': '{lang}wcf.clipboard.item.unmarkAll{/lang}',
-				'wcf.clipboard.item.markAll': '{lang}wcf.clipboard.item.markAll{/lang}',
-				'wcf.clipboard.item.mark': '{lang}wcf.clipboard.item.mark{/lang}',
-				'wcf.date.relative.now': '{lang __literal=true}wcf.date.relative.now{/lang}',
-				'wcf.date.relative.minutes': '{capture assign=relativeMinutes}{lang __literal=true}wcf.date.relative.minutes{/lang}{/capture}{@$relativeMinutes|encodeJS}',
-				'wcf.date.relative.hours': '{capture assign=relativeHours}{lang __literal=true}wcf.date.relative.hours{/lang}{/capture}{@$relativeHours|encodeJS}',
-				'wcf.date.relative.pastDays': '{capture assign=relativePastDays}{lang __literal=true}wcf.date.relative.pastDays{/lang}{/capture}{@$relativePastDays|encodeJS}',
+				'__days': [ '{jslang}wcf.date.day.sunday{/jslang}', '{jslang}wcf.date.day.monday{/jslang}', '{jslang}wcf.date.day.tuesday{/jslang}', '{jslang}wcf.date.day.wednesday{/jslang}', '{jslang}wcf.date.day.thursday{/jslang}', '{jslang}wcf.date.day.friday{/jslang}', '{jslang}wcf.date.day.saturday{/jslang}' ],
+				'__daysShort': [ '{jslang}wcf.date.day.sun{/jslang}', '{jslang}wcf.date.day.mon{/jslang}', '{jslang}wcf.date.day.tue{/jslang}', '{jslang}wcf.date.day.wed{/jslang}', '{jslang}wcf.date.day.thu{/jslang}', '{jslang}wcf.date.day.fri{/jslang}', '{jslang}wcf.date.day.sat{/jslang}' ],
+				'__months': [ '{jslang}wcf.date.month.january{/jslang}', '{jslang}wcf.date.month.february{/jslang}', '{jslang}wcf.date.month.march{/jslang}', '{jslang}wcf.date.month.april{/jslang}', '{jslang}wcf.date.month.may{/jslang}', '{jslang}wcf.date.month.june{/jslang}', '{jslang}wcf.date.month.july{/jslang}', '{jslang}wcf.date.month.august{/jslang}', '{jslang}wcf.date.month.september{/jslang}', '{jslang}wcf.date.month.october{/jslang}', '{jslang}wcf.date.month.november{/jslang}', '{jslang}wcf.date.month.december{/jslang}' ], 
+				'__monthsShort': [ '{jslang}wcf.date.month.short.jan{/jslang}', '{jslang}wcf.date.month.short.feb{/jslang}', '{jslang}wcf.date.month.short.mar{/jslang}', '{jslang}wcf.date.month.short.apr{/jslang}', '{jslang}wcf.date.month.short.may{/jslang}', '{jslang}wcf.date.month.short.jun{/jslang}', '{jslang}wcf.date.month.short.jul{/jslang}', '{jslang}wcf.date.month.short.aug{/jslang}', '{jslang}wcf.date.month.short.sep{/jslang}', '{jslang}wcf.date.month.short.oct{/jslang}', '{jslang}wcf.date.month.short.nov{/jslang}', '{jslang}wcf.date.month.short.dec{/jslang}' ],
+				'wcf.acp.search.noResults': '{jslang}wcf.acp.search.noResults{/jslang}',
+				'wcf.clipboard.item.unmarkAll': '{jslang}wcf.clipboard.item.unmarkAll{/jslang}',
+				'wcf.clipboard.item.markAll': '{jslang}wcf.clipboard.item.markAll{/jslang}',
+				'wcf.clipboard.item.mark': '{jslang}wcf.clipboard.item.mark{/jslang}',
+				'wcf.date.relative.now': '{jslang __literal=true}wcf.date.relative.now{/jslang}',
+				'wcf.date.relative.minutes': '{jslang __literal=true}wcf.date.relative.minutes{/jslang}',
+				'wcf.date.relative.hours': '{jslang __literal=true}wcf.date.relative.hours{/jslang}',
+				'wcf.date.relative.pastDays': '{jslang __literal=true}wcf.date.relative.pastDays{/jslang}',
 				'wcf.date.dateFormat': '{"wcf.date.dateFormat"|language|encodeJS}',
-				'wcf.date.dateTimeFormat': '{lang}wcf.date.dateTimeFormat{/lang}',
-				'wcf.date.shortDateTimeFormat': '{lang}wcf.date.shortDateTimeFormat{/lang}',
-				'wcf.date.hour': '{lang}wcf.date.hour{/lang}',
-				'wcf.date.minute': '{lang}wcf.date.minute{/lang}',
-				'wcf.date.timeFormat': '{lang}wcf.date.timeFormat{/lang}',
-				'wcf.date.firstDayOfTheWeek': '{lang}wcf.date.firstDayOfTheWeek{/lang}',
-				'wcf.global.button.add': '{lang}wcf.global.button.add{/lang}',
-				'wcf.global.button.cancel': '{lang}wcf.global.button.cancel{/lang}',
-				'wcf.global.button.close': '{lang}wcf.global.button.close{/lang}',
-				'wcf.global.button.collapsible': '{lang}wcf.global.button.collapsible{/lang}',
-				'wcf.global.button.delete': '{lang}wcf.global.button.delete{/lang}',
-				'wcf.global.button.disable': '{lang}wcf.global.button.disable{/lang}',
-				'wcf.global.button.disabledI18n': '{lang}wcf.global.button.disabledI18n{/lang}',
-				'wcf.global.button.edit': '{lang}wcf.global.button.edit{/lang}',
-				'wcf.global.button.enable': '{lang}wcf.global.button.enable{/lang}',
-				'wcf.global.button.hide': '{lang}wcf.global.button.hide{/lang}',
-				'wcf.global.button.insert': '{lang}wcf.global.button.insert{/lang}',
-				'wcf.global.button.next': '{lang}wcf.global.button.next{/lang}',
-				'wcf.global.button.preview': '{lang}wcf.global.button.preview{/lang}',
-				'wcf.global.button.reset': '{lang}wcf.global.button.reset{/lang}',
-				'wcf.global.button.save': '{lang}wcf.global.button.save{/lang}',
-				'wcf.global.button.search': '{lang}wcf.global.button.search{/lang}',
-				'wcf.global.button.submit': '{lang}wcf.global.button.submit{/lang}',
-				'wcf.global.button.upload': '{lang}wcf.global.button.upload{/lang}',
-				'wcf.global.confirmation.cancel': '{lang}wcf.global.confirmation.cancel{/lang}',
-				'wcf.global.confirmation.confirm': '{lang}wcf.global.confirmation.confirm{/lang}',
-				'wcf.global.confirmation.title': '{lang}wcf.global.confirmation.title{/lang}',
-				'wcf.global.decimalPoint': '{capture assign=decimalPoint}{lang}wcf.global.decimalPoint{/lang}{/capture}{$decimalPoint|encodeJS}',
-				'wcf.global.error.timeout': '{lang}wcf.global.error.timeout{/lang}',
-				'wcf.global.error.title': '{lang}wcf.global.error.title{/lang}',
-				'wcf.global.form.error.empty': '{lang}wcf.global.form.error.empty{/lang}',
-				'wcf.global.form.error.greaterThan': '{lang __literal=true}wcf.global.form.error.greaterThan{/lang}',
-				'wcf.global.form.error.lessThan': '{lang __literal=true}wcf.global.form.error.lessThan{/lang}',
-				'wcf.global.form.error.multilingual': '{lang}wcf.global.form.error.multilingual{/lang}',
-				'wcf.global.form.input.maxItems': '{lang}wcf.global.form.input.maxItems{/lang}',
-				'wcf.global.language.noSelection': '{lang}wcf.global.language.noSelection{/lang}',
-				'wcf.global.loading': '{lang}wcf.global.loading{/lang}',
-				'wcf.global.noSelection': '{lang}wcf.global.noSelection{/lang}',
-				'wcf.global.select': '{lang}wcf.global.select{/lang}',
-				'wcf.page.jumpTo': '{lang}wcf.page.jumpTo{/lang}',
-				'wcf.page.jumpTo.description': '{lang}wcf.page.jumpTo.description{/lang}',
-				'wcf.global.page.pagination': '{lang}wcf.global.page.pagination{/lang}',
-				'wcf.global.page.next': '{capture assign=pageNext}{lang}wcf.global.page.next{/lang}{/capture}{@$pageNext|encodeJS}',
-				'wcf.global.page.previous': '{capture assign=pagePrevious}{lang}wcf.global.page.previous{/lang}{/capture}{@$pagePrevious|encodeJS}',
-				'wcf.global.pageDirection': '{lang}wcf.global.pageDirection{/lang}',
-				'wcf.global.reason': '{lang}wcf.global.reason{/lang}',
-				'wcf.global.scrollUp': '{lang}wcf.global.scrollUp{/lang}',
-				'wcf.global.success': '{lang}wcf.global.success{/lang}',
-				'wcf.global.success.add': '{lang}wcf.global.success.add{/lang}',
-				'wcf.global.success.edit': '{lang}wcf.global.success.edit{/lang}',
-				'wcf.global.thousandsSeparator': '{capture assign=thousandsSeparator}{lang}wcf.global.thousandsSeparator{/lang}{/capture}{@$thousandsSeparator|encodeJS}',
-				'wcf.page.pagePosition': '{lang __literal=true}wcf.page.pagePosition{/lang}',
-				'wcf.menu.page': '{lang}wcf.menu.page{/lang}',
-				'wcf.menu.user': '{lang}wcf.menu.user{/lang}',
-				'wcf.date.datePicker': '{lang}wcf.date.datePicker{/lang}',
-				'wcf.date.datePicker.previousMonth': '{lang}wcf.date.datePicker.previousMonth{/lang}',
-				'wcf.date.datePicker.nextMonth': '{lang}wcf.date.datePicker.nextMonth{/lang}',
-				'wcf.date.datePicker.month': '{lang}wcf.date.datePicker.month{/lang}',
-				'wcf.date.datePicker.year': '{lang}wcf.date.datePicker.year{/lang}',
-				'wcf.date.datePicker.hour': '{lang}wcf.date.datePicker.hour{/lang}',
-				'wcf.date.datePicker.minute': '{lang}wcf.date.datePicker.minute{/lang}'
+				'wcf.date.dateTimeFormat': '{jslang}wcf.date.dateTimeFormat{/jslang}',
+				'wcf.date.shortDateTimeFormat': '{jslang}wcf.date.shortDateTimeFormat{/jslang}',
+				'wcf.date.hour': '{jslang}wcf.date.hour{/jslang}',
+				'wcf.date.minute': '{jslang}wcf.date.minute{/jslang}',
+				'wcf.date.timeFormat': '{jslang}wcf.date.timeFormat{/jslang}',
+				'wcf.date.firstDayOfTheWeek': '{jslang}wcf.date.firstDayOfTheWeek{/jslang}',
+				'wcf.global.button.add': '{jslang}wcf.global.button.add{/jslang}',
+				'wcf.global.button.cancel': '{jslang}wcf.global.button.cancel{/jslang}',
+				'wcf.global.button.close': '{jslang}wcf.global.button.close{/jslang}',
+				'wcf.global.button.collapsible': '{jslang}wcf.global.button.collapsible{/jslang}',
+				'wcf.global.button.delete': '{jslang}wcf.global.button.delete{/jslang}',
+				'wcf.global.button.disable': '{jslang}wcf.global.button.disable{/jslang}',
+				'wcf.global.button.disabledI18n': '{jslang}wcf.global.button.disabledI18n{/jslang}',
+				'wcf.global.button.edit': '{jslang}wcf.global.button.edit{/jslang}',
+				'wcf.global.button.enable': '{jslang}wcf.global.button.enable{/jslang}',
+				'wcf.global.button.hide': '{jslang}wcf.global.button.hide{/jslang}',
+				'wcf.global.button.insert': '{jslang}wcf.global.button.insert{/jslang}',
+				'wcf.global.button.next': '{jslang}wcf.global.button.next{/jslang}',
+				'wcf.global.button.preview': '{jslang}wcf.global.button.preview{/jslang}',
+				'wcf.global.button.reset': '{jslang}wcf.global.button.reset{/jslang}',
+				'wcf.global.button.save': '{jslang}wcf.global.button.save{/jslang}',
+				'wcf.global.button.search': '{jslang}wcf.global.button.search{/jslang}',
+				'wcf.global.button.submit': '{jslang}wcf.global.button.submit{/jslang}',
+				'wcf.global.button.upload': '{jslang}wcf.global.button.upload{/jslang}',
+				'wcf.global.confirmation.cancel': '{jslang}wcf.global.confirmation.cancel{/jslang}',
+				'wcf.global.confirmation.confirm': '{jslang}wcf.global.confirmation.confirm{/jslang}',
+				'wcf.global.confirmation.title': '{jslang}wcf.global.confirmation.title{/jslang}',
+				'wcf.global.decimalPoint': '{jslang}wcf.global.decimalPoint{/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}',
+				'wcf.global.form.error.multilingual': '{jslang}wcf.global.form.error.multilingual{/jslang}',
+				'wcf.global.form.input.maxItems': '{jslang}wcf.global.form.input.maxItems{/jslang}',
+				'wcf.global.language.noSelection': '{jslang}wcf.global.language.noSelection{/jslang}',
+				'wcf.global.loading': '{jslang}wcf.global.loading{/jslang}',
+				'wcf.global.noSelection': '{jslang}wcf.global.noSelection{/jslang}',
+				'wcf.global.select': '{jslang}wcf.global.select{/jslang}',
+				'wcf.page.jumpTo': '{jslang}wcf.page.jumpTo{/jslang}',
+				'wcf.page.jumpTo.description': '{jslang}wcf.page.jumpTo.description{/jslang}',
+				'wcf.global.page.pagination': '{jslang}wcf.global.page.pagination{/jslang}',
+				'wcf.global.page.next': '{jslang}wcf.global.page.next{/jslang}',
+				'wcf.global.page.previous': '{jslang}wcf.global.page.previous{/jslang}',
+				'wcf.global.pageDirection': '{jslang}wcf.global.pageDirection{/jslang}',
+				'wcf.global.reason': '{jslang}wcf.global.reason{/jslang}',
+				'wcf.global.scrollUp': '{jslang}wcf.global.scrollUp{/jslang}',
+				'wcf.global.success': '{jslang}wcf.global.success{/jslang}',
+				'wcf.global.success.add': '{jslang}wcf.global.success.add{/jslang}',
+				'wcf.global.success.edit': '{jslang}wcf.global.success.edit{/jslang}',
+				'wcf.global.thousandsSeparator': '{jslang}wcf.global.thousandsSeparator{/jslang}',
+				'wcf.page.pagePosition': '{jslang __literal=true}wcf.page.pagePosition{/jslang}',
+				'wcf.menu.page': '{jslang}wcf.menu.page{/jslang}',
+				'wcf.menu.user': '{jslang}wcf.menu.user{/jslang}',
+				'wcf.date.datePicker': '{jslang}wcf.date.datePicker{/jslang}',
+				'wcf.date.datePicker.previousMonth': '{jslang}wcf.date.datePicker.previousMonth{/jslang}',
+				'wcf.date.datePicker.nextMonth': '{jslang}wcf.date.datePicker.nextMonth{/jslang}',
+				'wcf.date.datePicker.month': '{jslang}wcf.date.datePicker.month{/jslang}',
+				'wcf.date.datePicker.year': '{jslang}wcf.date.datePicker.year{/jslang}',
+				'wcf.date.datePicker.hour': '{jslang}wcf.date.datePicker.hour{/jslang}',
+				'wcf.date.datePicker.minute': '{jslang}wcf.date.datePicker.minute{/jslang}'
 				{event name='javascriptLanguageImport'}
 			});
 			
diff --git a/wcfsetup/install/files/acp/templates/imageViewer.tpl b/wcfsetup/install/files/acp/templates/imageViewer.tpl
index d49e18a9a1..7845bf54eb 100644
--- a/wcfsetup/install/files/acp/templates/imageViewer.tpl
+++ b/wcfsetup/install/files/acp/templates/imageViewer.tpl
@@ -3,14 +3,14 @@
 		var $imageViewer = null;
 		$(function() {
 			WCF.Language.addObject({
-				'wcf.imageViewer.button.enlarge': '{lang}wcf.imageViewer.button.enlarge{/lang}',
-				'wcf.imageViewer.button.full': '{lang}wcf.imageViewer.button.full{/lang}',
-				'wcf.imageViewer.seriesIndex': '{lang __literal=true}wcf.imageViewer.seriesIndex{/lang}',
-				'wcf.imageViewer.counter': '{lang}wcf.imageViewer.counter{/lang}',
-				'wcf.imageViewer.close': '{lang}wcf.imageViewer.close{/lang}',
-				'wcf.imageViewer.enlarge': '{lang}wcf.imageViewer.enlarge{/lang}',
-				'wcf.imageViewer.next': '{lang}wcf.imageViewer.next{/lang}',
-				'wcf.imageViewer.previous': '{lang}wcf.imageViewer.previous{/lang}'
+				'wcf.imageViewer.button.enlarge': '{jslang}wcf.imageViewer.button.enlarge{/jslang}',
+				'wcf.imageViewer.button.full': '{jslang}wcf.imageViewer.button.full{/jslang}',
+				'wcf.imageViewer.seriesIndex': '{jslang __literal=true}wcf.imageViewer.seriesIndex{/jslang}',
+				'wcf.imageViewer.counter': '{jslang}wcf.imageViewer.counter{/jslang}',
+				'wcf.imageViewer.close': '{jslang}wcf.imageViewer.close{/jslang}',
+				'wcf.imageViewer.enlarge': '{jslang}wcf.imageViewer.enlarge{/jslang}',
+				'wcf.imageViewer.next': '{jslang}wcf.imageViewer.next{/jslang}',
+				'wcf.imageViewer.previous': '{jslang}wcf.imageViewer.previous{/jslang}'
 			});
 			
 			$imageViewer = new WCF.ImageViewer();
@@ -28,4 +28,4 @@
 	</script>
 	
 	{assign var=__imageViewerLoaded value=true}
-{/if}
\ No newline at end of file
+{/if}
diff --git a/wcfsetup/install/files/acp/templates/languageItemList.tpl b/wcfsetup/install/files/acp/templates/languageItemList.tpl
index f2da135f2d..f037ff9153 100644
--- a/wcfsetup/install/files/acp/templates/languageItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageItemList.tpl
@@ -3,7 +3,7 @@
 <script data-relocate="true" src="{@$__wcf->getPath()}acp/js/WCF.ACP.Language.js?v={@LAST_UPDATE_TIME}"></script>
 <script data-relocate="true">
 	$(function() {
-		WCF.Language.add('wcf.acp.language.item.delete.confirmMessage', '{lang}wcf.acp.language.item.delete.confirmMessage{/lang}');
+		WCF.Language.add('wcf.acp.language.item.delete.confirmMessage', '{jslang}wcf.acp.language.item.delete.confirmMessage{/jslang}');
 		
 		new WCF.ACP.Language.ItemList();
 	});
diff --git a/wcfsetup/install/files/acp/templates/mediaJavaScript.tpl b/wcfsetup/install/files/acp/templates/mediaJavaScript.tpl
index 609991a1bf..b9016db077 100644
--- a/wcfsetup/install/files/acp/templates/mediaJavaScript.tpl
+++ b/wcfsetup/install/files/acp/templates/mediaJavaScript.tpl
@@ -1,28 +1,28 @@
 {if $__wcf->session->getPermission('admin.content.cms.canUseMedia')}
 	require(['Language', 'Permission'], function(Language, Permission) {
 		Language.addObject({
-			'wcf.global.button.insert': '{lang}wcf.global.button.insert{/lang}',
-			'wcf.media.button.replaceFile': '{lang}wcf.media.button.replaceFile{/lang}',
-			'wcf.media.button.select': '{lang}wcf.media.button.select{/lang}',
-			'wcf.media.delete.confirmMessage': '{lang __encode=true __literal=true}wcf.media.delete.confirmMessage{/lang}',
-			'wcf.media.imageDimensions.value': '{lang __literal=true}wcf.media.imageDimensions.value{/lang}',
-			'wcf.media.insert': '{lang}wcf.media.insert{/lang}',
-			'wcf.media.insert.imageSize': '{lang}wcf.media.insert.imageSize{/lang}',
-			'wcf.media.insert.imageSize.small': '{lang}wcf.media.insert.imageSize.small{/lang}',
-			'wcf.media.insert.imageSize.medium': '{lang}wcf.media.insert.imageSize.medium{/lang}',
-			'wcf.media.insert.imageSize.large': '{lang}wcf.media.insert.imageSize.large{/lang}',
-			'wcf.media.insert.imageSize.original': '{lang}wcf.media.insert.imageSize.original{/lang}',
-			'wcf.media.manager': '{lang}wcf.media.manager{/lang}',
-			'wcf.media.edit': '{lang}wcf.media.edit{/lang}',
-			'wcf.media.button.insert': '{lang}wcf.media.button.insert{/lang}',
-			'wcf.media.search.info.searchStringThreshold': '{lang __literal=true}wcf.media.search.info.searchStringThreshold{/lang}',
-			'wcf.media.search.noResults': '{lang}wcf.media.search.noResults{/lang}',
-			'wcf.media.upload.error.differentFileExtension': '{lang}wcf.media.upload.error.differentFileExtension{/lang}',
-			'wcf.media.upload.error.differentFileType': '{lang}wcf.media.upload.error.differentFileType{/lang}',
-			'wcf.media.upload.error.noImage': '{lang}wcf.media.upload.error.noImage{/lang}',
-			'wcf.media.upload.error.uploadFailed': '{lang}wcf.media.upload.error.uploadFailed{/lang}',
-			'wcf.media.upload.success': '{lang}wcf.media.upload.success{/lang}',
-			'wcf.media.setCategory': '{lang}wcf.media.setCategory{/lang}'
+			'wcf.global.button.insert': '{jslang}wcf.global.button.insert{/jslang}',
+			'wcf.media.button.replaceFile': '{jslang}wcf.media.button.replaceFile{/jslang}',
+			'wcf.media.button.select': '{jslang}wcf.media.button.select{/jslang}',
+			'wcf.media.delete.confirmMessage': '{jslang __encode=true __literal=true}wcf.media.delete.confirmMessage{/jslang}',
+			'wcf.media.imageDimensions.value': '{jslang __literal=true}wcf.media.imageDimensions.value{/jslang}',
+			'wcf.media.insert': '{jslang}wcf.media.insert{/jslang}',
+			'wcf.media.insert.imageSize': '{jslang}wcf.media.insert.imageSize{/jslang}',
+			'wcf.media.insert.imageSize.small': '{jslang}wcf.media.insert.imageSize.small{/jslang}',
+			'wcf.media.insert.imageSize.medium': '{jslang}wcf.media.insert.imageSize.medium{/jslang}',
+			'wcf.media.insert.imageSize.large': '{jslang}wcf.media.insert.imageSize.large{/jslang}',
+			'wcf.media.insert.imageSize.original': '{jslang}wcf.media.insert.imageSize.original{/jslang}',
+			'wcf.media.manager': '{jslang}wcf.media.manager{/jslang}',
+			'wcf.media.edit': '{jslang}wcf.media.edit{/jslang}',
+			'wcf.media.button.insert': '{jslang}wcf.media.button.insert{/jslang}',
+			'wcf.media.search.info.searchStringThreshold': '{jslang __literal=true}wcf.media.search.info.searchStringThreshold{/jslang}',
+			'wcf.media.search.noResults': '{jslang}wcf.media.search.noResults{/jslang}',
+			'wcf.media.upload.error.differentFileExtension': '{jslang}wcf.media.upload.error.differentFileExtension{/jslang}',
+			'wcf.media.upload.error.differentFileType': '{jslang}wcf.media.upload.error.differentFileType{/jslang}',
+			'wcf.media.upload.error.noImage': '{jslang}wcf.media.upload.error.noImage{/jslang}',
+			'wcf.media.upload.error.uploadFailed': '{jslang}wcf.media.upload.error.uploadFailed{/jslang}',
+			'wcf.media.upload.success': '{jslang}wcf.media.upload.success{/jslang}',
+			'wcf.media.setCategory': '{jslang}wcf.media.setCategory{/jslang}'
 		});
 		
 		Permission.add('admin.content.cms.canManageMedia', {if $__wcf->session->getPermission('admin.content.cms.canManageMedia')}true{else}false{/if});
diff --git a/wcfsetup/install/files/acp/templates/mediaList.tpl b/wcfsetup/install/files/acp/templates/mediaList.tpl
index c9ac52018d..cda3c98fa7 100644
--- a/wcfsetup/install/files/acp/templates/mediaList.tpl
+++ b/wcfsetup/install/files/acp/templates/mediaList.tpl
@@ -5,8 +5,8 @@
 	
 	require(['Language', 'WoltLabSuite/Core/Controller/Media/List'], function (Language, ControllerMediaList) {
 		Language.addObject({
-			'wcf.media.delete.confirmMessage': '{lang __literal=true}wcf.media.delete.confirmMessage{/lang}',
-			'wcf.media.setCategory': '{lang}wcf.media.setCategory{/lang}'
+			'wcf.media.delete.confirmMessage': '{jslang __literal=true}wcf.media.delete.confirmMessage{/jslang}',
+			'wcf.media.setCategory': '{jslang}wcf.media.setCategory{/jslang}'
 		});
 		
 		ControllerMediaList.init({
diff --git a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
index 958bad162e..ca38dc46c8 100644
--- a/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/menuItemAdd.tpl
@@ -3,20 +3,20 @@
 <script data-relocate="true">
 	require(['Dictionary', 'Language', 'WoltLabSuite/Core/Acp/Ui/Menu/Item/Handler'], function(Dictionary, Language, AcpUiMenuItemHandler) {
 		Language.addObject({
-			'wcf.page.pageObjectID': '{lang}wcf.page.pageObjectID{/lang}',
+			'wcf.page.pageObjectID': '{jslang}wcf.page.pageObjectID{/jslang}',
 			{foreach from=$pageNodeList item=pageNode}
 				{capture assign='pageObjectIDLanguageItem'}{lang __optional=true}wcf.page.pageObjectID.{@$pageNode->identifier}{/lang}{/capture}
 				{if $pageObjectIDLanguageItem}
-					'wcf.page.pageObjectID.{@$pageNode->identifier}': '{@$pageObjectIDLanguageItem}',
+					'wcf.page.pageObjectID.{@$pageNode->identifier}': '{@$pageObjectIDLanguageItem|encodeJS}',
 				{/if}
 				{capture assign='pageObjectIDLanguageItem'}{lang __optional=true}wcf.page.pageObjectID.search.{@$pageNode->identifier}{/lang}{/capture}
 				{if $pageObjectIDLanguageItem}
-					'wcf.page.pageObjectID.search.{@$pageNode->identifier}': '{@$pageObjectIDLanguageItem}',
+					'wcf.page.pageObjectID.search.{@$pageNode->identifier}': '{@$pageObjectIDLanguageItem|encodeJS}',
 				{/if}
 			{/foreach}
-			'wcf.page.pageObjectID.search.noResults': '{lang}wcf.page.pageObjectID.search.noResults{/lang}',
-			'wcf.page.pageObjectID.search.results': '{lang}wcf.page.pageObjectID.search.results{/lang}',
-			'wcf.page.pageObjectID.search.terms': '{lang}wcf.page.pageObjectID.search.terms{/lang}'
+			'wcf.page.pageObjectID.search.noResults': '{jslang}wcf.page.pageObjectID.search.noResults{/jslang}',
+			'wcf.page.pageObjectID.search.results': '{jslang}wcf.page.pageObjectID.search.results{/jslang}',
+			'wcf.page.pageObjectID.search.terms': '{jslang}wcf.page.pageObjectID.search.terms{/jslang}'
 		});
 		
 		var handlers = new Dictionary();
diff --git a/wcfsetup/install/files/acp/templates/multipleLanguageInputJavascript.tpl b/wcfsetup/install/files/acp/templates/multipleLanguageInputJavascript.tpl
index 2570fd2dd5..875d3f0106 100644
--- a/wcfsetup/install/files/acp/templates/multipleLanguageInputJavascript.tpl
+++ b/wcfsetup/install/files/acp/templates/multipleLanguageInputJavascript.tpl
@@ -2,7 +2,7 @@
 	<script data-relocate="true">
 		require(['Language', 'WoltLabSuite/Core/Language/Input', 'WoltLabSuite/Core/Language/Text'], function(Language, LanguageInput, LanguageText) {
 			Language.addObject({
-				'wcf.global.button.disabledI18n': '{lang}wcf.global.button.disabledI18n{/lang}'
+				'wcf.global.button.disabledI18n': '{jslang}wcf.global.button.disabledI18n{/jslang}'
 			});
 			
 			var availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };
diff --git a/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl b/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl
index 433922d6b3..baff58e084 100644
--- a/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl
+++ b/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl
@@ -3,9 +3,9 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Controller/User/Notification/Settings'], function(Language, ControllerUserNotificationSettings) {
 		Language.addObject({
-			'wcf.user.notification.mailNotificationType.daily': '{lang}wcf.user.notification.mailNotificationType.daily{/lang}',
-			'wcf.user.notification.mailNotificationType.instant': '{lang}wcf.user.notification.mailNotificationType.instant{/lang}',
-			'wcf.user.notification.mailNotificationType.none': '{lang}wcf.user.notification.mailNotificationType.none{/lang}'
+			'wcf.user.notification.mailNotificationType.daily': '{jslang}wcf.user.notification.mailNotificationType.daily{/jslang}',
+			'wcf.user.notification.mailNotificationType.instant': '{jslang}wcf.user.notification.mailNotificationType.instant{/jslang}',
+			'wcf.user.notification.mailNotificationType.none': '{jslang}wcf.user.notification.mailNotificationType.none{/jslang}'
 		});
 		
 		ControllerUserNotificationSettings.setup();
diff --git a/wcfsetup/install/files/acp/templates/package.tpl b/wcfsetup/install/files/acp/templates/package.tpl
index 2c2155fb9d..be9dc6b9e0 100644
--- a/wcfsetup/install/files/acp/templates/package.tpl
+++ b/wcfsetup/install/files/acp/templates/package.tpl
@@ -3,7 +3,7 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.acp.package.uninstallation.title': '{lang}wcf.acp.package.uninstallation.title{/lang}'
+			'wcf.acp.package.uninstallation.title': '{jslang}wcf.acp.package.uninstallation.title{/jslang}'
 		});
 		
 		new WCF.ACP.Package.Uninstallation($('.jsUninstallButton'), {if PACKAGE_ID > 1}'{link controller='PackageList' forceWCF=true encode=false}packageID={literal}{packageID}{/literal}{/link}'{else}null{/if});
diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
index 7965260a9a..738edee4dd 100644
--- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
@@ -4,10 +4,10 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.acp.package.install.title': '{lang}wcf.acp.package.install.title{/lang}',
-			'wcf.acp.package.installation.rollback': '{lang}wcf.acp.package.installation.rollback{/lang}',
-			'wcf.acp.package.uninstallation.title': '{lang}wcf.acp.package.uninstallation.title{/lang}',
-			'wcf.acp.package.update.title': '{lang}wcf.acp.package.update.title{/lang}'
+			'wcf.acp.package.install.title': '{jslang}wcf.acp.package.install.title{/jslang}',
+			'wcf.acp.package.installation.rollback': '{jslang}wcf.acp.package.installation.rollback{/jslang}',
+			'wcf.acp.package.uninstallation.title': '{jslang}wcf.acp.package.uninstallation.title{/jslang}',
+			'wcf.acp.package.update.title': '{jslang}wcf.acp.package.update.title{/jslang}'
 		});
 		
 		new WCF.ACP.Package.Installation({@$queue->queueID}, undefined, {if $queue->action == 'install'}{if $queue->isApplication}false{else}true{/if}, false{else}false, true{/if});
diff --git a/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl b/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
index 43d0fae828..78433d5cf7 100644
--- a/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
@@ -8,7 +8,7 @@
 </style>
 <script data-relocate="true">
 	$(function() {
-		WCF.Language.add('wcf.acp.package.install.title', '{lang}wcf.acp.package.install.title{/lang}');
+		WCF.Language.add('wcf.acp.package.install.title', '{jslang}wcf.acp.package.install.title{/jslang}');
 		
 		var $installation = new WCF.ACP.Package.Installation({@$queueID});
 		$installation.prepareInstallation();
diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index f6b2e5c428..29a593c175 100644
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -3,13 +3,13 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.acp.package.searchForUpdates': '{lang}wcf.acp.package.searchForUpdates{/lang}',
-			'wcf.acp.package.searchForUpdates.noResults': '{lang}wcf.acp.package.searchForUpdates.noResults{/lang}',
-			'wcf.acp.package.uninstallation.title': '{lang}wcf.acp.package.uninstallation.title{/lang}',
-			'wcf.acp.pluginStore.authorization': '{lang}wcf.acp.pluginStore.authorization{/lang}',
-			'wcf.acp.pluginStore.purchasedItems': '{lang}wcf.acp.pluginStore.purchasedItems{/lang}',
-			'wcf.acp.pluginStore.purchasedItems.button.search': '{lang}wcf.acp.pluginStore.purchasedItems.button.search{/lang}',
-			'wcf.acp.pluginStore.purchasedItems.noResults': '{lang}wcf.acp.pluginStore.purchasedItems.noResults{/lang}'
+			'wcf.acp.package.searchForUpdates': '{jslang}wcf.acp.package.searchForUpdates{/jslang}',
+			'wcf.acp.package.searchForUpdates.noResults': '{jslang}wcf.acp.package.searchForUpdates.noResults{/jslang}',
+			'wcf.acp.package.uninstallation.title': '{jslang}wcf.acp.package.uninstallation.title{/jslang}',
+			'wcf.acp.pluginStore.authorization': '{jslang}wcf.acp.pluginStore.authorization{/jslang}',
+			'wcf.acp.pluginStore.purchasedItems': '{jslang}wcf.acp.pluginStore.purchasedItems{/jslang}',
+			'wcf.acp.pluginStore.purchasedItems.button.search': '{jslang}wcf.acp.pluginStore.purchasedItems.button.search{/jslang}',
+			'wcf.acp.pluginStore.purchasedItems.noResults': '{jslang}wcf.acp.pluginStore.purchasedItems.noResults{/jslang}'
 		});
 		
 		{if $__wcf->session->getPermission('admin.configuration.package.canUninstallPackage')}
diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index b98f34f2d3..7d00a8247a 100644
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -8,8 +8,8 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Acp/Ui/Package/Search'], function(Language, AcpUiPackageSearch) {
 		Language.addObject({
-			'wcf.acp.package.install.title': '{lang}wcf.acp.package.install.title{/lang}',
-			'wcf.acp.package.update.unauthorized': '{lang}wcf.acp.package.update.unauthorized{/lang}'
+			'wcf.acp.package.install.title': '{jslang}wcf.acp.package.install.title{/jslang}',
+			'wcf.acp.package.update.unauthorized': '{jslang}wcf.acp.package.update.unauthorized{/jslang}'
 		});
 		
 		new AcpUiPackageSearch();
diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
index b9887464aa..df5532a953 100644
--- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
@@ -3,9 +3,9 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.acp.package.update.excludedPackages': '{lang}wcf.acp.package.update.excludedPackages{/lang}',
-			'wcf.acp.package.update.title': '{lang}wcf.acp.package.update.title{/lang}',
-			'wcf.acp.package.update.unauthorized': '{lang}wcf.acp.package.update.unauthorized{/lang}'
+			'wcf.acp.package.update.excludedPackages': '{jslang}wcf.acp.package.update.excludedPackages{/jslang}',
+			'wcf.acp.package.update.title': '{jslang}wcf.acp.package.update.title{/jslang}',
+			'wcf.acp.package.update.unauthorized': '{jslang}wcf.acp.package.update.unauthorized{/jslang}'
 		})
 		
 		new WCF.ACP.Package.Update.Manager();
diff --git a/wcfsetup/install/files/acp/templates/pageAdd.tpl b/wcfsetup/install/files/acp/templates/pageAdd.tpl
index c2ad50176e..1b654e345d 100644
--- a/wcfsetup/install/files/acp/templates/pageAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/pageAdd.tpl
@@ -54,7 +54,7 @@
 	<script data-relocate="true">
 		require(['Language', 'WoltLabSuite/Core/Acp/Ui/Page/Copy'], function (Language, AcpUiPageCopy) {
 			Language.addObject({
-				'wcf.acp.page.copy': '{lang}wcf.acp.page.copy{/lang}'
+				'wcf.acp.page.copy': '{jslang}wcf.acp.page.copy{/jslang}'
 			});
 			
 			AcpUiPageCopy.init();
@@ -541,13 +541,13 @@
 						<script data-relocate="true">
 							require(['Language', 'WoltLabSuite/Core/Ui/ItemList/Filter'], function(Language, UiItemListFilter) {
 								Language.addObject({
-									'wcf.global.filter.button.visibility': '{lang}wcf.global.filter.button.visibility{/lang}',
-									'wcf.global.filter.button.clear': '{lang}wcf.global.filter.button.clear{/lang}',
-									'wcf.global.filter.error.noMatches': '{lang}wcf.global.filter.error.noMatches{/lang}',
-									'wcf.global.filter.placeholder': '{lang}wcf.global.filter.placeholder{/lang}',
-									'wcf.global.filter.visibility.activeOnly': '{lang}wcf.global.filter.visibility.activeOnly{/lang}',
-									'wcf.global.filter.visibility.highlightActive': '{lang}wcf.global.filter.visibility.highlightActive{/lang}',
-									'wcf.global.filter.visibility.showAll': '{lang}wcf.global.filter.visibility.showAll{/lang}'
+									'wcf.global.filter.button.visibility': '{jslang}wcf.global.filter.button.visibility{/jslang}',
+									'wcf.global.filter.button.clear': '{jslang}wcf.global.filter.button.clear{/jslang}',
+									'wcf.global.filter.error.noMatches': '{jslang}wcf.global.filter.error.noMatches{/jslang}',
+									'wcf.global.filter.placeholder': '{jslang}wcf.global.filter.placeholder{/jslang}',
+									'wcf.global.filter.visibility.activeOnly': '{jslang}wcf.global.filter.visibility.activeOnly{/jslang}',
+									'wcf.global.filter.visibility.highlightActive': '{jslang}wcf.global.filter.visibility.highlightActive{/jslang}',
+									'wcf.global.filter.visibility.showAll': '{jslang}wcf.global.filter.visibility.showAll{/jslang}'
 								});
 								
 								new UiItemListFilter('boxVisibilitySettings');
diff --git a/wcfsetup/install/files/acp/templates/pageAddDialog.tpl b/wcfsetup/install/files/acp/templates/pageAddDialog.tpl
index a437a9dbb0..07abf24d39 100644
--- a/wcfsetup/install/files/acp/templates/pageAddDialog.tpl
+++ b/wcfsetup/install/files/acp/templates/pageAddDialog.tpl
@@ -32,7 +32,7 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Acp/Ui/Page/Add'], function(Language, AcpUiPageAdd) {
 		Language.addObject({
-			'wcf.acp.page.add': '{lang}wcf.acp.page.add{/lang}'
+			'wcf.acp.page.add': '{jslang}wcf.acp.page.add{/jslang}'
 		});
 		
 		AcpUiPageAdd.init('{link controller='PageAdd' encode=false}{literal}pageType={$pageType}&isMultilingual={$isMultilingual}{/literal}{/link}', {@$availableLanguages|count});
diff --git a/wcfsetup/install/files/acp/templates/pageBoxOrder.tpl b/wcfsetup/install/files/acp/templates/pageBoxOrder.tpl
index e223de7cd4..39e74ffd6e 100644
--- a/wcfsetup/install/files/acp/templates/pageBoxOrder.tpl
+++ b/wcfsetup/install/files/acp/templates/pageBoxOrder.tpl
@@ -115,8 +115,8 @@
 <script data-relocate="true">
 	require(['Dictionary', 'Language', 'WoltLabSuite/Core/Acp/Ui/Page/BoxOrder'], function (Dictionary, Language, AcpUiPageBoxOrder) {
 		Language.addObject({
-			'wcf.acp.box.isDisabled': '{lang}wcf.acp.box.isDisabled{/lang}',
-			'wcf.acp.page.boxOrder.discard.confirmMessage': '{lang}wcf.acp.page.boxOrder.discard.confirmMessage{/lang}'
+			'wcf.acp.box.isDisabled': '{jslang}wcf.acp.box.isDisabled{/jslang}',
+			'wcf.acp.page.boxOrder.discard.confirmMessage': '{jslang}wcf.acp.page.boxOrder.discard.confirmMessage{/jslang}'
 		});
 		
 		var boxes = new Dictionary();
diff --git a/wcfsetup/install/files/acp/templates/pluginStorePurchasedItems.tpl b/wcfsetup/install/files/acp/templates/pluginStorePurchasedItems.tpl
index cda6026a2a..71d1811113 100644
--- a/wcfsetup/install/files/acp/templates/pluginStorePurchasedItems.tpl
+++ b/wcfsetup/install/files/acp/templates/pluginStorePurchasedItems.tpl
@@ -3,10 +3,10 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.acp.package.install.title': '{lang}wcf.acp.package.install.title{/lang}',
-			'wcf.acp.package.searchForUpdates': '{lang}wcf.acp.package.searchForUpdates{/lang}',
-			'wcf.acp.package.searchForUpdates.noResults': '{lang}wcf.acp.package.searchForUpdates.noResults{/lang}',
-			'wcf.acp.package.update.unauthorized': '{lang}wcf.acp.package.update.unauthorized{/lang}'
+			'wcf.acp.package.install.title': '{jslang}wcf.acp.package.install.title{/jslang}',
+			'wcf.acp.package.searchForUpdates': '{jslang}wcf.acp.package.searchForUpdates{/jslang}',
+			'wcf.acp.package.searchForUpdates.noResults': '{jslang}wcf.acp.package.searchForUpdates.noResults{/jslang}',
+			'wcf.acp.package.update.unauthorized': '{jslang}wcf.acp.package.update.unauthorized{/jslang}'
 		});
 		
 		var $installer = new WCF.ACP.Package.Server.Installation();
diff --git a/wcfsetup/install/files/acp/templates/scrollablePageCheckboxList.tpl b/wcfsetup/install/files/acp/templates/scrollablePageCheckboxList.tpl
index 18a6e86269..d248dab411 100644
--- a/wcfsetup/install/files/acp/templates/scrollablePageCheckboxList.tpl
+++ b/wcfsetup/install/files/acp/templates/scrollablePageCheckboxList.tpl
@@ -1,13 +1,13 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Ui/ItemList/Filter'], function(Language, UiItemListFilter) {
 		Language.addObject({
-			'wcf.global.filter.button.visibility': '{lang}wcf.global.filter.button.visibility{/lang}',
-			'wcf.global.filter.button.clear': '{lang}wcf.global.filter.button.clear{/lang}',
-			'wcf.global.filter.error.noMatches': '{lang}wcf.global.filter.error.noMatches{/lang}',
-			'wcf.global.filter.placeholder': '{lang}wcf.global.filter.placeholder{/lang}',
-			'wcf.global.filter.visibility.activeOnly': '{lang}wcf.global.filter.visibility.activeOnly{/lang}',
-			'wcf.global.filter.visibility.highlightActive': '{lang}wcf.global.filter.visibility.highlightActive{/lang}',
-			'wcf.global.filter.visibility.showAll': '{lang}wcf.global.filter.visibility.showAll{/lang}'
+			'wcf.global.filter.button.visibility': '{jslang}wcf.global.filter.button.visibility{/jslang}',
+			'wcf.global.filter.button.clear': '{jslang}wcf.global.filter.button.clear{/jslang}',
+			'wcf.global.filter.error.noMatches': '{jslang}wcf.global.filter.error.noMatches{/jslang}',
+			'wcf.global.filter.placeholder': '{jslang}wcf.global.filter.placeholder{/jslang}',
+			'wcf.global.filter.visibility.activeOnly': '{jslang}wcf.global.filter.visibility.activeOnly{/jslang}',
+			'wcf.global.filter.visibility.highlightActive': '{jslang}wcf.global.filter.visibility.highlightActive{/jslang}',
+			'wcf.global.filter.visibility.showAll': '{jslang}wcf.global.filter.visibility.showAll{/jslang}'
 		});
 		
 		new UiItemListFilter('{@$pageCheckboxListContainerID}');
diff --git a/wcfsetup/install/files/acp/templates/stat.tpl b/wcfsetup/install/files/acp/templates/stat.tpl
index 94b2488570..ba01ac7b72 100644
--- a/wcfsetup/install/files/acp/templates/stat.tpl
+++ b/wcfsetup/install/files/acp/templates/stat.tpl
@@ -6,11 +6,11 @@
 <script data-relocate="true">
 	$(function() {
 		WCF.Language.addObject({
-			'wcf.acp.stat.timeFormat.daily': '{lang}wcf.acp.stat.timeFormat.daily{/lang}',
-			'wcf.acp.stat.timeFormat.weekly': '{lang}wcf.acp.stat.timeFormat.weekly{/lang}',
-			'wcf.acp.stat.timeFormat.monthly': '{lang}wcf.acp.stat.timeFormat.monthly{/lang}',
-			'wcf.acp.stat.timeFormat.yearly': '{lang}wcf.acp.stat.timeFormat.yearly{/lang}',
-			'wcf.acp.stat.noData': '{lang}wcf.acp.stat.noData{/lang}'
+			'wcf.acp.stat.timeFormat.daily': '{jslang}wcf.acp.stat.timeFormat.daily{/jslang}',
+			'wcf.acp.stat.timeFormat.weekly': '{jslang}wcf.acp.stat.timeFormat.weekly{/jslang}',
+			'wcf.acp.stat.timeFormat.monthly': '{jslang}wcf.acp.stat.timeFormat.monthly{/jslang}',
+			'wcf.acp.stat.timeFormat.yearly': '{jslang}wcf.acp.stat.timeFormat.yearly{/jslang}',
+			'wcf.acp.stat.noData': '{jslang}wcf.acp.stat.noData{/jslang}'
 		});
 		
 		new WCF.ACP.Stat.Chart();
diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index 94ef30885d..2b4e6d52d9 100644
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -17,18 +17,18 @@
 		new WCF.ColorPicker('.jsColorPicker');
 		
 		WCF.Language.addObject({
-			'wcf.style.colorPicker': '{lang}wcf.style.colorPicker{/lang}',
-			'wcf.style.colorPicker.new': '{lang}wcf.style.colorPicker.new{/lang}',
-			'wcf.style.colorPicker.current': '{lang}wcf.style.colorPicker.current{/lang}',
-			'wcf.style.colorPicker.button.apply': '{lang}wcf.style.colorPicker.button.apply{/lang}',
-			'wcf.acp.style.image.error.invalidExtension': '{lang}wcf.acp.style.image.error.invalidExtension{/lang}'
+			'wcf.style.colorPicker': '{jslang}wcf.style.colorPicker{/jslang}',
+			'wcf.style.colorPicker.new': '{jslang}wcf.style.colorPicker.new{/jslang}',
+			'wcf.style.colorPicker.current': '{jslang}wcf.style.colorPicker.current{/jslang}',
+			'wcf.style.colorPicker.button.apply': '{jslang}wcf.style.colorPicker.button.apply{/jslang}',
+			'wcf.acp.style.image.error.invalidExtension': '{jslang}wcf.acp.style.image.error.invalidExtension{/jslang}'
 		});
 		
 		{if $action == 'edit'}
 			new WCF.ACP.Style.CopyStyle({@$style->styleID});
 			
 			WCF.Language.addObject({
-				'wcf.acp.style.copyStyle.confirmMessage': '{@"wcf.acp.style.copyStyle.confirmMessage"|language|encodeJS}'
+				'wcf.acp.style.copyStyle.confirmMessage': '{jslang}wcf.acp.style.copyStyle.confirmMessage{/jslang}'
 			});
 		{/if}
 		
diff --git a/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl b/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
index d0cfc21068..29a6f07203 100644
--- a/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/templateGroupAdd.tpl
@@ -4,12 +4,12 @@
 	<script data-relocate="true">
 		require(['Language', 'WoltLabSuite/Core/Acp/Ui/Template/Group/Copy'], function (Language, AcpUiTemplateGroupCopy) {
 			Language.addObject({
-				'wcf.acp.template.group.copy': '{lang}wcf.acp.template.group.copy{/lang}',
-				'wcf.acp.template.group.name.error.notUnique': '{lang}wcf.acp.template.group.name.error.notUnique{/lang}',
-				'wcf.acp.template.group.folderName': '{lang}wcf.acp.template.group.folderName{/lang}',
-				'wcf.acp.template.group.folderName.error.invalid': '{lang}wcf.acp.template.group.folderName.error.invalid{/lang}',
-				'wcf.acp.template.group.folderName.error.notUnique': '{lang}wcf.acp.template.group.folderName.error.notUnique{/lang}',
-				'wcf.global.name': '{lang}wcf.global.name{/lang}'
+				'wcf.acp.template.group.copy': '{jslang}wcf.acp.template.group.copy{/jslang}',
+				'wcf.acp.template.group.name.error.notUnique': '{jslang}wcf.acp.template.group.name.error.notUnique{/jslang}',
+				'wcf.acp.template.group.folderName': '{jslang}wcf.acp.template.group.folderName{/jslang}',
+				'wcf.acp.template.group.folderName.error.invalid': '{jslang}wcf.acp.template.group.folderName.error.invalid{/jslang}',
+				'wcf.acp.template.group.folderName.error.notUnique': '{jslang}wcf.acp.template.group.folderName.error.notUnique{/jslang}',
+				'wcf.global.name': '{jslang}wcf.global.name{/jslang}'
 			});
 			
 			AcpUiTemplateGroupCopy.init({$templateGroupID});
diff --git a/wcfsetup/install/files/acp/templates/trophyAdd.tpl b/wcfsetup/install/files/acp/templates/trophyAdd.tpl
index c25f94ad85..1c636c0563 100644
--- a/wcfsetup/install/files/acp/templates/trophyAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/trophyAdd.tpl
@@ -6,15 +6,15 @@
 <script data-relocate="true">
 	require(['Language', 'WoltLabSuite/Core/Acp/Ui/Trophy/Badge'], function (Language, BadgeHandler) {
 		Language.addObject({
-			'wcf.style.colorPicker': '{lang}wcf.style.colorPicker{/lang}',
-			'wcf.style.colorPicker.new': '{lang}wcf.style.colorPicker.new{/lang}',
-			'wcf.style.colorPicker.current': '{lang}wcf.style.colorPicker.current{/lang}',
-			'wcf.style.colorPicker.button.apply': '{lang}wcf.style.colorPicker.button.apply{/lang}',
-			'wcf.acp.style.image.error.invalidExtension': '{lang}wcf.acp.style.image.error.invalidExtension{/lang}',
-			'wcf.acp.trophy.badge.edit': '{lang}wcf.acp.trophy.badge.edit{/lang}',
-			'wcf.acp.trophy.imageUpload.error.notSquared': '{lang}wcf.acp.trophy.imageUpload.error.notSquared{/lang}',
-			'wcf.acp.trophy.imageUpload.error.tooSmall': '{lang}wcf.acp.trophy.imageUpload.error.tooSmall{/lang}',
-			'wcf.acp.trophy.imageUpload.error.noImage': '{lang}wcf.acp.trophy.imageUpload.error.noImage{/lang}'
+			'wcf.style.colorPicker': '{jslang}wcf.style.colorPicker{/jslang}',
+			'wcf.style.colorPicker.new': '{jslang}wcf.style.colorPicker.new{/jslang}',
+			'wcf.style.colorPicker.current': '{jslang}wcf.style.colorPicker.current{/jslang}',
+			'wcf.style.colorPicker.button.apply': '{jslang}wcf.style.colorPicker.button.apply{/jslang}',
+			'wcf.acp.style.image.error.invalidExtension': '{jslang}wcf.acp.style.image.error.invalidExtension{/jslang}',
+			'wcf.acp.trophy.badge.edit': '{jslang}wcf.acp.trophy.badge.edit{/jslang}',
+			'wcf.acp.trophy.imageUpload.error.notSquared': '{jslang}wcf.acp.trophy.imageUpload.error.notSquared{/jslang}',
+			'wcf.acp.trophy.imageUpload.error.tooSmall': '{jslang}wcf.acp.trophy.imageUpload.error.tooSmall{/jslang}',
+			'wcf.acp.trophy.imageUpload.error.noImage': '{jslang}wcf.acp.trophy.imageUpload.error.noImage{/jslang}'
 		});
 		
 		elBySel('select[name=type]').addEventListener('change', function () {
diff --git a/wcfsetup/install/files/acp/templates/uploadFieldComponent.tpl b/wcfsetup/install/files/acp/templates/uploadFieldComponent.tpl
index bd736ee225..795d6c5a16 100644
--- a/wcfsetup/install/files/acp/templates/uploadFieldComponent.tpl
+++ b/wcfsetup/install/files/acp/templates/uploadFieldComponent.tpl
@@ -35,8 +35,8 @@
 <script data-relocate="true">
 	require(['WoltLabSuite/Core/Ui/File/Upload', 'Language'], function(Upload, Language) {
 		Language.addObject({
-			'wcf.upload.error.reachedRemainingLimit': '{lang __literal=true}wcf.upload.error.reachedRemainingLimit{/lang}',
-			'wcf.upload.error.noImage': '{lang}wcf.upload.error.noImage{/lang}'
+			'wcf.upload.error.reachedRemainingLimit': '{jslang __literal=true}wcf.upload.error.reachedRemainingLimit{/jslang}',
+			'wcf.upload.error.noImage': '{jslang}wcf.upload.error.noImage{/jslang}'
 		});
 		
 		new Upload("{$uploadFieldId}UploadButtonDiv", "{$uploadFieldId}uploadFileList", {
diff --git a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
index ede9b08d0b..80d662fa37 100644
--- a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
+++ b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
@@ -2,7 +2,7 @@
 
 <script data-relocate="true">
 	$(function() {
-		WCF.Language.add('wcf.acp.worker.abort.confirmMessage', '{lang}wcf.acp.worker.abort.confirmMessage{/lang}');
+		WCF.Language.add('wcf.acp.worker.abort.confirmMessage', '{jslang}wcf.acp.worker.abort.confirmMessage{/jslang}');
 		
 		$('#updateEvents').click(function () {
 			new WCF.ACP.Worker('events', 'wcf\\system\\worker\\UserActivityPointUpdateEventsWorker', '{lang}wcf.acp.user.activityPoint.updateEvents{/lang}');
@@ -54,4 +54,4 @@
 	</div>
 </form>
 
-{include file='footer'}
\ No newline at end of file
+{include file='footer'}
diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index 83763a71de..a638a23156 100644
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -555,12 +555,12 @@
 				<script data-relocate="true">
 					$(function() {
 						WCF.Language.addObject({
-							'wcf.user.avatar.upload.error.invalidExtension': '{lang}wcf.user.avatar.upload.error.invalidExtension{/lang}',
-							'wcf.user.avatar.upload.error.tooSmall': '{lang}wcf.user.avatar.upload.error.tooSmall{/lang}',
-							'wcf.user.avatar.upload.error.tooLarge': '{lang}wcf.user.avatar.upload.error.tooLarge{/lang}',
-							'wcf.user.avatar.upload.error.uploadFailed': '{lang}wcf.user.avatar.upload.error.uploadFailed{/lang}',
-							'wcf.user.avatar.upload.error.badImage': '{lang}wcf.user.avatar.upload.error.badImage{/lang}',
-							'wcf.user.avatar.upload.success': '{lang}wcf.user.avatar.upload.success{/lang}'
+							'wcf.user.avatar.upload.error.invalidExtension': '{jslang}wcf.user.avatar.upload.error.invalidExtension{/jslang}',
+							'wcf.user.avatar.upload.error.tooSmall': '{jslang}wcf.user.avatar.upload.error.tooSmall{/jslang}',
+							'wcf.user.avatar.upload.error.tooLarge': '{jslang}wcf.user.avatar.upload.error.tooLarge{/jslang}',
+							'wcf.user.avatar.upload.error.uploadFailed': '{jslang}wcf.user.avatar.upload.error.uploadFailed{/jslang}',
+							'wcf.user.avatar.upload.error.badImage': '{jslang}wcf.user.avatar.upload.error.badImage{/jslang}',
+							'wcf.user.avatar.upload.success': '{jslang}wcf.user.avatar.upload.success{/jslang}'
 						});
 						
 						new WCF.User.Avatar.Upload({@$user->userID});
diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index a98b842c00..f2f535d85f 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -6,13 +6,13 @@
 		
 		{if $action == 'edit' && $group->canCopy()}
 			WCF.Language.addObject({
-				'wcf.acp.group.copy.confirmMessage': '{lang}wcf.acp.group.copy.confirmMessage{/lang}',
-				'wcf.acp.group.copy.copyACLOptions': '{lang}wcf.acp.group.copy.copyACLOptions{/lang}',
-				'wcf.acp.group.copy.copyACLOptions.description': '{lang}wcf.acp.group.copy.copyACLOptions.description{/lang}',
-				'wcf.acp.group.copy.copyMembers': '{lang}wcf.acp.group.copy.copyMembers{/lang}',
-				'wcf.acp.group.copy.copyMembers.description': '{lang}wcf.acp.group.copy.copyMembers.description{/lang}',
-				'wcf.acp.group.copy.copyUserGroupOptions': '{lang}wcf.acp.group.copy.copyUserGroupOptions{/lang}',
-				'wcf.acp.group.copy.copyUserGroupOptions.description': '{lang}wcf.acp.group.copy.copyUserGroupOptions.description{/lang}'
+				'wcf.acp.group.copy.confirmMessage': '{jslang}wcf.acp.group.copy.confirmMessage{/jslang}',
+				'wcf.acp.group.copy.copyACLOptions': '{jslang}wcf.acp.group.copy.copyACLOptions{/jslang}',
+				'wcf.acp.group.copy.copyACLOptions.description': '{jslang}wcf.acp.group.copy.copyACLOptions.description{/jslang}',
+				'wcf.acp.group.copy.copyMembers': '{jslang}wcf.acp.group.copy.copyMembers{/jslang}',
+				'wcf.acp.group.copy.copyMembers.description': '{jslang}wcf.acp.group.copy.copyMembers.description{/jslang}',
+				'wcf.acp.group.copy.copyUserGroupOptions': '{jslang}wcf.acp.group.copy.copyUserGroupOptions{/jslang}',
+				'wcf.acp.group.copy.copyUserGroupOptions.description': '{jslang}wcf.acp.group.copy.copyUserGroupOptions.description{/jslang}'
 			});
 			
 			new WCF.ACP.User.Group.Copy({@$groupID});
diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index cba7cf322e..c9836f053c 100644
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -23,17 +23,17 @@
 		new WCF.Table.EmptyTableHandler($('#userTableContainer'), 'jsUserRow', options);
 		
 		WCF.Language.addObject({
-			'wcf.acp.user.banReason': '{lang}wcf.acp.user.banReason{/lang}',
-			'wcf.acp.user.banReason.description': '{lang}wcf.acp.user.banReason.description{/lang}',
-			'wcf.acp.user.ban.sure': '{lang}wcf.acp.user.ban.sure{/lang}',
-			'wcf.acp.user.ban.expires': '{lang}wcf.acp.user.ban.expires{/lang}',
-			'wcf.acp.user.ban.expires.description': '{lang}wcf.acp.user.ban.expires.description{/lang}',
-			'wcf.acp.user.ban.neverExpires': '{lang}wcf.acp.user.ban.neverExpires{/lang}',
-			'wcf.acp.user.sendNewPassword.workerTitle': '{lang}wcf.acp.user.sendNewPassword.workerTitle{/lang}',
-			'wcf.acp.worker.abort.confirmMessage': '{lang}wcf.acp.worker.abort.confirmMessage{/lang}',
-			'wcf.acp.content.removeContent': '{lang}wcf.acp.content.removeContent{/lang}',
-			'wcf.user.status.banned': '{lang}wcf.user.status.banned{/lang}',
-			'wcf.user.status.isDisabled': '{lang}wcf.user.status.isDisabled{/lang}'
+			'wcf.acp.user.banReason': '{jslang}wcf.acp.user.banReason{/jslang}',
+			'wcf.acp.user.banReason.description': '{jslang}wcf.acp.user.banReason.description{/jslang}',
+			'wcf.acp.user.ban.sure': '{jslang}wcf.acp.user.ban.sure{/jslang}',
+			'wcf.acp.user.ban.expires': '{jslang}wcf.acp.user.ban.expires{/jslang}',
+			'wcf.acp.user.ban.expires.description': '{jslang}wcf.acp.user.ban.expires.description{/jslang}',
+			'wcf.acp.user.ban.neverExpires': '{jslang}wcf.acp.user.ban.neverExpires{/jslang}',
+			'wcf.acp.user.sendNewPassword.workerTitle': '{jslang}wcf.acp.user.sendNewPassword.workerTitle{/jslang}',
+			'wcf.acp.worker.abort.confirmMessage': '{jslang}wcf.acp.worker.abort.confirmMessage{/jslang}',
+			'wcf.acp.content.removeContent': '{jslang}wcf.acp.content.removeContent{/jslang}',
+			'wcf.user.status.banned': '{jslang}wcf.user.status.banned{/jslang}',
+			'wcf.user.status.isDisabled': '{jslang}wcf.user.status.isDisabled{/jslang}'
 		});
 		WCF.ACP.User.BanHandler.init();
 		
@@ -47,7 +47,7 @@
 		
 		require(['Language', 'WoltLabSuite/Core/Acp/Ui/User/Editor'], function (Language, AcpUiUserList) {
 			Language.addObject({
-				'wcf.acp.user.action.sendNewPassword.confirmMessage': '{lang}wcf.acp.user.action.sendNewPassword.confirmMessage{/lang}'
+				'wcf.acp.user.action.sendNewPassword.confirmMessage': '{jslang}wcf.acp.user.action.sendNewPassword.confirmMessage{/jslang}'
 			});
 			
 			AcpUiUserList.init();
diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index b9caa76bcc..8cc0673d89 100644
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -11,7 +11,7 @@
 {if $mailID|isset}
 	<script data-relocate="true">
 		$(function() {
-			WCF.Language.add('wcf.acp.worker.abort.confirmMessage', '{lang}wcf.acp.worker.abort.confirmMessage{/lang}');
+			WCF.Language.add('wcf.acp.worker.abort.confirmMessage', '{jslang}wcf.acp.worker.abort.confirmMessage{/jslang}');
 			
 			new WCF.ACP.Worker('mail', 'wcf\\system\\worker\\MailWorker', '', {
 				mailID: {@$mailID}
diff --git a/wcfsetup/install/files/acp/templates/wysiwyg.tpl b/wcfsetup/install/files/acp/templates/wysiwyg.tpl
index 9c4b104649..17c5ce2844 100644
--- a/wcfsetup/install/files/acp/templates/wysiwyg.tpl
+++ b/wcfsetup/install/files/acp/templates/wysiwyg.tpl
@@ -56,65 +56,65 @@
 	], function () {
 		require(['Environment', 'Language', 'WoltLabSuite/Core/Ui/Redactor/Autosave', 'WoltLabSuite/Core/Ui/Redactor/Metacode'], function(Environment, Language, UiRedactorAutosave, UiRedactorMetacode) {
 			Language.addObject({
-				'wcf.attachment.dragAndDrop.dropHere': '{lang}wcf.attachment.dragAndDrop.dropHere{/lang}',
-				'wcf.attachment.dragAndDrop.dropNow': '{lang}wcf.attachment.dragAndDrop.dropNow{/lang}',
+				'wcf.attachment.dragAndDrop.dropHere': '{jslang}wcf.attachment.dragAndDrop.dropHere{/jslang}',
+				'wcf.attachment.dragAndDrop.dropNow': '{jslang}wcf.attachment.dragAndDrop.dropNow{/jslang}',
 				
-				'wcf.editor.autosave.discard': '{lang}wcf.editor.autosave.discard{/lang}',
-				'wcf.editor.autosave.keep': '{lang}wcf.editor.autosave.keep{/lang}',
-				'wcf.editor.autosave.restored': '{lang}wcf.editor.autosave.restored{/lang}',
+				'wcf.editor.autosave.discard': '{jslang}wcf.editor.autosave.discard{/jslang}',
+				'wcf.editor.autosave.keep': '{jslang}wcf.editor.autosave.keep{/jslang}',
+				'wcf.editor.autosave.restored': '{jslang}wcf.editor.autosave.restored{/jslang}',
 				
-				'wcf.editor.code.edit': '{lang}wcf.editor.code.edit{/lang}',
-				'wcf.editor.code.file': '{lang}wcf.editor.code.file{/lang}',
-				'wcf.editor.code.file.description': '{lang}wcf.editor.code.file.description{/lang}',
-				'wcf.editor.code.highlighter': '{lang}wcf.editor.code.highlighter{/lang}',
-				'wcf.editor.code.highlighter.description': '{lang}wcf.editor.code.highlighter.description{/lang}',
-				'wcf.editor.code.highlighter.detect': '{lang}wcf.editor.code.highlighter.detect{/lang}',
-				'wcf.editor.code.highlighter.plain': '{lang}wcf.editor.code.highlighter.plain{/lang}',
-				'wcf.editor.code.line': '{lang}wcf.editor.code.line{/lang}',
-				'wcf.editor.code.line.description': '{lang}wcf.editor.code.line.description{/lang}',
-				'wcf.editor.code.title': '{lang __literal=true}wcf.editor.code.title{/lang}',
+				'wcf.editor.code.edit': '{jslang}wcf.editor.code.edit{/jslang}',
+				'wcf.editor.code.file': '{jslang}wcf.editor.code.file{/jslang}',
+				'wcf.editor.code.file.description': '{jslang}wcf.editor.code.file.description{/jslang}',
+				'wcf.editor.code.highlighter': '{jslang}wcf.editor.code.highlighter{/jslang}',
+				'wcf.editor.code.highlighter.description': '{jslang}wcf.editor.code.highlighter.description{/jslang}',
+				'wcf.editor.code.highlighter.detect': '{jslang}wcf.editor.code.highlighter.detect{/jslang}',
+				'wcf.editor.code.highlighter.plain': '{jslang}wcf.editor.code.highlighter.plain{/jslang}',
+				'wcf.editor.code.line': '{jslang}wcf.editor.code.line{/jslang}',
+				'wcf.editor.code.line.description': '{jslang}wcf.editor.code.line.description{/jslang}',
+				'wcf.editor.code.title': '{jslang __literal=true}wcf.editor.code.title{/jslang}',
 				
-				'wcf.editor.html.description': '{lang}wcf.editor.html.description{/lang}',
-				'wcf.editor.html.title': '{lang}wcf.editor.html.title{/lang}',
+				'wcf.editor.html.description': '{jslang}wcf.editor.html.description{/jslang}',
+				'wcf.editor.html.title': '{jslang}wcf.editor.html.title{/jslang}',
 				
-				'wcf.editor.image.edit': '{lang}wcf.editor.image.edit{/lang}',
-				'wcf.editor.image.insert': '{lang}wcf.editor.image.insert{/lang}',
-				'wcf.editor.image.link': '{lang}wcf.editor.image.link{/lang}',
-				'wcf.editor.image.link.error.invalid': '{lang}wcf.editor.image.link.error.invalid{/lang}',
-				'wcf.editor.image.float': '{lang}wcf.editor.image.float{/lang}',
-				'wcf.editor.image.float.left': '{lang}wcf.editor.image.float.left{/lang}',
-				'wcf.editor.image.float.right': '{lang}wcf.editor.image.float.right{/lang}',
-				'wcf.editor.image.source': '{lang}wcf.editor.image.source{/lang}',
-				'wcf.editor.image.source.error.blocked': '{lang}wcf.editor.image.source.error.blocked{/lang}',
-				'wcf.editor.image.source.error.insecure': '{lang}wcf.editor.image.source.error.insecure{/lang}',
-				'wcf.editor.image.source.error.invalid': '{lang}wcf.editor.image.source.error.invalid{/lang}',
+				'wcf.editor.image.edit': '{jslang}wcf.editor.image.edit{/jslang}',
+				'wcf.editor.image.insert': '{jslang}wcf.editor.image.insert{/jslang}',
+				'wcf.editor.image.link': '{jslang}wcf.editor.image.link{/jslang}',
+				'wcf.editor.image.link.error.invalid': '{jslang}wcf.editor.image.link.error.invalid{/jslang}',
+				'wcf.editor.image.float': '{jslang}wcf.editor.image.float{/jslang}',
+				'wcf.editor.image.float.left': '{jslang}wcf.editor.image.float.left{/jslang}',
+				'wcf.editor.image.float.right': '{jslang}wcf.editor.image.float.right{/jslang}',
+				'wcf.editor.image.source': '{jslang}wcf.editor.image.source{/jslang}',
+				'wcf.editor.image.source.error.blocked': '{jslang}wcf.editor.image.source.error.blocked{/jslang}',
+				'wcf.editor.image.source.error.insecure': '{jslang}wcf.editor.image.source.error.insecure{/jslang}',
+				'wcf.editor.image.source.error.invalid': '{jslang}wcf.editor.image.source.error.invalid{/jslang}',
 				
-				'wcf.editor.link.add': '{lang}wcf.editor.link.add{/lang}',
-				'wcf.editor.link.edit': '{lang}wcf.editor.link.edit{/lang}',
-				'wcf.editor.link.error.invalid': '{lang}wcf.editor.link.error.invalid{/lang}',
-				'wcf.editor.link.url': '{lang}wcf.editor.link.url{/lang}',
-				'wcf.editor.link.text': '{lang}wcf.editor.link.text{/lang}',
+				'wcf.editor.link.add': '{jslang}wcf.editor.link.add{/jslang}',
+				'wcf.editor.link.edit': '{jslang}wcf.editor.link.edit{/jslang}',
+				'wcf.editor.link.error.invalid': '{jslang}wcf.editor.link.error.invalid{/jslang}',
+				'wcf.editor.link.url': '{jslang}wcf.editor.link.url{/jslang}',
+				'wcf.editor.link.text': '{jslang}wcf.editor.link.text{/jslang}',
 				
-				'wcf.editor.list.indent': '{lang}wcf.editor.list.indent{/lang}',
-				'wcf.editor.list.outdent': '{lang}wcf.editor.list.outdent{/lang}',
+				'wcf.editor.list.indent': '{jslang}wcf.editor.list.indent{/jslang}',
+				'wcf.editor.list.outdent': '{jslang}wcf.editor.list.outdent{/jslang}',
 				
-				'wcf.editor.quote.author': '{lang}wcf.editor.quote.author{/lang}',
-				'wcf.editor.quote.edit': '{lang}wcf.editor.quote.edit{/lang}',
-				'wcf.editor.quote.title': '{lang __literal=true}wcf.editor.quote.title{/lang}',
-				'wcf.editor.quote.url': '{lang}wcf.editor.quote.url{/lang}',
-				'wcf.editor.quote.url.description': '{lang}wcf.editor.quote.url.description{/lang}',
-				'wcf.editor.quote.url.error.invalid': '{lang}wcf.editor.quote.url.error.invalid{/lang}',
+				'wcf.editor.quote.author': '{jslang}wcf.editor.quote.author{/jslang}',
+				'wcf.editor.quote.edit': '{jslang}wcf.editor.quote.edit{/jslang}',
+				'wcf.editor.quote.title': '{jslang __literal=true}wcf.editor.quote.title{/jslang}',
+				'wcf.editor.quote.url': '{jslang}wcf.editor.quote.url{/jslang}',
+				'wcf.editor.quote.url.description': '{jslang}wcf.editor.quote.url.description{/jslang}',
+				'wcf.editor.quote.url.error.invalid': '{jslang}wcf.editor.quote.url.error.invalid{/jslang}',
 				
-				'wcf.editor.table.cols': '{lang}wcf.editor.table.cols{/lang}',
-				'wcf.editor.table.insertTable': '{lang}wcf.editor.table.insertTable{/lang}',
-				'wcf.editor.table.rows': '{lang}wcf.editor.table.rows{/lang}',
+				'wcf.editor.table.cols': '{jslang}wcf.editor.table.cols{/jslang}',
+				'wcf.editor.table.insertTable': '{jslang}wcf.editor.table.insertTable{/jslang}',
+				'wcf.editor.table.rows': '{jslang}wcf.editor.table.rows{/jslang}',
 				
-				'wcf.editor.source.error.active': '{lang}wcf.editor.source.error.active{/lang}',
+				'wcf.editor.source.error.active': '{jslang}wcf.editor.source.error.active{/jslang}',
 				
-				'wcf.editor.spoiler.label': '{lang}wcf.editor.spoiler.label{/lang}',
-				'wcf.editor.spoiler.label.description': '{lang}wcf.editor.spoiler.label.description{/lang}',
-				'wcf.editor.spoiler.edit': '{lang}wcf.editor.spoiler.edit{/lang}',
-				'wcf.editor.spoiler.title': '{lang __literal=true}wcf.editor.spoiler.title{/lang}'
+				'wcf.editor.spoiler.label': '{jslang}wcf.editor.spoiler.label{/jslang}',
+				'wcf.editor.spoiler.label.description': '{jslang}wcf.editor.spoiler.label.description{/jslang}',
+				'wcf.editor.spoiler.edit': '{jslang}wcf.editor.spoiler.edit{/jslang}',
+				'wcf.editor.spoiler.title': '{jslang __literal=true}wcf.editor.spoiler.title{/jslang}'
 			});
 			
 			var allowedInlineStyles = [], buttons = [], buttonMobile = [], buttonOptions = [], customButtons = [];
@@ -137,7 +137,7 @@
 			var config = {
 				buttons: buttons,
 				clipboardImageUpload: {if $__wcf->getBBCodeHandler()->isAvailableBBCode('attach')}true{else}false{/if},
-				direction: '{lang}wcf.global.pageDirection{/lang}',
+				direction: '{jslang}wcf.global.pageDirection{/jslang}',
 				formatting: ['p', 'h2', 'h3', 'h4'],
 				imageCaption: false,
 				imageUpload: {if $__wcf->getBBCodeHandler()->isAvailableBBCode('attach')}true{else}false{/if},
@@ -145,45 +145,45 @@
 				langs: {
 					wsc: {
 						// general
-						edit: '{lang}wcf.global.button.edit{/lang}',
+						edit: '{jslang}wcf.global.button.edit{/jslang}',
 						
 						// formatting dropdown
-						heading2: '{lang}wcf.editor.format.heading2{/lang}',
-						heading3: '{lang}wcf.editor.format.heading3{/lang}',
-						heading4: '{lang}wcf.editor.format.heading4{/lang}',
-						paragraph: '{lang}wcf.editor.format.paragraph{/lang}',
+						heading2: '{jslang}wcf.editor.format.heading2{/jslang}',
+						heading3: '{jslang}wcf.editor.format.heading3{/jslang}',
+						heading4: '{jslang}wcf.editor.format.heading4{/jslang}',
+						paragraph: '{jslang}wcf.editor.format.paragraph{/jslang}',
 						
 						// links
-						'link-edit': '{lang}wcf.editor.link.edit{/lang}',
-						'link-insert': '{lang}wcf.editor.link.add{/lang}',
-						unlink: '{lang}wcf.editor.link.unlink{/lang}',
+						'link-edit': '{jslang}wcf.editor.link.edit{/jslang}',
+						'link-insert': '{jslang}wcf.editor.link.add{/jslang}',
+						unlink: '{jslang}wcf.editor.link.unlink{/jslang}',
 						
 						// text alignment
-						'align-center': '{lang}wcf.editor.alignment.center{/lang}',
-						'align-justify': '{lang}wcf.editor.alignment.justify{/lang}',
-						'align-left': '{lang}wcf.editor.alignment.left{/lang}',
-						'align-right': '{lang}wcf.editor.alignment.right{/lang}',
+						'align-center': '{jslang}wcf.editor.alignment.center{/jslang}',
+						'align-justify': '{jslang}wcf.editor.alignment.justify{/jslang}',
+						'align-left': '{jslang}wcf.editor.alignment.left{/jslang}',
+						'align-right': '{jslang}wcf.editor.alignment.right{/jslang}',
 						
 						// table plugin
-						'add-head': '{lang}wcf.editor.table.addHead{/lang}',
-						'delete-column': '{lang}wcf.editor.table.deleteColumn{/lang}',
-						'delete-head': '{lang}wcf.editor.table.deleteHead{/lang}',
-						'delete-row': '{lang}wcf.editor.table.deleteRow{/lang}',
-						'delete-table': '{lang}wcf.editor.table.deleteTable{/lang}',
-						'insert-table': '{lang}wcf.editor.table.insertTable{/lang}',
-						'insert-column-left': '{lang}wcf.editor.table.insertColumnLeft{/lang}',
-						'insert-column-right': '{lang}wcf.editor.table.insertColumnRight{/lang}',
-						'insert-row-above': '{lang}wcf.editor.table.insertRowAbove{/lang}',
-						'insert-row-below': '{lang}wcf.editor.table.insertRowBelow{/lang}',
+						'add-head': '{jslang}wcf.editor.table.addHead{/jslang}',
+						'delete-column': '{jslang}wcf.editor.table.deleteColumn{/jslang}',
+						'delete-head': '{jslang}wcf.editor.table.deleteHead{/jslang}',
+						'delete-row': '{jslang}wcf.editor.table.deleteRow{/jslang}',
+						'delete-table': '{jslang}wcf.editor.table.deleteTable{/jslang}',
+						'insert-table': '{jslang}wcf.editor.table.insertTable{/jslang}',
+						'insert-column-left': '{jslang}wcf.editor.table.insertColumnLeft{/jslang}',
+						'insert-column-right': '{jslang}wcf.editor.table.insertColumnRight{/jslang}',
+						'insert-row-above': '{jslang}wcf.editor.table.insertRowAbove{/jslang}',
+						'insert-row-below': '{jslang}wcf.editor.table.insertRowBelow{/jslang}',
 						
 						// size
-						'remove-size': '{lang}wcf.editor.button.size.removeSize{/lang}',
+						'remove-size': '{jslang}wcf.editor.button.size.removeSize{/jslang}',
 						
 						// color
-						'remove-color': '{lang}wcf.editor.button.color.removeColor{/lang}',
+						'remove-color': '{jslang}wcf.editor.button.color.removeColor{/jslang}',
 						
 						// font
-						'remove-font': '{lang}wcf.editor.button.font.removeFont{/lang}'
+						'remove-font': '{jslang}wcf.editor.button.font.removeFont{/jslang}'
 					}
 				},
 				linkify: false,
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 6dd9ba7f18..b920367df7 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -744,7 +744,7 @@ class WCF {
 			$wcf = new TemplateScriptingCore($wcf);
 		}
 		
-		self::getTPL()->registerPrefilter(['event', 'hascontent', 'lang']);
+		self::getTPL()->registerPrefilter(['event', 'hascontent', 'lang', 'jslang']);
 		self::getTPL()->assign([
 			'__wcf' => $wcf,
 			'__wcfVersion' => LAST_UPDATE_TIME // @deprecated 2.1, use LAST_UPDATE_TIME directly
@@ -762,7 +762,7 @@ class WCF {
 			}
 		}
 		
-		EmailTemplateEngine::getInstance()->registerPrefilter(['event', 'hascontent', 'lang']);
+		EmailTemplateEngine::getInstance()->registerPrefilter(['event', 'hascontent', 'lang', 'jslang']);
 		EmailTemplateEngine::getInstance()->assign([
 			'__wcf' => $wcf
 		]);
diff --git a/wcfsetup/install/files/lib/system/template/plugin/JslangCompilerTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/JslangCompilerTemplatePlugin.class.php
new file mode 100644
index 0000000000..fa52c1dc2f
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/template/plugin/JslangCompilerTemplatePlugin.class.php
@@ -0,0 +1,41 @@
+<?php
+namespace wcf\system\template\plugin;
+use wcf\system\template\TemplateScriptingCompiler;
+
+/**
+ * Template compiler plugin which compiles dynamic language variables for the assignment in javascript code.
+ *
+ * Usage:
+ * 	{jslang}$blah{/jslang}
+ * 	{jslang var=$x}foo{/jslang}
+ *
+ * @author	Marcel Werk
+ * @copyright	2001-2020 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	WoltLabSuite\Core\System\Template\Plugin
+ * @since       5.3
+ */
+class JslangCompilerTemplatePlugin implements ICompilerTemplatePlugin {
+	/**
+	 * @inheritDoc
+	 */
+	public function executeStart($tagArgs, TemplateScriptingCompiler $compiler) {
+		$compiler->pushTag('jslang');
+		
+		$tagArgs = $compiler::makeArgString($tagArgs);
+		return "<?php
+			\$this->tagStack[] = ['jslang', array_merge(\$this->v, [$tagArgs])];
+			ob_start();
+			?>";
+	}
+	
+	/**
+	 * @inheritDoc
+	 */
+	public function executeEnd(TemplateScriptingCompiler $compiler) {
+		$compiler->popTag('jslang');
+		return "<?php
+			echo wcf\util\StringUtil::encodeJS(wcf\system\WCF::getLanguage()->tplGet(ob_get_clean(), \$this->tagStack[count(\$this->tagStack) - 1][1]));
+			array_pop(\$this->tagStack); ?>";
+	}
+}
diff --git a/wcfsetup/install/files/lib/system/template/plugin/JslangPrefilterTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/JslangPrefilterTemplatePlugin.class.php
new file mode 100644
index 0000000000..8f393ea656
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/template/plugin/JslangPrefilterTemplatePlugin.class.php
@@ -0,0 +1,41 @@
+<?php
+namespace wcf\system\template\plugin;
+use wcf\system\template\TemplateScriptingCompiler;
+use wcf\system\WCF;
+use wcf\util\StringUtil;
+
+/**
+ * Template prefilter plugin which compiles static language variables for the assignment in javascript code.
+ *
+ * Usage:
+ * 	{jslang}wcf.foo.bar{/jslang}
+ * 
+ * @author	Marcel Werk
+ * @copyright	2001-2020 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	WoltLabSuite\Core\System\Template\Plugin
+ * @since       5.3
+ */
+class JslangPrefilterTemplatePlugin implements IPrefilterTemplatePlugin {
+	/**
+	 * @inheritDoc
+	 */
+	public function execute($templateName, $sourceContent, TemplateScriptingCompiler $compiler) {
+		$ldq = preg_quote($compiler->getLeftDelimiter(), '~');
+		$rdq = preg_quote($compiler->getRightDelimiter(), '~');
+		$sourceContent = preg_replace_callback("~{$ldq}jslang{$rdq}([\w\.]+){$ldq}/jslang{$rdq}~", function ($match) {
+			$value = WCF::getLanguage()->get($match[1]);
+			if (strpos($value, '{') !== false) {
+				$variableName = '__jslang_capture_' . substr(StringUtil::getRandomID(), 0, 8);
+				$value = "{capture assign='" . $variableName . "'}" . $value . "{/capture}{@$" . $variableName . "|encodeJS}";
+			}
+			else {
+				$value = StringUtil::encodeJS($value);
+			}
+			
+			return $value;
+		}, $sourceContent);
+		
+		return $sourceContent;
+	}
+}