From dca8d159be5e651d185fae912369550a240433ab Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Tue, 21 Jun 2016 14:12:21 +0200 Subject: [PATCH] Added (some) missing language variables --- com.woltlab.wcf/templates/article.tpl | 2 +- .../templates/moderationActivation.tpl | 2 +- com.woltlab.wcf/templates/moderationList.tpl | 2 +- .../templates/moderationReport.tpl | 2 +- .../files/acp/templates/articleAdd.tpl | 6 +-- .../files/acp/templates/articleAddDialog.tpl | 6 ++- .../files/acp/templates/articleList.tpl | 12 +++--- wcfsetup/install/lang/de.xml | 37 +++++++++++++++++-- wcfsetup/install/lang/en.xml | 37 +++++++++++++++++-- 9 files changed, 84 insertions(+), 22 deletions(-) diff --git a/com.woltlab.wcf/templates/article.tpl b/com.woltlab.wcf/templates/article.tpl index b7629cdfca..26573f078d 100644 --- a/com.woltlab.wcf/templates/article.tpl +++ b/com.woltlab.wcf/templates/article.tpl @@ -273,7 +273,7 @@ {if $article->enableComments} {if $commentList|count || $commentCanAdd}
-

{lang}wcf.article.comments{/lang}{if $article->comments} {#$article->comments}{/if}

+

{lang}wcf.global.comments{/lang}{if $article->comments} {#$article->comments}{/if}

{include file='__commentJavaScript' commentContainerID='articleCommentList'} diff --git a/com.woltlab.wcf/templates/moderationActivation.tpl b/com.woltlab.wcf/templates/moderationActivation.tpl index b626faa313..07d4f2fc65 100644 --- a/com.woltlab.wcf/templates/moderationActivation.tpl +++ b/com.woltlab.wcf/templates/moderationActivation.tpl @@ -66,7 +66,7 @@
-

{lang}wcf.moderation.comments{/lang} {#$queue->comments}

+

{lang}wcf.global.comments{/lang} {#$queue->comments}

{lang}wcf.moderation.comments.description{/lang}

diff --git a/com.woltlab.wcf/templates/moderationList.tpl b/com.woltlab.wcf/templates/moderationList.tpl index 673fd91e3d..f27cb37eea 100644 --- a/com.woltlab.wcf/templates/moderationList.tpl +++ b/com.woltlab.wcf/templates/moderationList.tpl @@ -66,7 +66,7 @@ {lang}wcf.moderation.title{/lang} {lang}wcf.moderation.assignedUser{/lang} - {lang}wcf.moderation.comments{/lang} + {lang}wcf.global.comments{/lang} {lang}wcf.moderation.lastChangeTime{/lang} {event name='columnHeads'} diff --git a/com.woltlab.wcf/templates/moderationReport.tpl b/com.woltlab.wcf/templates/moderationReport.tpl index b008d52025..bb7c5ae699 100644 --- a/com.woltlab.wcf/templates/moderationReport.tpl +++ b/com.woltlab.wcf/templates/moderationReport.tpl @@ -95,7 +95,7 @@
-

{lang}wcf.moderation.comments{/lang} {#$queue->comments}

+

{lang}wcf.global.comments{/lang} {#$queue->comments}

{lang}wcf.moderation.comments.description{/lang}

diff --git a/wcfsetup/install/files/acp/templates/articleAdd.tpl b/wcfsetup/install/files/acp/templates/articleAdd.tpl index 3118afc53c..003bf0b319 100644 --- a/wcfsetup/install/files/acp/templates/articleAdd.tpl +++ b/wcfsetup/install/files/acp/templates/articleAdd.tpl @@ -101,7 +101,7 @@ -
+
{if $errorField == 'time'} @@ -177,7 +177,7 @@ {/if} -
+
{if $errorField == 'title'} @@ -291,7 +291,7 @@ {/if} languageID} class="formError"{/if}> -
+
{if $errorField == 'title'|concat:$availableLanguage->languageID} diff --git a/wcfsetup/install/files/acp/templates/articleAddDialog.tpl b/wcfsetup/install/files/acp/templates/articleAddDialog.tpl index 20d7d18183..d819455c19 100644 --- a/wcfsetup/install/files/acp/templates/articleAddDialog.tpl +++ b/wcfsetup/install/files/acp/templates/articleAddDialog.tpl @@ -16,7 +16,11 @@