From c7c1e0c59bae111eba3b498b93204bc8218ab155 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 9 Jun 2013 23:56:06 +0200
Subject: [PATCH] Small moderation improvement

---
 com.woltlab.wcf/templates/moderationList.tpl          |  2 +-
 .../queue/ViewableModerationQueue.class.php           | 11 +++++++++++
 wcfsetup/install/lang/de.xml                          |  2 ++
 wcfsetup/install/lang/en.xml                          |  2 ++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/com.woltlab.wcf/templates/moderationList.tpl b/com.woltlab.wcf/templates/moderationList.tpl
index 79032e9463..46cd1c1f3d 100644
--- a/com.woltlab.wcf/templates/moderationList.tpl
+++ b/com.woltlab.wcf/templates/moderationList.tpl
@@ -107,7 +107,7 @@
 								<span class="badge label">{lang}wcf.moderation.type.{@$definitionNames[$entry->objectTypeID]}{/lang}</span>
 								<a href="{$entry->getLink()}" class="messageGroupLink">{$entry->getTitle()}</a>
 							</h3>
-							<small>{if $entry->getAffectedObject()->getUserID()}<a href="{link controller='User' id=$entry->getAffectedObject()->getUserID()}{/link}" class="userLink" data-user-id="{@$entry->userID}">{$entry->getAffectedObject()->getUsername()}</a>{else}{$entry->getAffectedObject()->getUsername()}{/if} - {@$entry->getAffectedObject()->getTime()|time}</small>	
+							<small>{if $entry->getAffectedObject()->getUserID()}<a href="{link controller='User' id=$entry->getAffectedObject()->getUserID()}{/link}" class="userLink" data-user-id="{@$entry->userID}">{$entry->getAffectedObject()->getUsername()}</a>{else}{$entry->getAffectedObject()->getUsername()}{/if} - {@$entry->getAffectedObject()->getTime()|time} - {lang}wcf.moderation.type.{@$entry->getObjectTypeName()}{/lang}</small>	
 						</td>
 						<td class="columnText columnAssignedUserID">{if $entry->assignedUserID}<a href="{link controller='User' id=$entry->assignedUserID}{/link}" class="userLink" data-user-id="{@$entry->assignedUserID}">{$entry->assignedUsername}</a>{/if}</td>
 						<td class="columnDate columnLastChangeTime">{if $entry->lastChangeTime}{@$entry->lastChangeTime|time}{/if}</td>
diff --git a/wcfsetup/install/files/lib/data/moderation/queue/ViewableModerationQueue.class.php b/wcfsetup/install/files/lib/data/moderation/queue/ViewableModerationQueue.class.php
index a48cea9d35..eb61a1dbe8 100644
--- a/wcfsetup/install/files/lib/data/moderation/queue/ViewableModerationQueue.class.php
+++ b/wcfsetup/install/files/lib/data/moderation/queue/ViewableModerationQueue.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\data\moderation\queue;
+use wcf\data\object\type\ObjectTypeCache;
 use wcf\data\user\User;
 use wcf\data\user\UserProfile;
 use wcf\data\DatabaseObjectDecorator;
@@ -152,4 +153,14 @@ class ViewableModerationQueue extends DatabaseObjectDecorator {
 	public function getFormattedMessage() {
 		return nl2br(htmlspecialchars($this->message));
 	}
+	
+	/**
+	 * Returns the object type name.
+	 * 
+	 * @return	string
+	 */
+	public function getObjectTypeName() {
+		$objectType = ObjectTypeCache::getInstance()->getObjectType($this->objectTypeID);
+		return $objectType->objectType;
+	}
 }
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index e8548a30b0..eebcff82bd 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1699,6 +1699,8 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getAllowedExtensions()
 		<item name="wcf.moderation.type.all"><![CDATA[Alle Einträge]]></item>
 		<item name="wcf.moderation.type.com.woltlab.wcf.moderation.activation"><![CDATA[Freischaltung]]></item>
 		<item name="wcf.moderation.type.com.woltlab.wcf.moderation.report"><![CDATA[Meldung]]></item>
+		<item name="wcf.moderation.type.com.woltlab.wcf.comment.comment"><![CDATA[Kommentar]]></item>
+		<item name="wcf.moderation.type.com.woltlab.wcf.comment.response"><![CDATA[Antwort auf Kommentar]]></item>
 		<item name="wcf.moderation.showAll"><![CDATA[Alle Einträge anzeigen]]></item>
 	</category>
 	
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 685aaa30d7..3c396feb00 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1698,6 +1698,8 @@ Allowed extensions: {', '|implode:$attachmentHandler->getAllowedExtensions()}]]>
 		<item name="wcf.moderation.type.all"><![CDATA[All Items]]></item>
 		<item name="wcf.moderation.type.com.woltlab.wcf.moderation.activation"><![CDATA[Approval]]></item>
 		<item name="wcf.moderation.type.com.woltlab.wcf.moderation.report"><![CDATA[Report]]></item>
+		<item name="wcf.moderation.type.com.woltlab.wcf.comment.comment"><![CDATA[Comment]]></item>
+		<item name="wcf.moderation.type.com.woltlab.wcf.comment.response"><![CDATA[Comment Reply]]></item>
 		<item name="wcf.moderation.showAll"><![CDATA[Show All Items]]></item>
 	</category>
 	
-- 
2.20.1