Skip to content

Refactor language templates #6353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Cyperghost merged 1 commit into from
Jun 19, 2025
Merged

Refactor language templates #6353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions com.woltlab.wcf/templates/shared_languageChooser.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
{if $languages|count}
<dl{if $errorField|isset && $errorField == $__languageChooserPrefix|concat:'languageID'} class="formError"{/if}>
<dt>{lang}{$label}{/lang}</dt>
<dd id="{@$__languageChooserPrefix}languageIDContainer">
<dd id="{$__languageChooserPrefix}languageIDContainer">
<noscript>
<select name="{@$__languageChooserPrefix}languageID" id="{@$__languageChooserPrefix}languageID">
<select name="{$__languageChooserPrefix}languageID" id="{$__languageChooserPrefix}languageID">
{foreach from=$languages item=_language}
<option value="{$_language->languageID}">{$_language}</option>
{/foreach}
Expand All @@ -19,14 +19,14 @@
require(['WoltLabSuite/Core/Language/Chooser'], function(LanguageChooser) {
var languages = {
{implode from=$languages item=_language}
'{@$_language->languageID}': {
iconPath: '{@$_language->getIconPath()|encodeJS}',
languageName: '{@$_language|encodeJS}'
'{$_language->languageID}': {
iconPath: '{unsafe:$_language->getIconPath()|encodeJS}',
languageName: '{unsafe:$_language|encodeJS}'
}
{/implode}
};

LanguageChooser.init('{@$__languageChooserPrefix}languageIDContainer', '{@$__languageChooserPrefix}languageID', {$languageID}, languages)
LanguageChooser.init('{unsafe:$__languageChooserPrefix|encodeJS}languageIDContainer', '{unsafe:$__languageChooserPrefix|encodeJS}languageID', {$languageID}, languages)
});
</script>
{/if}
4 changes: 2 additions & 2 deletions wcfsetup/install/files/acp/templates/languageAdd.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<header class="contentHeader">
<div class="contentHeaderTitle">
<h1 class="contentTitle">{lang}wcf.acp.language.{@$action}{/lang}</h1>
<h1 class="contentTitle">{lang}wcf.acp.language.{$action}{/lang}</h1>
</div>

<nav class="contentHeaderNavigation">
Expand All @@ -14,6 +14,6 @@
</nav>
</header>

{@$form->getHtml()}
{unsafe:$form->getHtml()}

{include file='footer'}
4 changes: 2 additions & 2 deletions wcfsetup/install/files/acp/templates/languageExport.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
{if $errorType == 'noValidSelection'}
{lang}wcf.global.form.error.noValidSelection{/lang}
{else}
{lang}wcf.acp.language.languageID.error.{@$errorType}{/lang}
{lang}wcf.acp.language.languageID.error.{$errorType}{/lang}
{/if}
</small>
{/if}
Expand All @@ -48,7 +48,7 @@
{if $errorType == 'empty'}
{lang}wcf.global.form.error.empty{/lang}
{else}
{lang}wcf.acp.language.export.package.error.{@$errorType}{/lang}
{lang}wcf.acp.language.export.package.error.{$errorType}{/lang}
{/if}
</small>
{/if}
Expand Down
4 changes: 2 additions & 2 deletions wcfsetup/install/files/acp/templates/languageImport.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
{if $errorType == 'empty'}
{lang}wcf.global.form.error.empty{/lang}
{else}
{lang}wcf.acp.language.add.source.error.{@$errorType}{/lang}
{lang}wcf.acp.language.add.source.error.{$errorType}{/lang}
{/if}
</small>
{/if}
Expand All @@ -73,7 +73,7 @@
{if $errorType == 'empty'}
{lang}wcf.global.form.error.empty{/lang}
{else}
{lang}wcf.acp.language.add.package.error.{@$errorType}{/lang}
{lang}wcf.acp.language.add.package.error.{$errorType}{/lang}
{/if}
</small>
{/if}
Expand Down
2 changes: 1 addition & 1 deletion wcfsetup/install/files/acp/templates/languageItemAdd.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
</nav>
</header>

{@$form->getHtml()}
{unsafe:$form->getHtml()}

{include file='footer'}
2 changes: 1 addition & 1 deletion wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

{if $errorField == 'languageIDs'}
<small class="innerError">
{lang}wcf.acp.language.multilingualism.languages.error.{@$errorType}{/lang}
{lang}wcf.acp.language.multilingualism.languages.error.{$errorType}{/lang}
</small>
{/if}
</dd>
Expand Down
Loading