coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

Questtype ?submit?: do not show name of user who approved Character submission to users (Issue #190)

Browse source
This commit is contained in:
coderkun 2014-05-01 21:13:17 +02:00
commit dc176243a6
4 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
locale/de_DE/LC_MESSAGES/The Legend of Z.mo
View file

Binary file not shown.

17
locale/de_DE/LC_MESSAGES/The Legend of Z.po
View file

@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: The Legend of Z\n" "Project-Id-Version: The Legend of Z\n"
"POT-Creation-Date: 2014-05-01 14:29+0100\n" "POT-Creation-Date: 2014-05-01 21:12+0100\n"
"PO-Revision-Date: 2014-05-01 14:29+0100\n" "PO-Revision-Date: 2014-05-01 21:12+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: de_DE\n" "Language: de_DE\n"
@ -87,6 +87,7 @@ msgid "Past submissions"
msgstr "Vorherige Lösungen" msgstr "Vorherige Lösungen"
#: questtypes/submit/html/quest.tpl:33 questtypes/submit/html/submission.tpl:6 #: questtypes/submit/html/quest.tpl:33 questtypes/submit/html/submission.tpl:6
#: views/html/quests/submissions.tpl:15
#, php-format #, php-format
msgid "submitted at %s on %s h" msgid "submitted at %s on %s h"
msgstr "eingereicht am %s um %s Uhr" 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" msgstr "Die Lösung wartet auf Bewertung"
#: questtypes/submit/html/quest.tpl:42 #: 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 #: questtypes/submit/html/submission.tpl:12
#, php-format #, php-format
msgid "Comment from %s on %s at %s" msgid "Approved by %s on %s at %s"
msgstr "Kommentar von %s am %s um %s Uhr" msgstr "Bewertet von %s am %s um %s Uhr"
#: questtypes/submit/html/submission.tpl:27 #: questtypes/submit/html/submission.tpl:27
msgid "Comment" msgid "Comment"
msgstr "Kommentar" msgstr "Kommentar"
#: questtypes/submit/html/submission.tpl:30 views/html/quests/quest.tpl:45 #: 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" msgid "solved"
msgstr "Richtig!" msgstr "Richtig!"
#: questtypes/submit/html/submission.tpl:31 views/html/quests/quest.tpl:50 #: 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" msgid "unsolved"
msgstr "Leider falsch!" msgstr "Leider falsch!"

8
questtypes/submit/html/quest.tpl
View file

@ -27,11 +27,11 @@
<?php if(count($submissions) > 0) : ?> <?php if(count($submissions) > 0) : ?>
<h2><?=_('Past submissions')?></h2> <h2><?=_('Past submissions')?></h2>
<ol> <ol>
<?php foreach($submissions as &$submission) : ?> <?php foreach($submissions as $index => &$submission) : ?>
<li> <li>
<a href="<?=$linker->link(array('uploads','seminary',$seminary['url'], $submission['upload']['url']))?>"><?=$submission['upload']['name']?></a><br /> <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 /> <?=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')?> <?=_('This submission is waiting for approval')?>
<?php endif ?> <?php endif ?>
<?php if(count($submission['comments']) > 0) : ?> <?php if(count($submission['comments']) > 0) : ?>
@ -39,9 +39,11 @@
<?php foreach($submission['comments'] as &$comment) : ?> <?php foreach($submission['comments'] as &$comment) : ?>
<li> <li>
<?php if(array_key_exists('user', $comment) && array_key_exists('character', $comment['user'])) : ?> <?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 endif ?>
<?php if(!empty($comment['comment'])) : ?>
<?=\hhu\z\Utils::t($comment['comment'])?> <?=\hhu\z\Utils::t($comment['comment'])?>
<?php endif ?>
</li> </li>
<?php endforeach ?> <?php endforeach ?>
</ol> </ol>

2
questtypes/submit/html/submission.tpl
View file

@ -9,7 +9,7 @@
<?php foreach($submission['comments'] as &$comment) : ?> <?php foreach($submission['comments'] as &$comment) : ?>
<li> <li>
<?php if(array_key_exists('user', $comment) && array_key_exists('character', $comment['user'])) : ?> <?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 ?> <?php endif ?>
<p><?=\hhu\z\Utils::t($comment['comment'])?></p> <p><?=\hhu\z\Utils::t($comment['comment'])?></p>
</li> </li>