diff --git a/lib/Lampcms/Forms/Answerform.php b/lib/Lampcms/Forms/Answerform.php index 03da2ef..fee7ea8 100644 --- a/lib/Lampcms/Forms/Answerform.php +++ b/lib/Lampcms/Forms/Answerform.php @@ -120,16 +120,16 @@ public function getAnswerForm(\Lampcms\Question $Question){ d('cp'); - $formTitle = (0 === $Question['i_ans']) ? $this->Tr['Be the first to answer this question'] : $this->Tr['Your answer'] ; + $formTitle = (0 === $Question['i_ans']) ? $this->Tr['Be the first to post to this topic'] : $this->Tr['Your post'] ; $this->setVar('title', $formTitle); $this->setVar('qid', $Question['_id']); - $this->setVar('submit', $this->Tr['Submit answer']); + $this->setVar('submit', $this->Tr['Submit post']); $this->setVar('preview', $this->Tr['Preview']); if($this->Registry->Viewer->isGuest()){ d('cp'); - $this->qbody = $this->_('Please login to post your answer'); + $this->qbody = $this->_('Please login to post '); $this->com_hand = ' com_hand'; $this->readonly = 'readonly="readonly"'; $this->disabled = ' disabled="disabled"'; @@ -173,11 +173,11 @@ protected function doValidate(){ $len = $oHtmlString->length(); if($len < $minChars){ - $this->setError('qbody', 'Answer must contain at least '.$minChars.' letters'); + $this->setError('qbody', 'Topic must contain at least '.$minChars.' letters'); } if($wordCount < $minWords){ - $this->setError('qbody', 'Answer must contain at least '.$minWords.' words'); + $this->setError('qbody', 'Topic must contain at least '.$minWords.' words'); } return $this; diff --git a/lib/Lampcms/QuestionInfo.php b/lib/Lampcms/QuestionInfo.php index 751b93b..36354d8 100644 --- a/lib/Lampcms/QuestionInfo.php +++ b/lib/Lampcms/QuestionInfo.php @@ -82,7 +82,7 @@ public function getHtml(Question $Question){ * @todo translate Title string */ $tagsBlock = \tplBoxrecent::parse(array( - 'title' => $Tr['Question tags'], + 'title' => $Tr['Topic tags'], 'id' => 'question_tags', $this->getTags()), false); @@ -99,9 +99,9 @@ public function getHtml(Question $Question){ 'updated' => TimeAgo::format(new \DateTime(date('r', $Question['i_lm_ts']))).' ago', 'views' => $this->Question['i_views'], 'ans_count' => $this->Question->getAnswerCount(), - 'asked_label' => $Tr['Asked'], + 'asked_label' => $Tr['Posted'], 'updated_label' => $Tr['Last updated'], - 'ans_count_label' => $Tr['Number of Answers'], + 'ans_count_label' => $Tr['Number of posts'], 'views_label' => $Tr['Number of Views'] ) ); diff --git a/lib/Lampcms/ShowFollowers.php b/lib/Lampcms/ShowFollowers.php index 571736f..d66f6e6 100644 --- a/lib/Lampcms/ShowFollowers.php +++ b/lib/Lampcms/ShowFollowers.php @@ -147,7 +147,7 @@ public function getQuestionFollowers(array $aUids, $total = null){ */ $title = $total.' '; $title .= (1 === $total) ? 'person' : 'people'; - $title .= ' following this question'; + $title .= ' following this topic'; d('followers title: '.$title);