X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FQnA%2FQnAPlugin.php;h=ce9353638849aeff74c7f735aa698bf6f494e5f8;hb=861e838adda95bb3b6144ce52468459ca9cb191c;hp=cc70cb7aeb46ed59ebf974e22b0503907bcb3d85;hpb=747748a0faf8cccb780cf8b09941119e0a38cc29;p=quix0rs-gnu-social.git
diff --git a/plugins/QnA/QnAPlugin.php b/plugins/QnA/QnAPlugin.php
index cc70cb7aeb..ce93536388 100644
--- a/plugins/QnA/QnAPlugin.php
+++ b/plugins/QnA/QnAPlugin.php
@@ -167,13 +167,15 @@ class QnAPlugin extends MicroAppPlugin
'author' => 'Zach Copley',
'homepage' => 'http://status.net/wiki/Plugin:QnA',
'description' =>
+ // TRANS: Plugin description.
_m('Question and Answers micro-app.')
);
return true;
}
function appTitle() {
- return _m('Question');
+ // TRANS: Application title.
+ return _m('TITLE','Question');
}
function tag() {
@@ -200,13 +202,15 @@ class QnAPlugin extends MicroAppPlugin
function saveNoticeFromActivity($activity, $actor, $options=array())
{
if (count($activity->objects) != 1) {
- throw new Exception('Too many activity objects.');
+ // TRANS: Exception thrown when there are too many activity objects.
+ throw new Exception(_m('Too many activity objects.'));
}
$questionObj = $activity->objects[0];
- if ($questinoObj->type != QnA_Question::OBJECT_TYPE) {
- throw new Exception('Wrong type for object.');
+ if ($questionObj->type != QnA_Question::OBJECT_TYPE) {
+ // TRANS: Exception thrown when an incorrect object type is encountered.
+ throw new Exception(_m('Wrong type for object.'));
}
$notice = null;
@@ -221,15 +225,17 @@ class QnAPlugin extends MicroAppPlugin
);
break;
case Answer::ObjectType:
- $question = QnA_Question::staticGet('uri', $questionObj->id);
+ $question = QnA_Question::getKV('uri', $questionObj->id);
if (empty($question)) {
// FIXME: save the question
- throw new Exception("Answer to unknown question.");
+ // TRANS: Exception thrown when answering a non-existing question.
+ throw new Exception(_m('Answer to unknown question.'));
}
$notice = QnA_Answer::saveNew($actor, $question, $options);
break;
default:
- throw new Exception("Unknown object type received by QnA Plugin");
+ // TRANS: Exception thrown when an object type is encountered that cannot be handled.
+ throw new Exception(_m('Unknown object type.'));
}
return $notice;
@@ -258,13 +264,15 @@ class QnAPlugin extends MicroAppPlugin
}
if (empty($question)) {
- throw new Exception("Unknown object type.");
+ // TRANS: Exception thrown when an object type is encountered that cannot be handled.
+ throw new Exception(_m('Unknown object type.'));
}
$notice = $question->getNotice();
if (empty($notice)) {
- throw new Exception("Unknown question notice.");
+ // TRANS: Exception thrown when requesting a non-existing question notice.
+ throw new Exception(_m('Unknown question notice.'));
}
$obj = new ActivityObject();
@@ -279,24 +287,6 @@ class QnAPlugin extends MicroAppPlugin
return $obj;
}
- /**
- * Change the verb on Answer notices
- *
- * @param Notice $notice
- *
- * @return ActivityObject
- */
-
- function onEndNoticeAsActivity($notice, &$act) {
- switch ($notice->object_type) {
- case Answer::NORMAL:
- case Answer::ANONYMOUS:
- $act->verb = $notice->object_type;
- break;
- }
- return true;
- }
-
/**
* Output our CSS class for QnA notice list elements
*
@@ -313,9 +303,20 @@ class QnAPlugin extends MicroAppPlugin
{
case QnA_Question::OBJECT_TYPE:
$id = (empty($nli->repeat)) ? $nli->notice->id : $nli->repeat->id;
+ $class = 'hentry notice question';
+ if ($nli->notice->scope != 0 && $nli->notice->scope != 1) {
+ $class .= ' limited-scope';
+ }
+
+ $question = QnA_Question::getKV('uri', $nli->notice->uri);
+
+ if (!empty($question->closed)) {
+ $class .= ' closed';
+ }
+
$nli->out->elementStart(
'li', array(
- 'class' => 'hentry notice question',
+ 'class' => $class,
'id' => 'notice-' . $id
)
);
@@ -327,7 +328,7 @@ class QnAPlugin extends MicroAppPlugin
$cls = array('hentry', 'notice', 'answer');
- $answer = QnA_Answer::staticGet('uri', $notice->uri);
+ $answer = QnA_Answer::getKV('uri', $nli->notice->uri);
if (!empty($answer) && !empty($answer->best)) {
$cls[] = 'best';
@@ -356,7 +357,6 @@ class QnAPlugin extends MicroAppPlugin
* @param Notice $notice
* @param HTMLOutputter $out
*/
-
function showNotice($notice, $out)
{
switch ($notice->object_type) {
@@ -365,12 +365,11 @@ class QnAPlugin extends MicroAppPlugin
case QnA_Answer::OBJECT_TYPE:
return $this->showNoticeAnswer($notice, $out);
default:
- // TRANS: Exception thrown when performing an unexpected action on a question.
- // TRANS: %s is the unpexpected object type.
throw new Exception(
- sprintf(
- _m('Unexpected type for QnA plugin: %s.'),
- $notice->object_type
+ // TRANS: Exception thrown when performing an unexpected action on a question.
+ // TRANS: %s is the unpexpected object type.
+ sprintf(_m('Unexpected type for QnA plugin: %s.'),
+ $notice->object_type
)
);
}
@@ -384,26 +383,17 @@ class QnAPlugin extends MicroAppPlugin
$nli = new NoticeListItem($notice, $out);
$nli->showNotice();
- $out->elementStart('div', array('class' => 'entry-content question-desciption'));
+ $out->elementStart('div', array('class' => 'entry-content question-description'));
$question = QnA_Question::getByNotice($notice);
if (!empty($question)) {
- if (empty($user)) {
- $form = new QnashowquestionForm($out, $question);
- $form->show();
- } else {
- $profile = $user->getProfile();
- $answer = $question->getAnswer($profile);
- if (empty($answer)) {
- $form = new QnanewanswerForm($out, $question);
- $form->show();
- } else {
- $form = new QnashowquestionForm($out, $question);
- $form->show();
- }
- }
+
+ $form = new QnashowquestionForm($out, $question);
+ $form->show();
+
} else {
+ // TRANS: Error message displayed when question data is not present.
$out->text(_m('Question data is missing.'));
}
$out->elementEnd('div');
@@ -412,10 +402,73 @@ class QnAPlugin extends MicroAppPlugin
$out->elementStart('div', array('class' => 'entry-content'));
}
+ /**
+ * Output the HTML for this kind of object in a list
+ *
+ * @param NoticeListItem $nli The list item being shown.
+ *
+ * @return boolean hook value
+ *
+ * @todo FIXME: WARNING WARNING WARNING this closes a 'div' that is implicitly opened in BookmarkPlugin's showNotice implementation
+ */
+ function onStartShowNoticeItem($nli)
+ {
+ if (!$this->isMyNotice($nli->notice)) {
+ return true;
+ }
+
+ $out = $nli->out;
+ $notice = $nli->notice;
+
+ $this->showNotice($notice, $out);
+
+ $nli->showNoticeLink();
+ $nli->showNoticeSource();
+ $nli->showNoticeLocation();
+ $nli->showContext();
+ $nli->showRepeat();
+
+ $out->elementEnd('div');
+
+ $nli->showNoticeOptions();
+
+ if ($notice->object_type == QnA_Question::OBJECT_TYPE) {
+ $user = common_current_user();
+ $question = QnA_Question::getByNotice($notice);
+
+ if (!empty($user)) {
+ $profile = $user->getProfile();
+ $answer = $question->getAnswer($profile);
+
+ // Output a placeholder input -- clicking on it will
+ // bring up a real answer form
+
+ // NOTE: this whole ul is just a placeholder
+ if (empty($question->closed) && empty($answer)) {
+ $out->elementStart('ul', 'notices qna-dummy');
+ $out->elementStart('li', 'qna-dummy-placeholder');
+ $out->element(
+ 'input',
+ array(
+ 'class' => 'placeholder',
+ // TRANS: Placeholder value for a possible answer to a question
+ // TRANS: by the logged in user.
+ 'value' => _m('Your answer...')
+ )
+ );
+ $out->elementEnd('li');
+ $out->elementEnd('ul');
+ }
+ }
+ }
+
+ return false;
+ }
+
function showNoticeAnswer($notice, $out)
{
$user = common_current_user();
-
+
$answer = QnA_Answer::getByNotice($notice);
$question = $answer->getQuestion();
@@ -428,12 +481,13 @@ class QnAPlugin extends MicroAppPlugin
$form = new QnashowanswerForm($out, $answer);
$form->show();
} else {
+ // TRANS: Error message displayed when answer data is not present.
$out->text(_m('Answer data is missing.'));
}
$out->elementEnd('div');
- // @fixme
+ // @todo FIXME
$out->elementStart('div', array('class' => 'entry-content'));
}
@@ -444,12 +498,15 @@ class QnAPlugin extends MicroAppPlugin
if (Notice::contentTooLong($content)) {
common_debug("content too long");
$max = Notice::maxContent();
+ // TRANS: Link description for link to full notice text if it is longer than
+ // TRANS: what will be dispplayed.
+ $ellipsis = _m('â¦');
$short = mb_substr($content, 0, $max - 1);
- $short .= sprintf(
- 'â¦',
- $notice->uri,
- _m('more')
- );
+ $short .= sprintf('%3$s',
+ $notice->uri,
+ // TRANS: Title for link that is an ellipsis in English.
+ _m('more...'),
+ $ellipsis);
} else {
$short = $content;
}
@@ -463,7 +520,6 @@ class QnAPlugin extends MicroAppPlugin
* @param HTMLOutputter $out
* @return Widget
*/
-
function entryForm($out)
{
return new QnanewquestionForm($out);
@@ -474,7 +530,6 @@ class QnAPlugin extends MicroAppPlugin
*
* @param Notice $notice
*/
-
function deleteRelated($notice)
{
switch ($notice->object_type) {
@@ -496,7 +551,8 @@ class QnAPlugin extends MicroAppPlugin
function onEndShowScripts($action)
{
- // XXX maybe some cool shiz here
+ $action->script($this->path('js/qna.js'));
+ return true;
}
function onEndShowStyles($action)