From: Marcel Werk Date: Sun, 16 Jun 2013 15:16:07 +0000 (+0200) Subject: Added warning for disabled js X-Git-Tag: 2.0.0_Beta_4~34^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=200ca5e1eb1d6945696170eeb3ca8dd9dbbe8ad5;p=GitHub%2FWoltLab%2FWCF.git Added warning for disabled js --- diff --git a/com.woltlab.wcf/templates/userNotice.tpl b/com.woltlab.wcf/templates/userNotice.tpl index ff65074fad..2e4e9ac9f0 100644 --- a/com.woltlab.wcf/templates/userNotice.tpl +++ b/com.woltlab.wcf/templates/userNotice.tpl @@ -6,6 +6,10 @@ {/if} + + {if $__wcf->user->activationCode && REGISTER_ACTIVATION_METHOD == 1}

{lang}wcf.user.register.needActivation{/lang}

{/if} diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 73c3e3bdc4..a1ba00617d 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -1737,6 +1737,7 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getAllowedExtensions() + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 5c7f4874a8..35dec274db 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -1736,6 +1736,7 @@ Allowed extensions: {', '|implode:$attachmentHandler->getAllowedExtensions()}]]> +