From 31370f3c5bb8c23c804cc54a3c62567d03be424d Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@users.noreply.github.com>
Date: Thu, 1 May 2014 21:13:17 +0200
Subject: [PATCH] Questtype ?submit?: do not show name of user who approved
 Character submission to users (Issue #190)

---
 locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 13505 -> 13565 bytes
 locale/de_DE/LC_MESSAGES/The Legend of Z.po |  17 +++++++++++------
 questtypes/submit/html/quest.tpl            |   8 +++++---
 questtypes/submit/html/submission.tpl       |   2 +-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo
index 0a8a37e0735940506bd501ab5021d1ae79dc8dae..85a73a5b2e1caa065f5b7c625d9d771e2e2ec7f5 100644
GIT binary patch
delta 4601
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

delta 4539
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
YtTnMnp$w`EY(goR49(d5Q-wtU0OQ!GApigX

diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.po b/locale/de_DE/LC_MESSAGES/The Legend of Z.po
index bda0044d..6d5b9788 100644
--- a/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
+++ b/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Legend of Z\n"
-"POT-Creation-Date: 2014-05-01 14:29+0100\n"
-"PO-Revision-Date: 2014-05-01 14:29+0100\n"
+"POT-Creation-Date: 2014-05-01 21:12+0100\n"
+"PO-Revision-Date: 2014-05-01 21:12+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -87,6 +87,7 @@ msgid "Past submissions"
 msgstr "Vorherige Lösungen"
 
 #: questtypes/submit/html/quest.tpl:33 questtypes/submit/html/submission.tpl:6
+#: views/html/quests/submissions.tpl:15
 #, php-format
 msgid "submitted at %s on %s h"
 msgstr "eingereicht am %s um %s Uhr"
@@ -96,22 +97,26 @@ msgid "This submission is waiting for approval"
 msgstr "Die Lösung wartet auf Bewertung"
 
 #: questtypes/submit/html/quest.tpl:42
+#, php-format
+msgid "Approved on %s at %s"
+msgstr "Bewertet am %s um %s Uhr"
+
 #: questtypes/submit/html/submission.tpl:12
 #, php-format
-msgid "Comment from %s on %s at %s"
-msgstr "Kommentar von %s am %s um %s Uhr"
+msgid "Approved by %s on %s at %s"
+msgstr "Bewertet von %s am %s um %s Uhr"
 
 #: questtypes/submit/html/submission.tpl:27
 msgid "Comment"
 msgstr "Kommentar"
 
 #: questtypes/submit/html/submission.tpl:30 views/html/quests/quest.tpl:45
-#: views/html/quests/submissions.tpl:28
+#: views/html/quests/submissions.tpl:29
 msgid "solved"
 msgstr "Richtig!"
 
 #: questtypes/submit/html/submission.tpl:31 views/html/quests/quest.tpl:50
-#: views/html/quests/submissions.tpl:19
+#: views/html/quests/submissions.tpl:20
 msgid "unsolved"
 msgstr "Leider falsch!"
 
diff --git a/questtypes/submit/html/quest.tpl b/questtypes/submit/html/quest.tpl
index 6c5de4ba..d8b6b992 100644
--- a/questtypes/submit/html/quest.tpl
+++ b/questtypes/submit/html/quest.tpl
@@ -27,11 +27,11 @@
 <?php if(count($submissions) > 0) : ?>
 <h2><?=_('Past submissions')?></h2>
 <ol>
-	<?php foreach($submissions as &$submission) : ?>
+	<?php foreach($submissions as $index => &$submission) : ?>
 	<li>
 		<a href="<?=$linker->link(array('uploads','seminary',$seminary['url'], $submission['upload']['url']))?>"><?=$submission['upload']['name']?></a><br />
 		<?=sprintf(_('submitted at %s on %s h'), $dateFormatter->format(new \DateTime($submission['created'])), $timeFormatter->format(new \DateTime($submission['created'])))?><br />
-		<?php if($lastStatus['status'] == 1) : ?>
+		<?php if($lastStatus['status'] == 1 && $index > 0) : ?>
 		<?=_('This submission is waiting for approval')?>
 		<?php endif ?>
 		<?php if(count($submission['comments']) >  0) : ?>
@@ -39,9 +39,11 @@
 			<?php foreach($submission['comments'] as &$comment) : ?>
 			<li>
 				<?php if(array_key_exists('user', $comment) && array_key_exists('character', $comment['user'])) : ?>
-				<?=sprintf(_('Comment from %s on %s at %s'), $comment['user']['character']['name'], $dateFormatter->format(new \DateTime($comment['created'])), $timeFormatter->format(new \DateTime($comment['created'])))?>:<br />
+				<p class="fwb"><?=sprintf(_('Approved on %s at %s'), $dateFormatter->format(new \DateTime($comment['created'])), $timeFormatter->format(new \DateTime($comment['created'])))?></p>
 				<?php endif ?>
+				<?php if(!empty($comment['comment'])) : ?>
 				<?=\hhu\z\Utils::t($comment['comment'])?>
+				<?php endif ?>
 			</li>
 			<?php endforeach ?>
 		</ol>
diff --git a/questtypes/submit/html/submission.tpl b/questtypes/submit/html/submission.tpl
index da978a66..e985f56e 100644
--- a/questtypes/submit/html/submission.tpl
+++ b/questtypes/submit/html/submission.tpl
@@ -9,7 +9,7 @@
 			<?php foreach($submission['comments'] as &$comment) : ?>
 			<li>
 				<?php if(array_key_exists('user', $comment) && array_key_exists('character', $comment['user'])) : ?>
-				<p class="fwb"><?=sprintf(_('Comment from %s on %s at %s'), $comment['user']['character']['name'], $dateFormatter->format(new \DateTime($comment['created'])), $timeFormatter->format(new \DateTime($comment['created'])))?>:</p>
+				<p class="fwb"><?=sprintf(_('Approved by %s on %s at %s'), $comment['user']['character']['name'], $dateFormatter->format(new \DateTime($comment['created'])), $timeFormatter->format(new \DateTime($comment['created'])))?></p>
 				<?php endif ?>
 				<p><?=\hhu\z\Utils::t($comment['comment'])?></p>
 			</li>