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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
Z>*P6!1@W#_3-eQ-;~%K~qHBX@{{!RLs38CV

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>