Use `jslang` in more places

See #3530

diff --git a/com.woltlab.wcf/templates/__singleMediaSelectionFormField.tpl b/com.woltlab.wcf/templates/__singleMediaSelectionFormField.tpl
index f7c87c079d3ec92d64b4bf22cb9d90db1f7ed7de..80a54f9ef59405826a0aaca26e399cfe3aa159c3 100644 (file)
--- 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 6fca00a9fdf0ce0dc600461b1d2cbb5fca00e304..2299dd3e19d17f42e0303fb4158f5f926b16559e 100644 (file)
--- 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 4b85a9bb025f17ba5ddc26c8faa002ebc747d7c4..5a861134caee77474e3ac6353de2c0e9d1a491bb 100644 (file)
--- 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 11d7b4290c6d68f321fd8225d4464170a253f0ca..0ec0ee57b9d7042da6128039bc8df68ff5905380 100644 (file)
--- a/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl
@@ -3,6 +3,6 @@
 
 <script data-relocate="true">
 $(function() {
-       $('#{$option->optionName}').parents('dl:eq(0)').find('> dt > label').text('{lang}wcf.user.birthday.age{/lang}');
+       $('#{$option->optionName}').parents('dl:eq(0)').find('> dt > label').text('{jslang}wcf.user.birthday.age{/jslang}');
 });
-</script>
\ No newline at end of file
+</script>

diff --git a/com.woltlab.wcf/templates/pageHeaderUser.tpl b/com.woltlab.wcf/templates/pageHeaderUser.tpl
index c4927dc8796821ca1655d2928763610927c8930f..14009f1a208dfa4f0eb91092fd2e6767bc06a0b4 100644 (file)
--- a/com.woltlab.wcf/templates/pageHeaderUser.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderUser.tpl
@@ -71,7 +71,7 @@
                                                        {event name='userMenuItemsAfter'}
                                                </ul>
                                        </div>
-                                       <a class="interactiveDropdownShowAll" href="{link controller='Logout'}t={@SECURITY_TOKEN}{/link}" onclick="WCF.Dropdown.Interactive.Handler.close('userMenu'); WCF.System.Confirmation.show('{lang}wcf.user.logout.sure{/lang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;">{lang}wcf.user.logout{/lang}</a>
+                                       <a class="interactiveDropdownShowAll" href="{link controller='Logout'}t={@SECURITY_TOKEN}{/link}" onclick="WCF.Dropdown.Interactive.Handler.close('userMenu'); WCF.System.Confirmation.show('{jslang}wcf.user.logout.sure{/jslang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;">{lang}wcf.user.logout{/lang}</a>
                                </div>
                                <script data-relocate="true">
                                        $(function() {
@@ -88,10 +88,10 @@
                                                <script data-relocate="true">
                                                        $(function() {
                                                                new WCF.User.Panel.Notification({
-                                                                       noItems: '{lang}wcf.user.notification.noMoreNotifications{/lang}',
+                                                                       noItems: '{jslang}wcf.user.notification.noMoreNotifications{/jslang}',
                                                                        settingsLink: '{link controller='NotificationSettings' encode=false}{/link}',
                                                                        showAllLink: '{link controller='NotificationList' encode=false}{/link}',
-                                                                       title: '{lang}wcf.user.notification.notifications{/lang}'
+                                                                       title: '{jslang}wcf.user.notification.notifications{/jslang}'
                                                                });
                                                        });
                                                </script>
@@ -261,11 +261,11 @@
                                                <script data-relocate="true">
                                                        $(function() {
                                                                new WCF.User.Panel.Moderation({
-                                                                       deletedContent: '{lang}wcf.moderation.showDeletedContent{/lang}',
+                                                                       deletedContent: '{jslang}wcf.moderation.showDeletedContent{/jslang}',
                                                                        deletedContentLink: '{link controller='DeletedContentList' encode=false}{/link}',
-                                                                       noItems: '{lang}wcf.moderation.noMoreItems{/lang}',
+                                                                       noItems: '{jslang}wcf.moderation.noMoreItems{/jslang}',
                                                                        showAllLink: '{link controller='ModerationList' encode=false}{/link}',
-                                                                       title: '{lang}wcf.moderation.moderation{/lang}'
+                                                                       title: '{jslang}wcf.moderation.moderation{/jslang}'
                                                                });
                                                        });
                                                </script>

diff --git a/com.woltlab.wcf/templates/register.tpl b/com.woltlab.wcf/templates/register.tpl
index cdb556ba3f6c33edb5303c644d61c3c1a53402cb..b660a6c8d8baed043b02dee09827444300b0c2f7 100644 (file)
--- 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 d8a122335f68a23662dd7434b353578adb0e0dfa..9cac179e73aa04fe28dc61278190aed14fe699ea 100644 (file)
--- 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 155af844e2d4b833ee13b695980cd5af905ef747..f06eb7348d77367177865e2275218be50c1e4292 100644 (file)
--- 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 f7c87c079d3ec92d64b4bf22cb9d90db1f7ed7de..80a54f9ef59405826a0aaca26e399cfe3aa159c3 100644 (file)
--- 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 6fca00a9fdf0ce0dc600461b1d2cbb5fca00e304..2299dd3e19d17f42e0303fb4158f5f926b16559e 100644 (file)
--- 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 4b85a9bb025f17ba5ddc26c8faa002ebc747d7c4..5a861134caee77474e3ac6353de2c0e9d1a491bb 100644 (file)
--- 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 4177a184b8e4768adca8438cae9a4f2b9f1c0f44..19be7d8a8eafc6da33c7a2206410c161a8e5b6ea 100644 (file)
--- a/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl
@@ -3,6 +3,6 @@
 
 <script data-relocate="true">
 $(function() {
-       $('#{$option->optionName}_age_from').parents('dl:eq(0)').find('> dt > label').text('{lang}wcf.user.birthday.age{/lang}').attr('for', '{$option->optionName}_age_from');
+       $('#{$option->optionName}_age_from').parents('dl:eq(0)').find('> dt > label').text('{jslang}wcf.user.birthday.age{/jslang}').attr('for', '{$option->optionName}_age_from');
 });
-</script>
\ No newline at end of file
+</script>

diff --git a/wcfsetup/install/files/acp/templates/boxAdd.tpl b/wcfsetup/install/files/acp/templates/boxAdd.tpl
index ffbfafb3574fb9f8c2408d23dcb6b73217561820..acacfdeb58bcdb30182ed5d574deb8deffd63a44 100644 (file)
--- 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 3689a8e28fdc442b55160084eeee03f688584d79..939389ef1b641dd0197197cdb5b366fbeb3fa840 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -16,7 +16,7 @@
                        <ul>
                                {content}
                                        {if $cacheData.files}
-                                               <li><a onclick="WCF.System.Confirmation.show('{lang}wcf.acp.cache.clear.sure{/lang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;" href="{link controller='CacheClear'}{/link}" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
+                                               <li><a onclick="WCF.System.Confirmation.show('{jslang}wcf.acp.cache.clear.sure{/jslang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;" href="{link controller='CacheClear'}{/link}" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
                                        {/if}
                                        
                                        {event name='contentHeaderNavigation'}
@@ -106,7 +106,7 @@
                        <ul>
                                {content}
                                        {if $cacheData.files}
-                                               <li><a onclick="WCF.System.Confirmation.show('{lang}wcf.acp.cache.clear.sure{/lang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;" href="{link controller='CacheClear'}{/link}" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
+                                               <li><a onclick="WCF.System.Confirmation.show('{jslang}wcf.acp.cache.clear.sure{/jslang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;" href="{link controller='CacheClear'}{/link}" class="button"><span class="icon icon16 fa-times"></span> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>
                                        {/if}
                                        
                                        {event name='contentFooterNavigation'}

diff --git a/wcfsetup/install/files/acp/templates/captchaQuestionList.tpl b/wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
index 7d2d372d0e9b6b9e11578ac2088f7b82387fd8fa..ba1afe0e4d1dfa01c5d357a6003b1edec67d7253 100644 (file)
--- a/wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
+++ b/wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
@@ -12,7 +12,7 @@
                                options.updatePageNumber = -1;
                        {/if}
                {else}
-                       options.emptyMessage = '{lang}wcf.global.noItems{/lang}';
+                       options.emptyMessage = '{jslang}wcf.global.noItems{/jslang}';
                {/if}
                
                new WCF.Table.EmptyTableHandler($('#captchaQuestionTabelContainer'), 'jsQuestionRow', options);
@@ -93,4 +93,4 @@
 </footer>
 
 {include file='footer'}
- 
\ No newline at end of file
+ 

diff --git a/wcfsetup/install/files/acp/templates/dataImport.tpl b/wcfsetup/install/files/acp/templates/dataImport.tpl
index 799c084928ff987ebfb83c443f79d6793a93cb82..1eecc1cf348338b7437762124af79768d2d06a5b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/dataImport.tpl
+++ b/wcfsetup/install/files/acp/templates/dataImport.tpl
@@ -61,7 +61,7 @@
                        <script data-relocate="true">
                                $(function() {
                                        $('#deleteMapping').click(function() {
-                                               WCF.System.Confirmation.show('{lang}wcf.acp.dataImport.existingMapping.confirmMessage{/lang}', function(action) {
+                                               WCF.System.Confirmation.show('{jslang}wcf.acp.dataImport.existingMapping.confirmMessage{/jslang}', function(action) {
                                                        if (action === 'confirm') {
                                                                new WCF.Action.Proxy({
                                                                        autoSend: true,

diff --git a/wcfsetup/install/files/acp/templates/devtoolsMissingLanguageItemList.tpl b/wcfsetup/install/files/acp/templates/devtoolsMissingLanguageItemList.tpl
index 3c4338ad115e2d19dc393ec36884c403142bf5c8..177b362bd9fe5a355efbca7d66fac6a2f48d7632 100644 (file)
--- a/wcfsetup/install/files/acp/templates/devtoolsMissingLanguageItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsMissingLanguageItemList.tpl
@@ -87,7 +87,7 @@
                                                'logEntryStackTrace',
                                                elData(event.currentTarget, 'stack-trace'),
                                                {
-                                                       title: '{lang}wcf.acp.devtools.missingLanguageItem.stackTrace{/lang}',
+                                                       title: '{jslang}wcf.acp.devtools.missingLanguageItem.stackTrace{/jslang}',
                                                }
                                        );
                                        
@@ -116,7 +116,7 @@
                                                        }
                                                });
                                        },
-                                       'message': '{lang}wcf.acp.devtools.missingLanguageItem.clearLog.confirmMessage{/lang}',
+                                       'message': '{jslang}wcf.acp.devtools.missingLanguageItem.clearLog.confirmMessage{/jslang}',
                                });
                        });
                        
@@ -127,7 +127,7 @@
                                        options.updatePageNumber = -1;
                                {/if}
                        {else}
-                               options.emptyMessage = '{lang}wcf.global.noItems{/lang}';
+                               options.emptyMessage = '{jslang}wcf.global.noItems{/jslang}';
                        {/if}
                        new WCF.Table.EmptyTableHandler($('#missingLanguageItemTable'), 'jsObjectRow', options);
                });

diff --git a/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl b/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl
index a8fa0ec2779cf33c3f0ab575577481d57adf2247..a7390ecf7c5425e6b1d2bd8d733ac00db33587eb 100644 (file)
--- a/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl
+++ b/wcfsetup/install/files/acp/templates/devtoolsProjectList.tpl
@@ -6,7 +6,7 @@
        });
        
        require(['WoltLabSuite/Core/Acp/Ui/Devtools/Project/QuickSetup', 'Language'], function(AcpUiDevtoolsProjectQuickSetup, Language) {
-               Language.add('wcf.acp.devtools.project.quickSetup', '{lang}wcf.acp.devtools.project.quickSetup{/lang}');
+               Language.add('wcf.acp.devtools.project.quickSetup', '{jslang}wcf.acp.devtools.project.quickSetup{/jslang}');
                
                AcpUiDevtoolsProjectQuickSetup.init();
        });

diff --git a/wcfsetup/install/files/acp/templates/labelAdd.tpl b/wcfsetup/install/files/acp/templates/labelAdd.tpl
index 54fdb4dd3201bd1bc079be4cf1f84af41ed77755..f6fb5eba48ccf557491fad348fcb65abaee65d5e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/labelAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelAdd.tpl
@@ -9,7 +9,7 @@
                
                var input = elById('label');
                function updatePreview() {
-                       var value = input.value.trim() || '{lang}wcf.acp.label.defaultValue{/lang}';
+                       var value = input.value.trim() || '{jslang}wcf.acp.label.defaultValue{/jslang}';
                        previews.forEach(function(preview) {
                                preview.textContent = value;
                        });

diff --git a/wcfsetup/install/files/acp/templates/labelGroupList.tpl b/wcfsetup/install/files/acp/templates/labelGroupList.tpl
index f5ccb86be86f61296ecc549eae86b0d1a49cca4d..83d0011bbb5c37484d8cc0201388e73848f23ed2 100644 (file)
--- a/wcfsetup/install/files/acp/templates/labelGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/labelGroupList.tpl
@@ -11,7 +11,7 @@
                                options.updatePageNumber = -1;
                        {/if}
                {else}
-                       options.emptyMessage = '{lang}wcf.global.noItems{/lang}';
+                       options.emptyMessage = '{jslang}wcf.global.noItems{/jslang}';
                {/if}
                
                new WCF.Table.EmptyTableHandler($('#labelGroupTableContainer'), 'jsLabelGroupRow', options);

diff --git a/wcfsetup/install/files/acp/templates/labelList.tpl b/wcfsetup/install/files/acp/templates/labelList.tpl
index 88f856bcdd01aa6e28585920e596ad70e2403192..6ea46a20568790ab0d5fa91369f51a64cd4e5eaa 100644 (file)
--- a/wcfsetup/install/files/acp/templates/labelList.tpl
+++ b/wcfsetup/install/files/acp/templates/labelList.tpl
@@ -11,7 +11,7 @@
                                options.updatePageNumber = -1;
                        {/if}
                {else}
-                       options.emptyMessage = '{lang}wcf.global.noItems{/lang}';
+                       options.emptyMessage = '{jslang}wcf.global.noItems{/jslang}';
                {/if}
                
                new WCF.Table.EmptyTableHandler($('#labelTableContainer'), 'jsLabelRow', options);

diff --git a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
index fbbe62dce05e1e3089071a28e9e158d15e4deac6..a510b43a7c07f0de1b3a1b7a99308ff7af0f10fe 100644 (file)
--- a/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
@@ -12,7 +12,7 @@
                                                {event name='userMenuItems'}
                                                
                                                <li class="dropdownDivider"></li>
-                                               <li><a href="{link controller='Logout'}t={@SECURITY_TOKEN}{/link}" onclick="WCF.System.Confirmation.show('{lang}wcf.user.logout.sure{/lang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;">{lang}wcf.user.logout{/lang}</a></li>
+                                               <li><a href="{link controller='Logout'}t={@SECURITY_TOKEN}{/link}" onclick="WCF.System.Confirmation.show('{jslang}wcf.user.logout.sure{/jslang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;">{lang}wcf.user.logout{/lang}</a></li>
                                        </ul>
                                </li>
                                

diff --git a/wcfsetup/install/files/acp/templates/rebuildData.tpl b/wcfsetup/install/files/acp/templates/rebuildData.tpl
index 4aadca412b2fbe52033b0666abfc65e7e7bad7fe..fdd5e27b12def96a30698310a131f9d34c657e2b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/rebuildData.tpl
+++ b/wcfsetup/install/files/acp/templates/rebuildData.tpl
@@ -2,7 +2,7 @@
 
 <script data-relocate="true">
        require(['Language', 'WoltLabSuite/Core/Acp/Ui/Worker'], function (Language, AcpUiWorker) {
-               Language.add('wcf.acp.worker.abort.confirmMessage', '{lang}wcf.acp.worker.abort.confirmMessage{/lang}');
+               Language.add('wcf.acp.worker.abort.confirmMessage', '{jslang}wcf.acp.worker.abort.confirmMessage{/jslang}');
                
                elBySelAll('.jsRebuildDataWorker', undefined, function (button) {
                        if (button.classList.contains('disabled')) return;

diff --git a/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl b/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl
index f6709d7e7f001e71759c203f11d68b6317071c17..9933270a0e793e29766f58e4ea024791122f9d1a 100644 (file)
--- a/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/sendMailUserBulkProcessing.tpl
@@ -57,7 +57,7 @@
 {if !$mailID|empty}
        <script data-relocate="true">
                require(['Language'], function(Language) {
-                       Language.add('wcf.acp.worker.abort.confirmMessage', '{lang}wcf.acp.worker.abort.confirmMessage{/lang}');
+                       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/sitemapList.tpl b/wcfsetup/install/files/acp/templates/sitemapList.tpl
index 5283e18389573d634eed0a863494ca32d4f9bc91..67163ebc978bc5c2c9e719bec921c1f368ff75bd 100644 (file)
--- a/wcfsetup/install/files/acp/templates/sitemapList.tpl
+++ b/wcfsetup/install/files/acp/templates/sitemapList.tpl
@@ -72,10 +72,10 @@
 
 <script data-relocate="true">
        require(['Language'], function(Language) {
-               Language.add('wcf.acp.worker.abort.confirmMessage', '{lang}wcf.acp.worker.abort.confirmMessage{/lang}');
+               Language.add('wcf.acp.worker.abort.confirmMessage', '{jslang}wcf.acp.worker.abort.confirmMessage{/jslang}');
                
                elById('sitemapRebuildButton').addEventListener(WCF_CLICK_EVENT, function () {
-                       new WCF.ACP.Worker('sitemapRebuild', 'wcf\\system\\worker\\SitemapRebuildWorker', '{lang}wcf.acp.rebuildData.com.woltlab.wcf.sitemap{/lang}', {
+                       new WCF.ACP.Worker('sitemapRebuild', 'wcf\\system\\worker\\SitemapRebuildWorker', '{jslang}wcf.acp.rebuildData.com.woltlab.wcf.sitemap{/jslang}', {
                                forceRebuild: true
                        });
                });

diff --git a/wcfsetup/install/files/acp/templates/tagList.tpl b/wcfsetup/install/files/acp/templates/tagList.tpl
index de3c56865e2cb1c98d34072ec5350ce905ab676b..7077b8350570e97e53a029eed9430c989dd05d7f 100644 (file)
--- a/wcfsetup/install/files/acp/templates/tagList.tpl
+++ b/wcfsetup/install/files/acp/templates/tagList.tpl
@@ -2,7 +2,7 @@
 
 <script data-relocate="true">
        require(['WoltLabSuite/Core/Controller/Clipboard', 'Language'], function(ControllerClipboard, Language) {
-               Language.add('wcf.acp.tag.setAsSynonyms', '{lang}wcf.acp.tag.setAsSynonyms{/lang}');
+               Language.add('wcf.acp.tag.setAsSynonyms', '{jslang}wcf.acp.tag.setAsSynonyms{/jslang}');
                
                var deleteAction = new WCF.Action.Delete('wcf\\data\\tag\\TagAction', '.jsTagRow');
                deleteAction.setCallback(ControllerClipboard.reload.bind(ControllerClipboard));

diff --git a/wcfsetup/install/files/acp/templates/templateGroupList.tpl b/wcfsetup/install/files/acp/templates/templateGroupList.tpl
index 3e25e849ff445166039622e1440d8bc13343612c..3b43cd9e8223457a826e2bc5795b5dfbca4691c7 100644 (file)
--- a/wcfsetup/install/files/acp/templates/templateGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/templateGroupList.tpl
@@ -6,12 +6,12 @@
                
                var options = { };
                {if $pages > 1}
-               options.refreshPage = true;
-               {if $pages == $pageNo}
-               options.updatePageNumber = -1;
-               {/if}
+                       options.refreshPage = true;
+                       {if $pages == $pageNo}
+                               options.updatePageNumber = -1;
+                       {/if}
                {else}
-               options.emptyMessage = '{lang}wcf.global.noItems{/lang}';
+                       options.emptyMessage = '{jslang}wcf.global.noItems{/jslang}';
                {/if}
                
                new WCF.Table.EmptyTableHandler($('#templateGroupTableContainer'), 'jsTemplateGroupRow', options);

diff --git a/wcfsetup/install/files/acp/templates/templateList.tpl b/wcfsetup/install/files/acp/templates/templateList.tpl
index df6906e419683678018203d11dddea019fe1fb16..94340d9139360cd49bbc236d0a0398b943795480 100644 (file)
--- a/wcfsetup/install/files/acp/templates/templateList.tpl
+++ b/wcfsetup/install/files/acp/templates/templateList.tpl
@@ -11,7 +11,7 @@
                                options.updatePageNumber = -1;
                        {/if}
                {else}
-                       options.emptyMessage = '{lang}wcf.global.noItems{/lang}';
+                       options.emptyMessage = '{jslang}wcf.global.noItems{/jslang}';
                {/if}
                
                new WCF.Table.EmptyTableHandler($('#templateTableContainer'), 'jsTemplateRow', options);

diff --git a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
index 80d662fa3777cae96e4bf8b4baff47592db4d9c1..6f05581eaafdb1097b2b5f08262fd2a4d681e446 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
+++ b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
@@ -5,7 +5,7 @@
                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}');
+                       new WCF.ACP.Worker('events', 'wcf\\system\\worker\\UserActivityPointUpdateEventsWorker', '{jslang}wcf.acp.user.activityPoint.updateEvents{/jslang}');
                });
        });
 </script>

diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index a638a231563906a26ab11c9ec0d14cf42fb77190..70fca46bd4ef94129ae10e7f656ebdaa738ba088 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -684,7 +684,7 @@
                        if (input) {
                                var icon = elCreate('span');
                                icon.className = 'icon icon16 fa-shield jsTooltip';
-                               icon.title = '{lang}wcf.acp.group.type.owner{/lang}';
+                               icon.title = '{jslang}wcf.acp.group.type.owner{/jslang}';
                                input.parentNode.appendChild(icon);
                                
                                {if $user->userID == $__wcf->user->userID}

diff --git a/wcfsetup/install/files/acp/templates/userGroupAssignmentList.tpl b/wcfsetup/install/files/acp/templates/userGroupAssignmentList.tpl
index 3bb963690fa36d6311f6566f94a509a5f2ceb7f1..e8a6d4e577bc45822751bc6b1c7620ec5b817b5e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupAssignmentList.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAssignmentList.tpl
@@ -12,7 +12,7 @@
                                options.updatePageNumber = -1;
                        {/if}
                {else}
-                       options.emptyMessage = '{lang}wcf.global.noItems{/lang}';
+                       options.emptyMessage = '{jslang}wcf.global.noItems{/jslang}';
                {/if}
                
                new WCF.Table.EmptyTableHandler($('#userGroupAssignmentTableContainer'), 'jsUserGroupAssignmentRow', options);

diff --git a/wcfsetup/install/files/acp/templates/userRankAdd.tpl b/wcfsetup/install/files/acp/templates/userRankAdd.tpl
index 97bb4bc7656057150cc31b7e77596fad1bfa89da..16aea12523028714e40aaea28f9ab263cdfd741c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userRankAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userRankAdd.tpl
@@ -9,7 +9,7 @@
                
                var input = elById('rankTitle');
                function updatePreview() {
-                       var value = input.value.trim() || '{lang}wcf.acp.user.rank.title{/lang}';
+                       var value = input.value.trim() || '{jslang}wcf.acp.user.rank.title{/jslang}';
                        previews.forEach(function(preview) {
                                preview.textContent = value;
                        });

diff --git a/wcfsetup/install/files/acp/templates/wysiwygToolbar.tpl b/wcfsetup/install/files/acp/templates/wysiwygToolbar.tpl
index 155af844e2d4b833ee13b695980cd5af905ef747..f06eb7348d77367177865e2275218be50c1e4292 100644 (file)
--- a/wcfsetup/install/files/acp/templates/wysiwygToolbar.tpl
+++ b/wcfsetup/install/files/acp/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'];