Changes according to mantis bug report #16268

ILIAS-eLearning · Jul 28, 2015 · 4c37b7f · 4c37b7f
1 parent 6dc5178
commit 4c37b7f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/Modules/Forum/classes/class.ilObjForumGUI.php b/Modules/Forum/classes/class.ilObjForumGUI.php
@@ -2214,10 +2214,12 @@ public function viewThreadObject()
 				if(($_POST['confirm'] != '' || $_POST['no_cs_change'] != '') && $_GET['action'] == 'ready_censor')
 				{
 					$frm->postCensorship($this->handleFormInput($_POST['formData']['cens_message']), $this->objCurrentPost->getId(), 1);
+					ilUtil::sendSuccess($this->lng->txt('frm_censorship_applied'));
 				}
 				else if(($_POST['cancel'] != '' || $_POST['yes_cs_change'] != '') && $_GET['action'] == 'ready_censor')
 				{
 					$frm->postCensorship($this->handleFormInput($_POST['formData']['cens_message']), $this->objCurrentPost->getId());
+					ilUtil::sendSuccess($this->lng->txt('frm_censorship_revoked'));
 				}
 			}
 
@@ -2530,8 +2532,15 @@ public function viewThreadObject()
 								$this->ctrl->setParameter($this, 'thr_pk', $node->getThreadId());
 								$this->ctrl->setParameter($this, 'offset', $Start);
 								$this->ctrl->setParameter($this, 'orderby', $_GET['orderby']);									
-								$tpl->setVariable('COMMANDS_COMMAND', $this->ctrl->getLinkTarget($this, 'viewThread', $node->getId()));							
-								$tpl->setVariable('COMMANDS_TXT', $lng->txt('censorship'));
+								$tpl->setVariable('COMMANDS_COMMAND', $this->ctrl->getLinkTarget($this, 'viewThread', $node->getId()));
+								if($node->isCensored())
+								{
+									$tpl->setVariable('COMMANDS_TXT', $lng->txt('frm_revoke_censorship'));
+								}
+								else
+								{
+									$tpl->setVariable('COMMANDS_TXT', $lng->txt('frm_censorship'));
+								}
 								$this->ctrl->clearParameters($this);
 								$tpl->parseCurrentBlock();
 
@@ -2562,7 +2571,7 @@ public function viewThreadObject()
 								$this->ctrl->setParameter($this, 'orderby', $_GET['orderby']);
 								$this->ctrl->setParameter($this, 'viewmode', $_SESSION['viewmode']);
 								$tpl->setVariable('COMMANDS_COMMAND', $this->ctrl->getLinkTarget($this, 'markPostRead', $node->getId()));
-								$tpl->setVariable('COMMANDS_TXT', $lng->txt('is_read'));
+								$tpl->setVariable('COMMANDS_TXT', $lng->txt('frm_mark_as_read'));
 								$this->ctrl->clearParameters($this);
 								$tpl->parseCurrentBlock();
 							}
@@ -2578,7 +2587,7 @@ public function viewThreadObject()
 								$this->ctrl->setParameter($this, 'orderby', $_GET['orderby']);
 								$this->ctrl->setParameter($this, 'viewmode', $_SESSION['viewmode']);
 								$tpl->setVariable('COMMANDS_COMMAND', $this->ctrl->getLinkTarget($this, 'markPostUnread', $node->getId()));
-								$tpl->setVariable('COMMANDS_TXT', $lng->txt('unread'));
+								$tpl->setVariable('COMMANDS_TXT', $lng->txt('frm_mark_as_unread'));
 								$this->ctrl->clearParameters($this);
 								$tpl->parseCurrentBlock();
 							}

diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
@@ -15244,4 +15244,10 @@ wiki#:#wiki_unhide_meta_adv_records#:#Zusätzliche Eigenschaften anzeigen
 content#:#cont_wiki_link_dialog#:#Link zu einer Wikiseite (Dialog)
 link#:#link_link#:#Link
 common#:#msg_copy_clipboard_source#:#Now, please select the desired course, whose content should be copied and click the button ‘Next’.###25 06 2015 new variable
-prtt#:#prtt_portfolio_created#:#Portfoliovorlage wurde hinzugefügt
+prtt#:#prtt_portfolio_created#:#Portfoliovorlage wurde hinzugefügt
+forum#:#frm_censorship#:#Zensieren
+forum#:#frm_revoke_censorship#:#Zensur aufheben
+forum#:#frm_censorship_applied#:#Der Beitrag wurde erfolgreich zensiert.
+forum#:#frm_censorship_revoked#:#Die Zensur für den Beitrag wurde aufgehoben.
+forum#:#frm_mark_as_read#:#Als gelesen markieren
+forum#:#frm_mark_as_unread#:#Als ungelesen markieren
diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
@@ -15244,4 +15244,10 @@ cron#:#cron_result_status_fail#:#Failed
 wiki#:#wiki_unhide_meta_adv_records#:#Show additional properties
 content#:#cont_wiki_link_dialog#:#Link to Wiki Page (Dialog)
 link#:#link_link#:#Link
-prtt#:#prtt_portfolio_created#:#Portfolio Template added
+prtt#:#prtt_portfolio_created#:#Portfolio Template added
+forum#:#frm_censorship#:#Censor
+forum#:#frm_revoke_censorship#:#Revoke Censorship
+forum#:#frm_censorship_applied#:#The censorship has been successfully applied.
+forum#:#frm_censorship_revoked#:#The censorship has been successfully revoked.
+forum#:#frm_mark_as_read#:#Mark as read
+forum#:#frm_mark_as_unread#:#Mark as unread