From 9f663473b447cf592aefdda01d452af2081e693c Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Mon, 2 Nov 2020 17:40:23 +0100 Subject: [PATCH] Use `jslang` in more places See #3530 --- .../__singleMediaSelectionFormField.tpl | 2 +- .../templates/__wysiwygCmsToolbar.tpl | 4 +- com.woltlab.wcf/templates/articleAdd.tpl | 2 +- .../birthdaySearchableOptionType.tpl | 4 +- com.woltlab.wcf/templates/pageHeaderUser.tpl | 12 +++--- com.woltlab.wcf/templates/register.tpl | 2 +- com.woltlab.wcf/templates/settings.tpl | 2 +- com.woltlab.wcf/templates/wysiwygToolbar.tpl | 42 +++++++++---------- .../__singleMediaSelectionFormField.tpl | 2 +- .../acp/templates/__wysiwygCmsToolbar.tpl | 4 +- .../files/acp/templates/articleAdd.tpl | 2 +- .../birthdaySearchableOptionType.tpl | 4 +- .../install/files/acp/templates/boxAdd.tpl | 2 +- .../install/files/acp/templates/cacheList.tpl | 4 +- .../acp/templates/captchaQuestionList.tpl | 4 +- .../files/acp/templates/dataImport.tpl | 2 +- .../devtoolsMissingLanguageItemList.tpl | 6 +-- .../acp/templates/devtoolsProjectList.tpl | 2 +- .../install/files/acp/templates/labelAdd.tpl | 2 +- .../files/acp/templates/labelGroupList.tpl | 2 +- .../install/files/acp/templates/labelList.tpl | 2 +- .../files/acp/templates/pageHeaderUser.tpl | 2 +- .../files/acp/templates/rebuildData.tpl | 2 +- .../templates/sendMailUserBulkProcessing.tpl | 2 +- .../files/acp/templates/sitemapList.tpl | 4 +- .../install/files/acp/templates/tagList.tpl | 2 +- .../files/acp/templates/templateGroupList.tpl | 10 ++--- .../files/acp/templates/templateList.tpl | 2 +- .../acp/templates/userActivityPointOption.tpl | 2 +- .../install/files/acp/templates/userAdd.tpl | 2 +- .../acp/templates/userGroupAssignmentList.tpl | 2 +- .../files/acp/templates/userRankAdd.tpl | 2 +- .../files/acp/templates/wysiwygToolbar.tpl | 42 +++++++++---------- 33 files changed, 91 insertions(+), 91 deletions(-) diff --git a/com.woltlab.wcf/templates/__singleMediaSelectionFormField.tpl b/com.woltlab.wcf/templates/__singleMediaSelectionFormField.tpl index f7c87c079d..80a54f9ef5 100644 --- a/com.woltlab.wcf/templates/__singleMediaSelectionFormField.tpl +++ b/com.woltlab.wcf/templates/__singleMediaSelectionFormField.tpl @@ -28,7 +28,7 @@ new MediaManagerSelect({ buttonClass: 'jsMediaSelectButton_{@$field->getPrefixedId()}', {if $field->isImageOnly()} - dialogTitle: '{lang}wcf.media.chooseImage{/lang}', + dialogTitle: '{jslang}wcf.media.chooseImage{/jslang}', imagesOnly: 1 {/if} }); diff --git a/com.woltlab.wcf/templates/__wysiwygCmsToolbar.tpl b/com.woltlab.wcf/templates/__wysiwygCmsToolbar.tpl index 6fca00a9fd..2299dd3e19 100644 --- a/com.woltlab.wcf/templates/__wysiwygCmsToolbar.tpl +++ b/com.woltlab.wcf/templates/__wysiwygCmsToolbar.tpl @@ -20,8 +20,8 @@ , '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabPage.js?v={@LAST_UPDATE_TIME}' {/capture} {capture append='__redactorConfig'} - buttonOptions.woltlabArticle = { icon: 'fa-file-word-o', title: '{lang}wcf.editor.button.article{/lang}' }; - buttonOptions.woltlabPage = { icon: 'fa-file-text-o', title: '{lang}wcf.editor.button.page{/lang}' }; + buttonOptions.woltlabArticle = { icon: 'fa-file-word-o', title: '{jslang}wcf.editor.button.article{/jslang}' }; + buttonOptions.woltlabPage = { icon: 'fa-file-text-o', title: '{jslang}wcf.editor.button.page{/jslang}' }; buttons.push('woltlabPage'); buttons.push('woltlabArticle'); diff --git a/com.woltlab.wcf/templates/articleAdd.tpl b/com.woltlab.wcf/templates/articleAdd.tpl index 4b85a9bb02..5a861134ca 100644 --- a/com.woltlab.wcf/templates/articleAdd.tpl +++ b/com.woltlab.wcf/templates/articleAdd.tpl @@ -84,7 +84,7 @@ require(['WoltLabSuite/Core/Media/Manager/Select'], function(MediaManagerSelect) { new MediaManagerSelect({ - dialogTitle: '{lang}wcf.media.chooseImage{/lang}', + dialogTitle: '{jslang}wcf.media.chooseImage{/jslang}', imagesOnly: 1 }); }); diff --git a/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl b/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl index 11d7b4290c..0ec0ee57b9 100644 --- a/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl +++ b/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl @@ -3,6 +3,6 @@ \ No newline at end of file + diff --git a/com.woltlab.wcf/templates/pageHeaderUser.tpl b/com.woltlab.wcf/templates/pageHeaderUser.tpl index c4927dc879..14009f1a20 100644 --- a/com.woltlab.wcf/templates/pageHeaderUser.tpl +++ b/com.woltlab.wcf/templates/pageHeaderUser.tpl @@ -71,7 +71,7 @@ {event name='userMenuItemsAfter'} - {lang}wcf.user.logout{/lang} + {lang}wcf.user.logout{/lang} @@ -261,11 +261,11 @@ diff --git a/com.woltlab.wcf/templates/register.tpl b/com.woltlab.wcf/templates/register.tpl index cdb556ba3f..b660a6c8d8 100644 --- a/com.woltlab.wcf/templates/register.tpl +++ b/com.woltlab.wcf/templates/register.tpl @@ -166,7 +166,7 @@ LanguageChooser.init('languageIDContainer', 'languageID', {@$languageID}, $languages); var small = elCreate('small'); - small.innerHTML = '{lang}wcf.user.language.description{/lang}'; + small.innerHTML = '{jslang}wcf.user.language.description{/jslang}'; elById('languageIDContainer').appendChild(small); }); }); diff --git a/com.woltlab.wcf/templates/settings.tpl b/com.woltlab.wcf/templates/settings.tpl index d8a122335f..9cac179e73 100644 --- a/com.woltlab.wcf/templates/settings.tpl +++ b/com.woltlab.wcf/templates/settings.tpl @@ -36,7 +36,7 @@ LanguageChooser.init('languageIDContainer', 'languageID', {@$languageID}, $languages); var small = elCreate('small'); - small.innerHTML = '{lang}wcf.user.language.description{/lang}'; + small.innerHTML = '{jslang}wcf.user.language.description{/jslang}'; elById('languageIDContainer').appendChild(small); }); }); diff --git a/com.woltlab.wcf/templates/wysiwygToolbar.tpl b/com.woltlab.wcf/templates/wysiwygToolbar.tpl index 155af844e2..f06eb7348d 100644 --- a/com.woltlab.wcf/templates/wysiwygToolbar.tpl +++ b/com.woltlab.wcf/templates/wysiwygToolbar.tpl @@ -1,25 +1,25 @@ buttonOptions = { - alignment: { icon: 'fa-align-left', title: '{lang}wcf.editor.button.alignment{/lang}' }, - bold: { icon: 'fa-bold', title: '{lang}wcf.editor.button.bold{/lang}' }, - deleted: { icon: 'fa-strikethrough', title: '{lang}wcf.editor.button.strikethrough{/lang}' }, - format: { icon: 'fa-header', title: '{lang}wcf.editor.button.format{/lang}' }, - html: { icon: 'fa-file-code-o', title: '{lang}wcf.editor.button.html{/lang}' }, - italic: { icon: 'fa-italic', title: '{lang}wcf.editor.button.italic{/lang}' }, - link: { icon: 'fa-link', title: '{lang}wcf.editor.button.link{/lang}' }, - lists: { icon: 'fa-list', title: '{lang}wcf.editor.button.lists{/lang}' }, - redo: { icon: 'fa-repeat', title: '{lang}wcf.editor.button.redo{/lang}' }, - subscript: { icon: 'fa-subscript', title: '{lang}wcf.editor.button.subscript{/lang}' }, - superscript: { icon: 'fa-superscript', title: '{lang}wcf.editor.button.superscript{/lang}' }, - table: { icon: 'fa-table', title: '{lang}wcf.editor.button.table{/lang}' }, - underline: { icon: 'fa-underline', title: '{lang}wcf.editor.button.underline{/lang}' }, - undo: { icon: 'fa-undo', title: '{lang}wcf.editor.button.undo{/lang}' }, - woltlabColor: { icon: 'fa-paint-brush', title: '{lang}wcf.editor.button.color{/lang}' }, - woltlabFont: { icon: 'fa-font', title: '{lang}wcf.editor.button.font{/lang}' }, - woltlabFullscreen: { icon: 'fa-expand', title: '{lang}wcf.editor.button.fullscreen{/lang}' }, - woltlabImage: { icon: 'fa-picture-o', title: '{lang}wcf.editor.button.image{/lang}' }, - woltlabMedia: { icon: 'fa-file-o', title: '{lang}wcf.editor.button.media{/lang}' }, - woltlabQuote: { icon: 'fa-comment', title: '{lang}wcf.editor.button.quote{/lang}' }, - woltlabSize: { icon: 'fa-text-height', title: '{lang}wcf.editor.button.size{/lang}' } + alignment: { icon: 'fa-align-left', title: '{jslang}wcf.editor.button.alignment{/jslang}' }, + bold: { icon: 'fa-bold', title: '{jslang}wcf.editor.button.bold{/jslang}' }, + deleted: { icon: 'fa-strikethrough', title: '{jslang}wcf.editor.button.strikethrough{/jslang}' }, + format: { icon: 'fa-header', title: '{jslang}wcf.editor.button.format{/jslang}' }, + html: { icon: 'fa-file-code-o', title: '{jslang}wcf.editor.button.html{/jslang}' }, + italic: { icon: 'fa-italic', title: '{jslang}wcf.editor.button.italic{/jslang}' }, + link: { icon: 'fa-link', title: '{jslang}wcf.editor.button.link{/jslang}' }, + lists: { icon: 'fa-list', title: '{jslang}wcf.editor.button.lists{/jslang}' }, + redo: { icon: 'fa-repeat', title: '{jslang}wcf.editor.button.redo{/jslang}' }, + subscript: { icon: 'fa-subscript', title: '{jslang}wcf.editor.button.subscript{/jslang}' }, + superscript: { icon: 'fa-superscript', title: '{jslang}wcf.editor.button.superscript{/jslang}' }, + table: { icon: 'fa-table', title: '{jslang}wcf.editor.button.table{/jslang}' }, + underline: { icon: 'fa-underline', title: '{jslang}wcf.editor.button.underline{/jslang}' }, + undo: { icon: 'fa-undo', title: '{jslang}wcf.editor.button.undo{/jslang}' }, + woltlabColor: { icon: 'fa-paint-brush', title: '{jslang}wcf.editor.button.color{/jslang}' }, + woltlabFont: { icon: 'fa-font', title: '{jslang}wcf.editor.button.font{/jslang}' }, + woltlabFullscreen: { icon: 'fa-expand', title: '{jslang}wcf.editor.button.fullscreen{/jslang}' }, + woltlabImage: { icon: 'fa-picture-o', title: '{jslang}wcf.editor.button.image{/jslang}' }, + woltlabMedia: { icon: 'fa-file-o', title: '{jslang}wcf.editor.button.media{/jslang}' }, + woltlabQuote: { icon: 'fa-comment', title: '{jslang}wcf.editor.button.quote{/jslang}' }, + woltlabSize: { icon: 'fa-text-height', title: '{jslang}wcf.editor.button.size{/jslang}' } }; buttonMobile = ['format', 'bold', 'italic', 'underline', 'lists', 'link', 'woltlabImage']; diff --git a/wcfsetup/install/files/acp/templates/__singleMediaSelectionFormField.tpl b/wcfsetup/install/files/acp/templates/__singleMediaSelectionFormField.tpl index f7c87c079d..80a54f9ef5 100644 --- a/wcfsetup/install/files/acp/templates/__singleMediaSelectionFormField.tpl +++ b/wcfsetup/install/files/acp/templates/__singleMediaSelectionFormField.tpl @@ -28,7 +28,7 @@ new MediaManagerSelect({ buttonClass: 'jsMediaSelectButton_{@$field->getPrefixedId()}', {if $field->isImageOnly()} - dialogTitle: '{lang}wcf.media.chooseImage{/lang}', + dialogTitle: '{jslang}wcf.media.chooseImage{/jslang}', imagesOnly: 1 {/if} }); diff --git a/wcfsetup/install/files/acp/templates/__wysiwygCmsToolbar.tpl b/wcfsetup/install/files/acp/templates/__wysiwygCmsToolbar.tpl index 6fca00a9fd..2299dd3e19 100644 --- a/wcfsetup/install/files/acp/templates/__wysiwygCmsToolbar.tpl +++ b/wcfsetup/install/files/acp/templates/__wysiwygCmsToolbar.tpl @@ -20,8 +20,8 @@ , '{@$__wcf->getPath()}js/3rdParty/redactor2/plugins/WoltLabPage.js?v={@LAST_UPDATE_TIME}' {/capture} {capture append='__redactorConfig'} - buttonOptions.woltlabArticle = { icon: 'fa-file-word-o', title: '{lang}wcf.editor.button.article{/lang}' }; - buttonOptions.woltlabPage = { icon: 'fa-file-text-o', title: '{lang}wcf.editor.button.page{/lang}' }; + buttonOptions.woltlabArticle = { icon: 'fa-file-word-o', title: '{jslang}wcf.editor.button.article{/jslang}' }; + buttonOptions.woltlabPage = { icon: 'fa-file-text-o', title: '{jslang}wcf.editor.button.page{/jslang}' }; buttons.push('woltlabPage'); buttons.push('woltlabArticle'); diff --git a/wcfsetup/install/files/acp/templates/articleAdd.tpl b/wcfsetup/install/files/acp/templates/articleAdd.tpl index 4b85a9bb02..5a861134ca 100644 --- a/wcfsetup/install/files/acp/templates/articleAdd.tpl +++ b/wcfsetup/install/files/acp/templates/articleAdd.tpl @@ -84,7 +84,7 @@ require(['WoltLabSuite/Core/Media/Manager/Select'], function(MediaManagerSelect) { new MediaManagerSelect({ - dialogTitle: '{lang}wcf.media.chooseImage{/lang}', + dialogTitle: '{jslang}wcf.media.chooseImage{/jslang}', imagesOnly: 1 }); }); diff --git a/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl index 4177a184b8..19be7d8a8e 100644 --- a/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl +++ b/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl @@ -3,6 +3,6 @@ \ No newline at end of file + diff --git a/wcfsetup/install/files/acp/templates/boxAdd.tpl b/wcfsetup/install/files/acp/templates/boxAdd.tpl index ffbfafb357..acacfdeb58 100644 --- a/wcfsetup/install/files/acp/templates/boxAdd.tpl +++ b/wcfsetup/install/files/acp/templates/boxAdd.tpl @@ -38,7 +38,7 @@ {if $__wcf->session->getPermission('admin.content.cms.canUseMedia')} require(['WoltLabSuite/Core/Media/Manager/Select'], function(MediaManagerSelect) { new MediaManagerSelect({ - dialogTitle: '{lang}wcf.media.chooseImage{/lang}', + dialogTitle: '{jslang}wcf.media.chooseImage{/jslang}', imagesOnly: 1 }); }); diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl index 3689a8e28f..939389ef1b 100644 --- a/wcfsetup/install/files/acp/templates/cacheList.tpl +++ b/wcfsetup/install/files/acp/templates/cacheList.tpl @@ -16,7 +16,7 @@