diff --git a/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl b/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl index c38b26355c0..379597d50e5 100644 --- a/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl +++ b/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl @@ -2,7 +2,13 @@ diff --git a/com.woltlab.wcf/templates/integerOptionType.tpl b/com.woltlab.wcf/templates/integerOptionType.tpl index 96bdc5ee512..05a0faf724c 100644 --- a/com.woltlab.wcf/templates/integerOptionType.tpl +++ b/com.woltlab.wcf/templates/integerOptionType.tpl @@ -1 +1 @@ -minvalue !== null} min="{$option->minvalue}"{/if}{if $option->maxvalue !== null} max="{$option->maxvalue}"{/if}{if $inputClass} class="{@$inputClass}"{/if}{if $option->required} required{/if}> \ No newline at end of file +minvalue !== null} min="{$option->minvalue}"{/if}{if $option->maxvalue !== null} max="{$option->maxvalue}"{/if}{if $inputClass} class="{$inputClass}"{/if}{if $option->required} required{/if}> diff --git a/com.woltlab.wcf/templates/messageOptionType.tpl b/com.woltlab.wcf/templates/messageOptionType.tpl index 3647f324626..49cbd5706c3 100644 --- a/com.woltlab.wcf/templates/messageOptionType.tpl +++ b/com.woltlab.wcf/templates/messageOptionType.tpl @@ -2,7 +2,13 @@ {include file='shared_wysiwyg' wysiwygSelector=$option->optionName} diff --git a/com.woltlab.wcf/templates/multiSelectOptionType.tpl b/com.woltlab.wcf/templates/multiSelectOptionType.tpl index d1faa4ebd3e..ff51d59cb7f 100644 --- a/com.woltlab.wcf/templates/multiSelectOptionType.tpl +++ b/com.woltlab.wcf/templates/multiSelectOptionType.tpl @@ -1,5 +1,5 @@ -required} required{/if}> +required} required{/if}> {foreach from=$selectOptions key=key item=selectOption} - {lang}{@$selectOption}{/lang} + {lang}{$selectOption}{/lang} {/foreach} diff --git a/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl b/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl index d75a8fdbc5d..e4d9b4b307f 100644 --- a/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl +++ b/com.woltlab.wcf/templates/multiSelectSearchableOptionType.tpl @@ -1,19 +1,18 @@ {lang}wcf.user.option.searchRadioButtonOption{/lang} -required} required{/if}> +required} required{/if}> {foreach from=$selectOptions key=key item=selectOption} - {lang}{@$selectOption}{/lang} + {lang}{$selectOption}{/lang} {/foreach} diff --git a/com.woltlab.wcf/templates/optionFieldList.tpl b/com.woltlab.wcf/templates/optionFieldList.tpl index 0a08f6ca2dc..3aed79662ff 100644 --- a/com.woltlab.wcf/templates/optionFieldList.tpl +++ b/com.woltlab.wcf/templates/optionFieldList.tpl @@ -15,7 +15,7 @@ {icon name='bolt'} {/if} - {$langPrefix|concat:$option->optionName|phrase} + {lang}{$langPrefix}{$option->optionName}{/lang} {/if} @@ -25,11 +25,11 @@ {if $error == 'empty'} {lang}wcf.global.form.error.empty{/lang} {else} - {lang}{@$langPrefix}error.{$error}{/lang} + {lang}{$langPrefix}error.{$error}{/lang} {/if} {/if} - {lang __optional=true}{@$langPrefix}{$option->optionName}.description{/lang} + {lang __optional=true}{$langPrefix}{$option->optionName}.description{/lang} {/foreach} diff --git a/com.woltlab.wcf/templates/radioButtonOptionType.tpl b/com.woltlab.wcf/templates/radioButtonOptionType.tpl index 21a53727b61..59ba4b47286 100644 --- a/com.woltlab.wcf/templates/radioButtonOptionType.tpl +++ b/com.woltlab.wcf/templates/radioButtonOptionType.tpl @@ -1,3 +1,3 @@ {foreach name=radioButtons from=$selectOptions key=key item=selectOption} - optionName}" {/if}type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {$disableOptions[$key]}]" data-enable-options="[ {$enableOptions[$key]}]"{/if}> {lang}{@$selectOption}{/lang} + optionName}" {/if}type="radio" name="values[{$option->optionName}]" value="{$key}" {if $value == $key} checked{/if} {if $disableOptions[$key]|isset || $enableOptions[$key]|isset}class="jsEnablesOptions" data-disable-options="[ {$disableOptions[$key]}]" data-enable-options="[ {$enableOptions[$key]}]"{/if}> {lang}{$selectOption}{/lang} {/foreach} diff --git a/com.woltlab.wcf/templates/selectOptionType.tpl b/com.woltlab.wcf/templates/selectOptionType.tpl index 7529516b613..0663133f48c 100644 --- a/com.woltlab.wcf/templates/selectOptionType.tpl +++ b/com.woltlab.wcf/templates/selectOptionType.tpl @@ -1,6 +1,6 @@ required} required{/if}{if $disableOptions || $enableOptions} class="jsEnablesOptions" data-is-boolean="true" data-disable-options="[ {$disableOptions}]" data-enable-options="[ {$enableOptions}]"{/if}> {if !$allowEmptyValue|empty}{lang}wcf.global.noSelection{/lang}{/if} {foreach from=$selectOptions key=key item=selectOption} - {lang}{@$selectOption}{/lang} + {lang}{$selectOption}{/lang} {/foreach} diff --git a/com.woltlab.wcf/templates/selectSearchableOptionType.tpl b/com.woltlab.wcf/templates/selectSearchableOptionType.tpl index 8903fea1b77..e05649bc5e5 100644 --- a/com.woltlab.wcf/templates/selectSearchableOptionType.tpl +++ b/com.woltlab.wcf/templates/selectSearchableOptionType.tpl @@ -2,19 +2,18 @@ required} required{/if}> {if !$allowEmptyValue|empty}{lang}wcf.global.noSelection{/lang}{/if} {foreach from=$selectOptions key=key item=selectOption} - {lang}{@$selectOption}{/lang} + {lang}{$selectOption}{/lang} {/foreach} diff --git a/com.woltlab.wcf/templates/shared_booleanSearchableOptionType.tpl b/com.woltlab.wcf/templates/shared_booleanSearchableOptionType.tpl index 444649675fa..cf54d52f025 100644 --- a/com.woltlab.wcf/templates/shared_booleanSearchableOptionType.tpl +++ b/com.woltlab.wcf/templates/shared_booleanSearchableOptionType.tpl @@ -11,16 +11,21 @@ diff --git a/com.woltlab.wcf/templates/shared_checkboxesOptionType.tpl b/com.woltlab.wcf/templates/shared_checkboxesOptionType.tpl index 57dcf08e45f..5d120940385 100644 --- a/com.woltlab.wcf/templates/shared_checkboxesOptionType.tpl +++ b/com.woltlab.wcf/templates/shared_checkboxesOptionType.tpl @@ -1,3 +1,3 @@ {foreach from=$selectOptions key=key item=selectOption} - {lang}{@$selectOption}{/lang} + {lang}{$selectOption}{/lang} {/foreach} diff --git a/com.woltlab.wcf/templates/shared_checkboxesSearchableOptionType.tpl b/com.woltlab.wcf/templates/shared_checkboxesSearchableOptionType.tpl index edff6d44e10..918fb016e04 100644 --- a/com.woltlab.wcf/templates/shared_checkboxesSearchableOptionType.tpl +++ b/com.woltlab.wcf/templates/shared_checkboxesSearchableOptionType.tpl @@ -1,17 +1,18 @@ {lang}wcf.user.option.searchRadioButtonOption{/lang} {foreach from=$selectOptions key=key item=selectOption} - {lang}{@$selectOption}{/lang} + {lang}{$selectOption}{/lang} {/foreach} diff --git a/com.woltlab.wcf/templates/shared_lineBreakSeparatedTextOptionType.tpl b/com.woltlab.wcf/templates/shared_lineBreakSeparatedTextOptionType.tpl index b4365222809..da13164dd7f 100644 --- a/com.woltlab.wcf/templates/shared_lineBreakSeparatedTextOptionType.tpl +++ b/com.woltlab.wcf/templates/shared_lineBreakSeparatedTextOptionType.tpl @@ -22,7 +22,7 @@ }); new UiItemListLineBreakSeparatedText( - document.getElementById("lineBreakSeparatedTextOption_{@$identifier|encodeJS}") + document.getElementById("lineBreakSeparatedTextOption_{unsafe:$identifier|encodeJS}") ); }); diff --git a/com.woltlab.wcf/templates/shared_radioButtonSearchableOptionType.tpl b/com.woltlab.wcf/templates/shared_radioButtonSearchableOptionType.tpl index 699751c0e28..0947e3d7828 100644 --- a/com.woltlab.wcf/templates/shared_radioButtonSearchableOptionType.tpl +++ b/com.woltlab.wcf/templates/shared_radioButtonSearchableOptionType.tpl @@ -1,17 +1,18 @@ {lang}wcf.user.option.searchRadioButtonOption{/lang} {foreach from=$selectOptions key=key item=selectOption} - {lang}{@$selectOption}{/lang} + {lang}{$selectOption}{/lang} {/foreach} diff --git a/com.woltlab.wcf/templates/textI18nOptionType.tpl b/com.woltlab.wcf/templates/textI18nOptionType.tpl index 6deed6b0af5..7dc01a5c74f 100644 --- a/com.woltlab.wcf/templates/textI18nOptionType.tpl +++ b/com.woltlab.wcf/templates/textI18nOptionType.tpl @@ -1,2 +1,2 @@ -required} required{/if} class="long"> +required} required{/if} class="long"> {include file='shared_multipleLanguageInputJavascript' elementIdentifier=$option->optionName forceSelection=false} diff --git a/com.woltlab.wcf/templates/textSearchableOptionType.tpl b/com.woltlab.wcf/templates/textSearchableOptionType.tpl index 0d040a4caa1..1ea4054e09c 100644 --- a/com.woltlab.wcf/templates/textSearchableOptionType.tpl +++ b/com.woltlab.wcf/templates/textSearchableOptionType.tpl @@ -1,27 +1,34 @@ {lang}wcf.user.option.searchTextOption{/lang} -required} required{/if}> +required} required{/if}> diff --git a/com.woltlab.wcf/templates/textareaSearchableOptionType.tpl b/com.woltlab.wcf/templates/textareaSearchableOptionType.tpl index 9d426336560..d98eb4d79fc 100644 --- a/com.woltlab.wcf/templates/textareaSearchableOptionType.tpl +++ b/com.woltlab.wcf/templates/textareaSearchableOptionType.tpl @@ -2,14 +2,13 @@ required} required{/if}>{$value} diff --git a/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl b/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl index e14487a430a..4f42e3173f4 100644 --- a/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl +++ b/wcfsetup/install/files/acp/templates/__optionRewriteTest.tpl @@ -33,7 +33,7 @@ const apps = new Map(Object.entries({ {* this bypasses the route system to force rewritten urls *} - {implode from=$rewriteTestApplications item=$rewriteTestApplication}'{$rewriteTestApplication->getPackage()|encodeJS}': '{$__wcf->getPath($rewriteTestApplication->getAbbreviation())}core-rewrite-test/'{/implode} + {implode from=$rewriteTestApplications item=$rewriteTestApplication}'{unsafe:$rewriteTestApplication->getPackage()|encodeJS}': '{$__wcf->getPath($rewriteTestApplication->getAbbreviation())}core-rewrite-test/'{/implode} })); AcpUiOptionRewriteTest.init(apps); diff --git a/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl index 8dccd6f0deb..4e661619d8c 100644 --- a/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl +++ b/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl @@ -2,7 +2,14 @@ diff --git a/wcfsetup/install/files/acp/templates/customOptionAdd.tpl b/wcfsetup/install/files/acp/templates/customOptionAdd.tpl index 769de689224..e077854ff69 100644 --- a/wcfsetup/install/files/acp/templates/customOptionAdd.tpl +++ b/wcfsetup/install/files/acp/templates/customOptionAdd.tpl @@ -1,19 +1,26 @@ @@ -27,7 +34,7 @@ {if $errorType == 'multilingual'} {lang}wcf.global.form.error.multilingual{/lang} {else} - {lang}wcf.acp.customOption.name.error.{@$errorType}{/lang} + {lang}wcf.acp.customOption.name.error.{$errorType}{/lang} {/if} {/if} @@ -44,7 +51,7 @@ {if $errorType == 'empty'} {lang}wcf.global.form.error.empty{/lang} {else} - {lang}wcf.acp.customOption.description.error.{@$errorType}{/lang} + {lang}wcf.acp.customOption.description.error.{$errorType}{/lang} {/if} {/if} @@ -85,7 +92,7 @@ {if $errorType == 'empty'} {lang}wcf.global.form.error.empty{/lang} {else} - {lang}wcf.acp.customOption.optionType.error.{@$errorType}{/lang} + {lang}wcf.acp.customOption.optionType.error.{$errorType}{/lang} {/if} {/if} @@ -109,7 +116,7 @@ {if $errorType == 'empty'} {lang}wcf.global.form.error.empty{/lang} {else} - {lang}wcf.acp.customOption.selectOptions.error.{@$errorType}{/lang} + {lang}wcf.acp.customOption.selectOptions.error.{$errorType}{/lang} {/if} {/if} @@ -126,7 +133,7 @@ {if $errorType == 'empty'} {lang}wcf.global.form.error.empty{/lang} {else} - {lang}wcf.acp.customOption.validationPattern.error.{@$errorType}{/lang} + {lang}wcf.acp.customOption.validationPattern.error.{$errorType}{/lang} {/if} {/if} diff --git a/wcfsetup/install/files/acp/templates/integerOptionType.tpl b/wcfsetup/install/files/acp/templates/integerOptionType.tpl index 2d17d6300be..f6057143a00 100644 --- a/wcfsetup/install/files/acp/templates/integerOptionType.tpl +++ b/wcfsetup/install/files/acp/templates/integerOptionType.tpl @@ -2,9 +2,9 @@ {/if} -minvalue !== null} min="{$option->minvalue}"{/if}{if $option->maxvalue !== null} max="{$option->maxvalue}"{/if}{if $inputClass} class="{@$inputClass}"{/if}> +minvalue !== null} min="{$option->minvalue}"{/if}{if $option->maxvalue !== null} max="{$option->maxvalue}"{/if}{if $inputClass} class="{$inputClass}"{/if}> {if $option->suffix} - {lang}wcf.acp.option.suffix.{@$option->suffix}{/lang} + {lang}wcf.acp.option.suffix.{$option->suffix}{/lang} -{/if} \ No newline at end of file +{/if} diff --git a/wcfsetup/install/files/acp/templates/multiSelectOptionType.tpl b/wcfsetup/install/files/acp/templates/multiSelectOptionType.tpl index 94bc74071b1..4485783b30c 100644 --- a/wcfsetup/install/files/acp/templates/multiSelectOptionType.tpl +++ b/wcfsetup/install/files/acp/templates/multiSelectOptionType.tpl @@ -1,5 +1,5 @@ - + {foreach from=$selectOptions key=key item=selectOption} - {lang}{@$selectOption}{/lang} + {lang}{unsafe:$selectOption}{/lang} {/foreach} diff --git a/wcfsetup/install/files/acp/templates/multiSelectSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/multiSelectSearchableOptionType.tpl index 9156a224f03..8873f2865de 100644 --- a/wcfsetup/install/files/acp/templates/multiSelectSearchableOptionType.tpl +++ b/wcfsetup/install/files/acp/templates/multiSelectSearchableOptionType.tpl @@ -1,19 +1,18 @@ {lang}wcf.user.option.searchRadioButtonOption{/lang} - + {foreach from=$selectOptions key=key item=selectOption} - {lang}{@$selectOption}{/lang} + {lang}{unsafe:$selectOption}{/lang} {/foreach} diff --git a/wcfsetup/install/files/acp/templates/option.tpl b/wcfsetup/install/files/acp/templates/option.tpl index 3ae99a45740..9694633998d 100644 --- a/wcfsetup/install/files/acp/templates/option.tpl +++ b/wcfsetup/install/files/acp/templates/option.tpl @@ -72,13 +72,13 @@ {foreach from=$optionTree item=categoryLevel1} - {lang}wcf.acp.option.category.{@$categoryLevel1[object]->categoryName}{/lang} + {lang}wcf.acp.option.category.{$categoryLevel1[object]->categoryName}{/lang} {/foreach} {foreach from=$optionTree item=categoryLevel1} - + {if $categoryLevel1[options]|count} {if $categoryLevel1[object]->categoryName === 'module.development'} @@ -93,7 +93,7 @@ {foreach from=$categoryLevel1[categories] item=categoryLevel2} - {lang}wcf.acp.option.category.{@$categoryLevel2[object]->categoryName}{/lang} + {lang}wcf.acp.option.category.{$categoryLevel2[object]->categoryName}{/lang} {hascontent}{content}{lang __optional=true}wcf.acp.option.category.{$categoryLevel2[object]->categoryName}.description{/lang}{/content}{/hascontent} diff --git a/wcfsetup/install/files/acp/templates/optionFieldList.tpl b/wcfsetup/install/files/acp/templates/optionFieldList.tpl index 6f4340f0144..5dd393fb265 100644 --- a/wcfsetup/install/files/acp/templates/optionFieldList.tpl +++ b/wcfsetup/install/files/acp/templates/optionFieldList.tpl @@ -21,8 +21,7 @@ {icon name='shield-halved'} {/if} - - {$langPrefix|concat:$option->optionName|phrase} + {lang}{$langPrefix}{$option->optionName}{/lang} {event name='afterOptionName'} @@ -34,11 +33,11 @@ {if $error == 'empty'} {lang}wcf.global.form.error.empty{/lang} {else} - {lang}{@$langPrefix}error.{$error}{/lang} + {lang}{$langPrefix}error.{$error}{/lang} {/if} {/if} - {lang __optional=true}{@$langPrefix}{$option->optionName}.description{/lang} + {lang __optional=true}{$langPrefix}{$option->optionName}.description{/lang} {/foreach} diff --git a/wcfsetup/install/files/acp/templates/paymentMethodSelectOptionType.tpl b/wcfsetup/install/files/acp/templates/paymentMethodSelectOptionType.tpl index 773bbc14c57..40e18857d8d 100644 --- a/wcfsetup/install/files/acp/templates/paymentMethodSelectOptionType.tpl +++ b/wcfsetup/install/files/acp/templates/paymentMethodSelectOptionType.tpl @@ -1,3 +1,3 @@ {foreach from=$selectOptions key=key item=selectOption} - {lang}{@$selectOption}{/lang} + {lang}{$selectOption}{/lang} {/foreach} diff --git a/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl b/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl index 97ab266d394..c505bf12b44 100644 --- a/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl +++ b/wcfsetup/install/files/acp/templates/radioButtonOptionType.tpl @@ -1,3 +1,3 @@ {foreach from=$selectOptions key=key item=selectOption} - {lang}{@$selectOption}{/lang} + {lang}{$selectOption}{/lang} {/foreach} diff --git a/wcfsetup/install/files/acp/templates/selectOptionType.tpl b/wcfsetup/install/files/acp/templates/selectOptionType.tpl index 60dc8b423da..d1aa73bf38c 100644 --- a/wcfsetup/install/files/acp/templates/selectOptionType.tpl +++ b/wcfsetup/install/files/acp/templates/selectOptionType.tpl @@ -1,6 +1,6 @@ {if !$allowEmptyValue|empty}{lang}wcf.global.noSelection{/lang}{/if} {foreach from=$selectOptions key=key item=selectOption} - {lang}{@$selectOption}{/lang} + {lang}{$selectOption}{/lang} {/foreach} diff --git a/wcfsetup/install/files/acp/templates/selectSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/selectSearchableOptionType.tpl index aa0231557ee..3733050f05e 100644 --- a/wcfsetup/install/files/acp/templates/selectSearchableOptionType.tpl +++ b/wcfsetup/install/files/acp/templates/selectSearchableOptionType.tpl @@ -2,19 +2,18 @@ {if !$allowEmptyValue|empty}{lang}wcf.global.noSelection{/lang}{/if} {foreach from=$selectOptions key=key item=selectOption} - {lang}{@$selectOption}{/lang} + {lang}{$selectOption}{/lang} {/foreach} diff --git a/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl b/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl index 50e1a616df0..ba7a4514d4c 100644 --- a/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl +++ b/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl @@ -1,2 +1,2 @@ - + {include file='shared_multipleLanguageInputJavascript' elementIdentifier=$option->optionName forceSelection=$option->requireI18n} diff --git a/wcfsetup/install/files/acp/templates/textSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/textSearchableOptionType.tpl index a2b935bd15b..e458fbd6e60 100644 --- a/wcfsetup/install/files/acp/templates/textSearchableOptionType.tpl +++ b/wcfsetup/install/files/acp/templates/textSearchableOptionType.tpl @@ -1,27 +1,34 @@ {lang}wcf.user.option.searchTextOption{/lang} - + diff --git a/wcfsetup/install/files/acp/templates/textareaSearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/textareaSearchableOptionType.tpl index 1be0468e541..6c825ea8e70 100644 --- a/wcfsetup/install/files/acp/templates/textareaSearchableOptionType.tpl +++ b/wcfsetup/install/files/acp/templates/textareaSearchableOptionType.tpl @@ -2,14 +2,13 @@ {$value}
{content}{lang __optional=true}wcf.acp.option.category.{$categoryLevel2[object]->categoryName}.description{/lang}{/content}