jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331905 )
Change subject: Fix extension Reflect failing tests ...................................................................... Fix extension Reflect failing tests Extension Reflect failing tests due to missing apihelp actions. Bug: T155036 Change-Id: Ic14a8aca067f5113a4d5af5b3e23957176e8f1fd --- M i18n/en.json M i18n/qqq.json M server/api/ApiReflectAction.php M server/api/ApiReflectStudyAction.php 4 files changed, 54 insertions(+), 45 deletions(-) Approvals: Paladox: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 74bb2c9..ef51463 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -5,8 +5,33 @@ ] }, "reflect-desc": "Augmentation of threaded comments", - "reflect-bulleted": "Hi $1,\n\t\n$2 has summarized a point that you made in the thread \"$3\". \n\nTheir summary: \"$5\".\n\nYou can verify whether $2 got your point right by visiting <$4>. \n\nYou will be able to clarify your point if there is a misunderstanding.", + "reflect-bulleted": "Hi $1,\n\t\n$2 has summarized a point that you made in the thread \"$3\". \n\nTheir summary: \"$5\".\n\nYou can verify whether $2 got your point right by visiting <$4>. \n\nYou will be able to clarify your point if there is a misunderstanding", "reflect-bulleted-subject": "[{{SITENAME}}] Your point was summarized by $2", - "reflect-responded": "Hi $1, \n\t\n$2 has responded to your summary of a point that they made.\n\nThe summary you left: \"$6\". \nTheir message: \"$5\".\n\nIf you want to read the response in context, visit <$4>.", - "reflect-responded-subject": "[{{SITENAME}}] $2 has responded to your summary bullet point" + "reflect-responded": "Hi $1, \n\t\n$2 has responded to your summary of a point that they made.\n\nThe summary you left: \"$6\". \nTheir message: \"$5\".\n\nIf you want to read the response in context, visit <$4>", + "reflect-responded-subject": "[{{SITENAME}}] $2 has responded to your summary bullet point", + "apihelp-reflectaction-description": "Enables Reflect on posts in Liquid-Threaded discussions", + "apihelp-reflectaction-param-reflectaction": "The action to take", + "apihelp-reflectaction-param-token": "An edit token (from ?action=query&prop=info&intoken=edit)", + "apihelp-reflectaction-param-delete": "Whether this post is a delete request", + "apihelp-reflectaction-param-comment_id": "The id of the relevant thread", + "apihelp-reflectaction-param-bullet_id": "For modifying existing bullets. Don't set if posting new bullet", + "apihelp-reflectaction-param-response": "Set to true if the post is posting a response", + "apihelp-reflectaction-param-response_id": "For modifying existing response. Don't set if posting new response", + "apihelp-reflectaction-param-text": "The text relevant to the action", + "apihelp-reflectaction-param-user": "The user who took the action. We actually ignore this and use $wgUser instead", + "apihelp-reflectaction-param-highlights": "For posting a bullet. An array of element ids corresponding to the highlighted elements of the comment", + "apihelp-reflectaction-param-signal": "For responses. ID of response to question about whether the commenter thinks the bullet is accurate", + "apihelp-reflectaction-param-comments": "For initial GET request. List of ids of all the threads on the current page", + "apihelp-reflectaction-param-bullet_rev": "The revision of the bullet to take action on", + "apihelp-reflectaction-param-response_rev": "The revision of the response to take action on", + "apihelp-reflectstudyaction-description": "Enables in-situ surveys for study Reflect activities in Liquid-Threaded discussions", + "apihelp-reflectstudyaction-param-reflectstudyaction": "The action to take", + "apihelp-reflectstudyaction-param-token": "An edit token (from ?action=query&prop=info&intoken=edit)", + "apihelp-reflectstudyaction-param-comment_id": "The id of the thread", + "apihelp-reflectstudyaction-param-bullet_id": "The id of the bullet the survey is asking about", + "apihelp-reflectstudyaction-param-bullet_rev": "The revid of the bullet the survey is asking about", + "apihelp-reflectstudyaction-param-response_id": "An answer to a survey question", + "apihelp-reflectstudyaction-param-survey_id": "An identifier for the specific survey being administered", + "apihelp-reflectstudyaction-param-text": "Optional text field for open ended survey questions", + "apihelp-reflectstudyaction-param-bullets": "list of bullets for survey to get" } diff --git a/i18n/qqq.json b/i18n/qqq.json index 5c390ac..85e2f92 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -4,5 +4,30 @@ "Nemo bis" ] }, - "reflect-desc": "{{desc|what=extension|name=Reflect|url=https://www.mediawiki.org/wiki/Extension:Reflect}}" + "reflect-desc": "{{desc|what=extension|name=Reflect|url=https://www.mediawiki.org/wiki/Extension:Reflect}}", + "apihelp-reflectaction-description": "{{doc-apihelp-description|reflectaction}}", + "apihelp-reflectaction-param-reflectaction": "{{doc-apihelp-param|reflectaction|reflectaction}}", + "apihelp-reflectaction-param-token": "{{doc-apihelp-param|reflectaction|token}}", + "apihelp-reflectaction-param-delete": "{{doc-apihelp-param|reflectaction|delete}}", + "apihelp-reflectaction-param-comment_id": "{{doc-apihelp-param|reflectaction|comment_id}}", + "apihelp-reflectaction-param-bullet_id": "{{doc-apihelp-param|reflectaction|bullet_id}}", + "apihelp-reflectaction-param-response": "{{doc-apihelp-param|reflectaction|response}}", + "apihelp-reflectaction-param-response_id": "{{doc-apihelp-param|reflectaction|response_id}}", + "apihelp-reflectaction-param-text": "{{doc-apihelp-param|reflectaction|text}}", + "apihelp-reflectaction-param-user": "{{doc-apihelp-param|reflectaction|user}}", + "apihelp-reflectaction-param-highlights": "{{doc-apihelp-param|reflectaction|highlights}}", + "apihelp-reflectaction-param-signal": "{{doc-apihelp-param|reflectaction|signal}}", + "apihelp-reflectaction-param-comments": "{{doc-apihelp-param|reflectaction|comments}}", + "apihelp-reflectaction-param-bullet_rev": "{{doc-apihelp-param|reflectaction|bullet_rev}}", + "apihelp-reflectaction-param-response_rev": "{{doc-apihelp-param|reflectaction|response_rev}}", + "apihelp-reflectstudyaction-description": "{{doc-apihelp-description|reflectstudyaction}}", + "apihelp-reflectstudyaction-param-reflectstudyaction": "{{doc-apihelp-param|reflectstudyaction|reflectstudyaction}}", + "apihelp-reflectstudyaction-param-token": "{{doc-apihelp-param|reflectstudyaction|token}}", + "apihelp-reflectstudyaction-param-comment_id": "{{doc-apihelp-param|reflectstudyaction|comment_id}}", + "apihelp-reflectstudyaction-param-bullet_id": "{{doc-apihelp-param|reflectstudyaction|bullet_id}}", + "apihelp-reflectstudyaction-param-bullet_rev": "{{doc-apihelp-param|reflectstudyaction|bullet_rev}}", + "apihelp-reflectstudyaction-param-response_id": "{{doc-apihelp-param|reflectstudyaction|response_id}}", + "apihelp-reflectstudyaction-param-survey_id": "{{doc-apihelp-param|reflectstudyaction|survey_id}}", + "apihelp-reflectstudyaction-param-text": "{{doc-apihelp-param|reflectstudyaction|text}}", + "apihelp-reflectstudyaction-param-bullets": "{{doc-apihelp-param|reflectstudyaction|bullets}}" } diff --git a/server/api/ApiReflectAction.php b/server/api/ApiReflectAction.php index d23d851..6b3b3be 100644 --- a/server/api/ApiReflectAction.php +++ b/server/api/ApiReflectAction.php @@ -486,35 +486,12 @@ /**** ApiBase functions *****/ - public function getDescription() { - return 'Enables Reflect on posts in Liquid-Threaded discussions.'; - } - public function getActions() { return array( 'get_data' => 'actionGetData', 'post_bullet' => 'actionPostBullet', 'post_response' => 'actionPostResponse', 'post_survey_bullets' => 'actionPostSurveyBullets', - ); - } - - public function getParamDescription() { - return array( - 'reflectaction' => 'The action to take', - 'token' => 'An edit token (from ?action=query&prop=info&intoken=edit)', - 'delete' => 'Whether this post is a delete request', - 'comment_id' => 'The id of the relevant thread', - 'bullet_id' => 'For modifying existing bullets. Don\'t set if posting new bullet.', - 'response' => 'Set to true if the post is posting a response', - 'response_id' => 'For modifying existing response. Don\'t set if posting new response.', - 'text' => 'The text relevant to the action', - 'user' => 'The user who took the action. We actually ignore this and use $wgUser instead.', - 'highlights' => 'For posting a bullet. An array of element ids corresponding to the highlighted elements of the comment', - 'signal' => 'For responses. ID of response to question about whether the commenter thinks the bullet is accurate', - 'comments' => 'For initial GET request. List of ids of all the threads on the current page', - 'bullet_rev' => 'The revision of the bullet to take action on.', - 'response_rev' => 'The revision of the response to take action on.', ); } diff --git a/server/api/ApiReflectStudyAction.php b/server/api/ApiReflectStudyAction.php index fade8ea..5c5534b 100644 --- a/server/api/ApiReflectStudyAction.php +++ b/server/api/ApiReflectStudyAction.php @@ -148,28 +148,10 @@ /****** ApiBase methods ********/ - public function getDescription() { - return 'Enables in-situ surveys for study Reflect activities in Liquid-Threaded discussions.'; - } - public function getActions() { return array( 'post_survey_bullets' => 'actionPostSurveyBullets', 'get_survey_responses' => 'actionGetSurveyBullets', - ); - } - - public function getParamDescription() { - return array( - 'reflectstudyaction' => 'The action to take', - 'token' => 'An edit token (from ?action=query&prop=info&intoken=edit)', - 'comment_id' => 'The id of the thread', - 'bullet_id' => 'The id of the bullet the survey is asking about', - 'bullet_rev' => 'The revid of the bullet the survey is asking about', - 'response_id' => 'An answer to a survey question', - 'survey_id' => 'An identifier for the specific survey being administered', - 'text' => 'Optional text field for open ended survey questions', - 'bullets' => 'list of bullets for survey to get' ); } -- To view, visit https://gerrit.wikimedia.org/r/331905 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic14a8aca067f5113a4d5af5b3e23957176e8f1fd Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Reflect Gerrit-Branch: master Gerrit-Owner: DatGuy <datguyst...@gmail.com> Gerrit-Reviewer: Anomie <bjor...@wikimedia.org> Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: Reedy <re...@wikimedia.org> Gerrit-Reviewer: Samtar <samtarli...@gmail.com> Gerrit-Reviewer: Siebrand <siebr...@kitano.nl> Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de> Gerrit-Reviewer: jenkins-bot <> Gerrit-Reviewer: tkriplean _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits