From: Marcel Werk Date: Wed, 20 Jul 2016 22:56:14 +0000 (+0200) Subject: Moved some language variables from wcf.global to wcf.page (wcf.global doesn't support... X-Git-Tag: 3.0.0_Beta_1~1023 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=31c199ebbf2578ee3986862461157bfe3df309b1;p=GitHub%2FWoltLab%2FWCF.git Moved some language variables from wcf.global to wcf.page (wcf.global doesn't support template scripting) --- diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl index aff8b6dec9..f149194801 100644 --- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl +++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl @@ -71,8 +71,8 @@ requirejs.config({ 'wcf.global.language.noSelection': '{lang}wcf.global.language.noSelection{/lang}', 'wcf.global.loading': '{lang}wcf.global.loading{/lang}', 'wcf.global.noSelection': '{lang}wcf.global.noSelection{/lang}', - 'wcf.global.page.jumpTo': '{lang}wcf.global.page.jumpTo{/lang}', - 'wcf.global.page.jumpTo.description': '{lang}wcf.global.page.jumpTo.description{/lang}', + 'wcf.page.jumpTo': '{lang}wcf.page.jumpTo{/lang}', + 'wcf.page.jumpTo.description': '{lang}wcf.page.jumpTo.description{/lang}', 'wcf.global.page.pagination': '{lang}wcf.global.page.pagination{/lang}', 'wcf.global.page.next': '{capture assign=pageNext}{lang}wcf.global.page.next{/lang}{/capture}{@$pageNext|encodeJS}', 'wcf.global.page.previous': '{capture assign=pagePrevious}{lang}wcf.global.page.previous{/lang}{/capture}{@$pagePrevious|encodeJS}', diff --git a/com.woltlab.wcf/templates/permissionDenied.tpl b/com.woltlab.wcf/templates/permissionDenied.tpl index 827bd56f28..15ef266d92 100644 --- a/com.woltlab.wcf/templates/permissionDenied.tpl +++ b/com.woltlab.wcf/templates/permissionDenied.tpl @@ -1,10 +1,10 @@ -{capture assign='pageTitle'}{lang}wcf.global.error.permissionDenied.title{/lang}{/capture} -{capture assign='contentTitle'}{lang}wcf.global.error.permissionDenied.title{/lang}{/capture} +{capture assign='pageTitle'}{lang}wcf.page.error.permissionDenied.title{/lang}{/capture} +{capture assign='contentTitle'}{lang}wcf.page.error.permissionDenied.title{/lang}{/capture} {include file='header' __disableAds=true}
-

{lang}wcf.global.error.permissionDenied{/lang}

+

{lang}wcf.page.error.permissionDenied{/lang}

{event name='content'} diff --git a/com.woltlab.wcf/templates/redirect.tpl b/com.woltlab.wcf/templates/redirect.tpl index d9b034a939..dd2d4a4b53 100644 --- a/com.woltlab.wcf/templates/redirect.tpl +++ b/com.woltlab.wcf/templates/redirect.tpl @@ -1,4 +1,4 @@ -{capture assign='pageTitle'}{lang}wcf.global.redirect.title{/lang}{/capture} +{capture assign='pageTitle'}{lang}wcf.page.redirect.title{/lang}{/capture} {capture assign='headContent'} @@ -8,7 +8,7 @@

{@$message}

- {lang}wcf.global.redirect.url{/lang} + {lang}wcf.page.redirect.url{/lang}
{include file='footer' __disableAds=true} diff --git a/com.woltlab.wcf/templates/userException.tpl b/com.woltlab.wcf/templates/userException.tpl index 9cbf3959f2..ded43bf579 100644 --- a/com.woltlab.wcf/templates/userException.tpl +++ b/com.woltlab.wcf/templates/userException.tpl @@ -17,7 +17,7 @@ diff --git a/com.woltlab.wcf/templates/userNotice.tpl b/com.woltlab.wcf/templates/userNotice.tpl index 96fb63629d..b06d1aa15a 100644 --- a/com.woltlab.wcf/templates/userNotice.tpl +++ b/com.woltlab.wcf/templates/userNotice.tpl @@ -7,7 +7,7 @@ {/if} {if $__wcf->session->getPermission('admin.configuration.package.canUpdatePackage') && $__wcf->getAvailableUpdates() && SHOW_UPDATE_NOTICE_FRONTEND} -

{lang}wcf.global.availableUpdates{/lang}

+

{lang}wcf.page.availableUpdates{/lang}

{/if} {if $__wcf->user->activationCode && REGISTER_ACTIVATION_METHOD == 1 && $templateName != 'registerActivation'} diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl index b18a63328f..af8e10da04 100644 --- a/wcfsetup/install/files/acp/templates/header.tpl +++ b/wcfsetup/install/files/acp/templates/header.tpl @@ -83,8 +83,8 @@ 'wcf.global.form.error.lessThan': '{lang __literal=true}wcf.global.form.error.lessThan{/lang}', 'wcf.global.loading': '{lang}wcf.global.loading{/lang}', 'wcf.global.noSelection': '{lang}wcf.global.noSelection{/lang}', - 'wcf.global.page.jumpTo': '{lang}wcf.global.page.jumpTo{/lang}', - 'wcf.global.page.jumpTo.description': '{lang}wcf.global.page.jumpTo.description{/lang}', + 'wcf.page.jumpTo': '{lang}wcf.page.jumpTo{/lang}', + 'wcf.page.jumpTo.description': '{lang}wcf.page.jumpTo.description{/lang}', 'wcf.global.page.pagination': '{lang}wcf.global.page.pagination{/lang}', 'wcf.global.page.next': '{capture assign=pageNext}{lang}wcf.global.page.next{/lang}{/capture}{@$pageNext|encodeJS}', 'wcf.global.page.previous': '{capture assign=pagePrevious}{lang}wcf.global.page.previous{/lang}{/capture}{@$pagePrevious|encodeJS}', diff --git a/wcfsetup/install/files/acp/templates/permissionDenied.tpl b/wcfsetup/install/files/acp/templates/permissionDenied.tpl index 4eb787a1c3..250fb231fa 100644 --- a/wcfsetup/install/files/acp/templates/permissionDenied.tpl +++ b/wcfsetup/install/files/acp/templates/permissionDenied.tpl @@ -1,6 +1,6 @@ {include file='header' templateName='permissionDenied' templateNameApplication='wcf'} -

{lang}wcf.global.error.permissionDenied{/lang}

+

{lang}wcf.page.error.permissionDenied{/lang}

{if ENABLE_DEBUG_MODE} - - @@ -2387,11 +2382,6 @@ Fehler sind beispielsweise: - - - - - @@ -2695,6 +2685,16 @@ Fehler sind beispielsweise: getLink()}">{$article->getTitle()}]]> getLink()}">{$category->getTitle()}]]> userID}">{$user->username}]]> + Aktualisierungen für installierte Pakete verfügbar.]]> + + + + + + + + + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 02332c5bcc..a4a81e5245 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -2289,7 +2289,6 @@ Errors are: - updates available for installed packages.]]> @@ -2321,8 +2320,6 @@ Errors are: - - What happened?

@@ -2350,8 +2347,6 @@ Errors are: - - @@ -2366,11 +2361,6 @@ Errors are: - - - - - @@ -2701,6 +2691,16 @@ Errors are: getLink()}">{$article->getTitle()}]]> getLink()}">{$category->getTitle()}]]> userID}">{$user->username}]]> + updates available for installed packages.]]> + + + + + + + + +