jenkins-bot has submitted this change and it was merged.

Change subject: Remove deprecated code from API classes
......................................................................


Remove deprecated code from API classes

This raises the minimum version of core to 1.25 for Translate.

Removed hook TranslateGetAPIMessageGroupsParameterDescs.

Change-Id: Ieff04e06ecc8e415c517e63029faa4a18af9fe2b
---
M api/ApiAggregateGroups.php
M api/ApiGroupReview.php
M api/ApiQueryLanguageStats.php
M api/ApiQueryMessageCollection.php
M api/ApiQueryMessageGroupStats.php
M api/ApiQueryMessageGroups.php
M api/ApiQueryMessageTranslations.php
M api/ApiQueryTranslationAids.php
M api/ApiSearchTranslations.php
M api/ApiStatsQuery.php
M api/ApiTTMServer.php
M api/ApiTranslateSandbox.php
M api/ApiTranslateUser.php
M api/ApiTranslationReview.php
M api/ApiTranslationStash.php
M hooks.txt
16 files changed, 17 insertions(+), 555 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/api/ApiAggregateGroups.php b/api/ApiAggregateGroups.php
index ca18b14..94afa2f 100644
--- a/api/ApiAggregateGroups.php
+++ b/api/ApiAggregateGroups.php
@@ -215,42 +215,6 @@
                );
        }
 
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getParamDescription() {
-               $action = TranslateUtils::getTokenAction( 'aggregategroups' );
-
-               return array(
-                       'do' => 'What to do with aggregate message group',
-                       'group' => 'Message group id',
-                       'aggregategroup' => 'Aggregate message group id',
-                       'groupname' => 'Aggregate message group name',
-                       'groupdescription' => 'Aggregate message group 
description',
-                       'token' => "A token previously acquired with $action",
-               );
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getDescription() {
-               return 'Manage aggregate message groups. You can add and remove 
aggregate message' .
-                       'groups and associate or dissociate message groups from 
them (one at a time).';
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getExamples() {
-               return array(
-                       
"api.php?action=aggregategroups&do=associate&group=groupId&aggregategroup=aggregateGroupId",
-               );
-       }
-
-       /**
-        * @see ApiBase::getExamplesMessages()
-        */
        protected function getExamplesMessages() {
                return array(
                        
'action=aggregategroups&do=associate&group=groupId&aggregategroup=aggregateGroupId'
diff --git a/api/ApiGroupReview.php b/api/ApiGroupReview.php
index 415bf13..8f7ce9c 100644
--- a/api/ApiGroupReview.php
+++ b/api/ApiGroupReview.php
@@ -147,41 +147,6 @@
                );
        }
 
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getParamDescription() {
-               $action = TranslateUtils::getTokenAction( 'groupreview' );
-
-               return array(
-                       'group' => 'Message group',
-                       'language' => 'Language code',
-                       'state' => 'The new state for the group',
-                       'token' => "A token previously acquired with $action",
-               );
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getDescription() {
-               return 'Set message group workflow states';
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getExamples() {
-               $group = 'page-Example';
-
-               return array(
-                       
"api.php?action=groupreview&group=$group&language=de&state=ready&token=foo",
-               );
-       }
-
-       /**
-        * @see ApiBase::getExamplesMessages()
-        */
        protected function getExamplesMessages() {
                return array(
                        
'action=groupreview&group=page-Example&language=de&state=ready&token=foo'
diff --git a/api/ApiQueryLanguageStats.php b/api/ApiQueryLanguageStats.php
index d6de92e..fe40376 100644
--- a/api/ApiQueryLanguageStats.php
+++ b/api/ApiQueryLanguageStats.php
@@ -41,36 +41,6 @@
                return $params;
        }
 
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getParamDescription() {
-               $desc = parent::getParamDescription();
-               $desc['language'] = 'Language code';
-
-               return $desc;
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getDescription() {
-               return 'Query language stats';
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       protected function getExamples() {
-               return array(
-                       "api.php?action=query&meta=languagestats&lslanguage=fi 
List of translation " .
-                               "completion statistics for language fi",
-               );
-       }
-
-       /**
-        * @see ApiBase::getExamplesMessages()
-        */
        protected function getExamplesMessages() {
                return array(
                        'action=query&meta=languagestats&lslanguage=fi'
diff --git a/api/ApiQueryMessageCollection.php 
b/api/ApiQueryMessageCollection.php
index 740f57d..1c7e703 100644
--- a/api/ApiQueryMessageCollection.php
+++ b/api/ApiQueryMessageCollection.php
@@ -30,10 +30,7 @@
                $this->run( $resultPageSet );
        }
 
-       /**
-        * @param $resultPageSet ApiPageSet
-        */
-       private function run( $resultPageSet = null ) {
+       private function run( ApiPageSet $resultPageSet = null ) {
                $params = $this->extractRequestParams();
 
                $group = MessageGroups::getGroup( $params['group'] );
@@ -121,17 +118,10 @@
                }
 
                if ( is_null( $resultPageSet ) ) {
-                       if ( defined( 'ApiResult::META_CONTENT' ) ) {
-                               $result->addIndexedTagName(
-                                       array( 'query', $this->getModuleName() 
),
-                                       'message'
-                               );
-                       } else {
-                               $result->setIndexedTagName_internal(
-                                       array( 'query', $this->getModuleName() 
),
-                                       'message'
-                               );
-                       }
+                       $result->addIndexedTagName(
+                               array( 'query', $this->getModuleName() ),
+                               'message'
+                       );
                } else {
                        $resultPageSet->populateFromTitles( $pages );
                }
@@ -168,11 +158,7 @@
                if ( isset( $props['properties'] ) ) {
                        foreach ( $message->getPropertyNames() as $prop ) {
                                $data['properties'][$prop] = 
$message->getProperty( $prop );
-                               if ( defined( 'ApiResult::META_CONTENT' ) ) {
-                                       ApiResult::setIndexedTagNameRecursive( 
$data['properties'], 'val' );
-                               } else {
-                                       $result->setIndexedTagName_recursive( 
$data['properties'], 'val' );
-                               }
+                               ApiResult::setIndexedTagNameRecursive( 
$data['properties'], 'val' );
                        }
                }
 
@@ -201,10 +187,6 @@
        }
 
        public function getAllowedParams() {
-               /** @todo Once support for MediaWiki < 1.25 is dropped, just
-                * use ApiBase::PARAM_HELP_MSG directly
-                */
-               $helpmsg = defined( 'ApiBase::PARAM_HELP_MSG' ) ? 
ApiBase::PARAM_HELP_MSG : '';
                return array(
                        'group' => array(
                                ApiBase::PARAM_TYPE => 'string',
@@ -224,7 +206,7 @@
                        'offset' => array(
                                ApiBase::PARAM_DFLT => '',
                                ApiBase::PARAM_TYPE => 'string',
-                               $helpmsg => 'api-help-param-continue',
+                               ApiBase::PARAM_HELP_MSG => 
'api-help-param-continue',
                        ),
                        'filter' => array(
                                ApiBase::PARAM_TYPE => 'string',
@@ -241,78 +223,12 @@
                                ),
                                ApiBase::PARAM_DFLT => 'definition|translation',
                                ApiBase::PARAM_ISMULTI => true,
-                               $helpmsg => array( 
'apihelp-query+messagecollection-param-prop', '!!FUZZY!!' ),
+                               ApiBase::PARAM_HELP_MSG =>
+                                       array( 
'apihelp-query+messagecollection-param-prop', '!!FUZZY!!' ),
                        ),
                );
        }
 
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getParamDescription() {
-               return array(
-                       'group' => 'Message group',
-                       'language' => 'Language code',
-                       'offset' => 'Integer or key offset for start',
-                       'limit' => 'How many messages to show (after 
filtering)',
-                       'prop' => array(
-                               'Which properties to get',
-                               'definition  - message definition',
-                               'translation - current translation (without 
!!FUZZY!! string if any, ' .
-                                       'use the tags to check for outdated or 
broken translations)',
-                               'tags        - message tags, like optional, 
ignored and fuzzy',
-                               'properties  - message properties, like status, 
revision, ' .
-                                       'last-translator. Can vary between 
messages.',
-                               'revision    - deprecated! use properties!',
-                       ),
-                       'filter' => array(
-                               'Message collection filters. Use ! to negate 
condition. For example ' .
-                                       '!fuzzy means list only all non-fuzzy 
messages. Filters are ' .
-                                       'applied in the order given.',
-                               'fuzzy             - messages with fuzzy tag',
-                               'optional          - messages which should be 
translated only if ' .
-                                       'changes are necessary',
-                               'ignored           - messages which are never 
translated',
-                               'hastranslation    - messages which have a 
translation regardless if it ' .
-                                       'is fuzzy or not',
-                               'translated        - messages which have a 
translation which is not fuzzy',
-                               'changed           - messages which has been 
translated or changed since ' .
-                                       'last export',
-                               'reviewer:#        - messages where given 
userid # is among reviewers',
-                               'last-translator:# - messages where given 
userid # is the last translator',
-                       ),
-               );
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getDescription() {
-               return 'Query MessageCollection about translations';
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       protected function getExamples() {
-               $group = 'page-Example';
-
-               return array(
-                       'api.php?action=query&meta=siteinfo&siprop=languages 
List of supported languages',
-                       
"api.php?action=query&list=messagecollection&mcgroup=$group " .
-                               "List of non-optional message definitions for 
group $group",
-                       
"api.php?action=query&list=messagecollection&mcgroup=$group&mclanguage=fi&" .
-                               
"mcprop=definition|translation|tags&mcfilter=optional " .
-                               "List of optional messages in Finnish with tags 
for group $group",
-                       
"api.php?action=query&generator=messagecollection&gmcgroup=$group" .
-                               "&gmclanguage=nl&prop=revisions " .
-                               "More information about latest translation 
revisions for group $group",
-               );
-       }
-
-       /**
-        * @see ApiBase::getExamplesMessages()
-        */
        protected function getExamplesMessages() {
                return array(
                        'action=query&meta=siteinfo&siprop=languages'
diff --git a/api/ApiQueryMessageGroupStats.php 
b/api/ApiQueryMessageGroupStats.php
index 39c146d..94d683b 100644
--- a/api/ApiQueryMessageGroupStats.php
+++ b/api/ApiQueryMessageGroupStats.php
@@ -49,38 +49,6 @@
                return $params;
        }
 
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getParamDescription() {
-               $desc = parent::getParamDescription();
-               $desc['group'] = 'Message group id';
-
-               return $desc;
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getDescription() {
-               return 'Query message group stats';
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       protected function getExamples() {
-               $group = 'page-Example';
-
-               return array(
-                       
"api.php?action=query&meta=messagegroupstats&mgsgroup=$group List of " .
-                               "translation completion statistics for group 
$group",
-               );
-       }
-
-       /**
-        * @see ApiBase::getExamplesMessages()
-        */
        protected function getExamplesMessages() {
                return array(
                        
'action=query&meta=messagegroupstats&mgsgroup=page-Example'
diff --git a/api/ApiQueryMessageGroups.php b/api/ApiQueryMessageGroups.php
index 15f8f78..6ef2dca 100644
--- a/api/ApiQueryMessageGroups.php
+++ b/api/ApiQueryMessageGroups.php
@@ -99,11 +99,7 @@
                        }
                }
 
-               if ( defined( 'ApiResult::META_CONTENT' ) ) {
-                       $result->addIndexedTagName( array( 'query', 
$this->getModuleName() ), 'group' );
-               } else {
-                       $result->setIndexedTagName_internal( array( 'query', 
$this->getModuleName() ), 'group' );
-               }
+               $result->addIndexedTagName( array( 'query', 
$this->getModuleName() ), 'group' );
        }
 
        /**
@@ -293,50 +289,6 @@
        }
 
        /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getParamDescription() {
-               $depth = <<<TEXT
-When using the tree format, limit the depth to this many levels. Value 0 means
-that no subgroups are shown. If the limit is reached, a prop groupcount is
-added and it states the number of direct children.
-TEXT;
-               $root = <<<TEXT
-When using the tree format, instead of starting from top level start from the
-given message group, which must be an aggregate message group. When using flat
-format only the specified group is returned.
-TEXT;
-               $filter = <<<TEXT
-Only return messages with IDs that match one or more of the input(s) given
-(case-insensitive, separated by pipes, * wildcard).
-TEXT;
-
-               $propIntro = array( 'What translation-related information to 
get:' );
-
-               $paramDescs = array(
-                       'depth' => $depth,
-                       'format' => 'In a tree format message groups can exist 
multiple places in the tree.',
-                       'iconsize' => 'Preferred size of rasterised group icon',
-                       'root' => $root,
-                       'filter' => $filter,
-                       'prop' => array_merge( $propIntro, 
self::getPropertyList() ),
-               );
-
-               $p = $this->getModulePrefix(); // Can be useful for 
documentation
-               Hooks::run( 'TranslateGetAPIMessageGroupsParameterDescs', 
array( &$paramDescs, $p ) );
-
-               $indent = "\n" . str_repeat( ' ', 24 );
-               $wrapWidth = 104 - 24;
-               foreach ( $paramDescs as &$val ) {
-                       if ( is_string( $val ) ) {
-                               $val = wordwrap( str_replace( "\n", ' ', $val 
), $wrapWidth, $indent );
-                       }
-               }
-
-               return $paramDescs;
-       }
-
-       /**
         * Returns array of key value pairs of properties and their descriptions
         *
         * @return array
@@ -368,26 +320,6 @@
                return $properties;
        }
 
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getDescription() {
-               return 'Return information about message groups. Note that 
uselang parameter ' .
-                       'affects the output of language dependent parts.';
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       protected function getExamples() {
-               return array(
-                       'api.php?action=query&meta=messagegroups',
-               );
-       }
-
-       /**
-        * @see ApiBase::getExamplesMessages()
-        */
        protected function getExamplesMessages() {
                return array(
                        'action=query&meta=messagegroups'
diff --git a/api/ApiQueryMessageTranslations.php 
b/api/ApiQueryMessageTranslations.php
index b7436ed..ccec463 100644
--- a/api/ApiQueryMessageTranslations.php
+++ b/api/ApiQueryMessageTranslations.php
@@ -13,7 +13,6 @@
  * @ingroup API TranslateAPI
  */
 class ApiQueryMessageTranslations extends ApiQueryBase {
-
        public function __construct( $query, $moduleName ) {
                parent::__construct( $query, $moduleName, 'mt' );
        }
@@ -104,11 +103,7 @@
                        }
 
                        $translation = str_replace( TRANSLATE_FUZZY, '', 
$info[0] );
-                       if ( defined( 'ApiResult::META_CONTENT' ) ) {
-                               ApiResult::setContentValue( $data, 
'translation', $translation );
-                       } else {
-                               ApiResult::setContent( $data, $translation );
-                       }
+                       ApiResult::setContentValue( $data, 'translation', 
$translation );
 
                        $fit = $result->addValue( array( 'query', 
$this->getModuleName() ), null, $data );
                        if ( !$fit ) {
@@ -117,11 +112,7 @@
                        }
                }
 
-               if ( defined( 'ApiResult::META_CONTENT' ) ) {
-                       $result->addIndexedTagName( array( 'query', 
$this->getModuleName() ), 'message' );
-               } else {
-                       $result->setIndexedTagName_internal( array( 'query', 
$this->getModuleName() ), 'message' );
-               }
+               $result->addIndexedTagName( array( 'query', 
$this->getModuleName() ), 'message' );
        }
 
        public function getAllowedParams() {
@@ -133,44 +124,11 @@
                        'offset' => array(
                                ApiBase::PARAM_DFLT => 0,
                                ApiBase::PARAM_TYPE => 'integer',
-                               /** @todo Once support for MediaWiki < 1.25 is 
dropped, just
-                                * use ApiBase::PARAM_HELP_MSG directly
-                                */
-                               defined( 'ApiBase::PARAM_HELP_MSG' ) ? 
ApiBase::PARAM_HELP_MSG : '' =>
-                                       'api-help-param-continue',
+                               ApiBase::PARAM_HELP_MSG => 
'api-help-param-continue',
                        ),
                );
        }
 
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getParamDescription() {
-               return array(
-                       'title' => 'Full title of a known message',
-               );
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getDescription() {
-               return 'Query all translations for a single message';
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       protected function getExamples() {
-               return array(
-                       
"api.php?action=query&meta=messagetranslations&mttitle=MediaWiki:January " .
-                               "List of translations in the wiki for 
MediaWiki:January",
-               );
-       }
-
-       /**
-        * @see ApiBase::getExamplesMessages()
-        */
        protected function getExamplesMessages() {
                return array(
                        
'action=query&meta=messagetranslations&mttitle=MediaWiki:January'
diff --git a/api/ApiQueryTranslationAids.php b/api/ApiQueryTranslationAids.php
index c9e8982..2a0075d 100644
--- a/api/ApiQueryTranslationAids.php
+++ b/api/ApiQueryTranslationAids.php
@@ -118,37 +118,6 @@
                );
        }
 
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getParamDescription() {
-               return array(
-                       'title' => 'Full title of a known message',
-                       'group' => 'Message group the message belongs to. If 
empty then ' .
-                               'primary group is used.',
-                       'prop' => 'Which translation helpers to include.',
-               );
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getDescription() {
-               return 'Query all translations aids';
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       protected function getExamples() {
-               return array(
-                       
"api.php?action=translationaids&title=MediaWiki:January/fi",
-               );
-       }
-
-       /**
-        * @see ApiBase::getExamplesMessages()
-        */
        protected function getExamplesMessages() {
                return array(
                        'action=translationaids&title=MediaWiki:January/fi'
diff --git a/api/ApiSearchTranslations.php b/api/ApiSearchTranslations.php
index 9035799..967d571 100644
--- a/api/ApiSearchTranslations.php
+++ b/api/ApiSearchTranslations.php
@@ -5,7 +5,6 @@
  * @license GPL-2.0+
  */
 class ApiSearchTranslations extends ApiBase {
-
        public function execute() {
                global $wgTranslateTranslationServices;
                $params = $this->extractRequestParams();
@@ -106,15 +105,6 @@
                );
        }
 
-       // Get examples
-       public function getExamples() {
-               return array(
-                       
'api.php?action=searchtranslations&language=fr&query=aide',
-                       
'api.php?action=searchtranslations&language=fr&query=edit&filter=untranslated'
-               );
-       }
-
-       // Get examples messages
        protected function getExamplesMessages() {
                return array(
                        'action=searchtranslations&language=fr&query=aide'
diff --git a/api/ApiStatsQuery.php b/api/ApiStatsQuery.php
index 9612f6a..a65c982 100644
--- a/api/ApiStatsQuery.php
+++ b/api/ApiStatsQuery.php
@@ -39,11 +39,7 @@
                        $result->addValue( array( 'query', 
$this->getModuleName() ), null, $data );
                }
 
-               if ( defined( 'ApiResult::META_CONTENT' ) ) {
-                       $result->addIndexedTagName( array( 'query', 
$this->getModuleName() ), 'stats' );
-               } else {
-                       $result->setIndexedTagName_internal( array( 'query', 
$this->getModuleName() ), 'stats' );
-               }
+               $result->addIndexedTagName( array( 'query', 
$this->getModuleName() ), 'stats' );
        }
 
        protected function makeItem( $item, $stats ) {
@@ -60,11 +56,7 @@
                        'offset' => array(
                                ApiBase::PARAM_DFLT => 0,
                                ApiBase::PARAM_TYPE => 'string',
-                               /** @todo Once support for MediaWiki < 1.25 is 
dropped, just
-                                * use ApiBase::PARAM_HELP_MSG directly
-                               */
-                               defined( 'ApiBase::PARAM_HELP_MSG' ) ? 
ApiBase::PARAM_HELP_MSG : '' =>
-                                       'api-help-param-continue',
+                               ApiBase::PARAM_HELP_MSG => 
'api-help-param-continue',
                        ),
                        'timelimit' => array(
                                ApiBase::PARAM_DFLT => 8,
@@ -72,18 +64,6 @@
                                ApiBase::PARAM_MAX => 10,
                                ApiBase::PARAM_MIN => 0,
                        ),
-               );
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getParamDescription() {
-               return array(
-                       'offset' => 'If not all stats are calculated, you will 
get a query-continue ' .
-                               'parameter for offset you can use to get more.',
-                       'timelimit' => 'Maximum time to spend calculating 
missing statistics. If ' .
-                               'zero, only the cached results from the 
beginning are returned.',
                );
        }
 }
diff --git a/api/ApiTTMServer.php b/api/ApiTTMServer.php
index 5abf3f9..a227c81 100644
--- a/api/ApiTTMServer.php
+++ b/api/ApiTTMServer.php
@@ -35,11 +35,7 @@
                        $result->addValue( $this->getModuleName(), null, $sug );
                }
 
-               if ( defined( 'ApiResult::META_CONTENT' ) ) {
-                       $result->addIndexedTagName( $this->getModuleName(), 
'suggestion' );
-               } else {
-                       $result->setIndexedTagName_internal( 
$this->getModuleName(), 'suggestion' );
-               }
+               $result->addIndexedTagName( $this->getModuleName(), 
'suggestion' );
        }
 
        protected function getAvailableTranslationServices() {
@@ -78,37 +74,6 @@
                );
        }
 
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getParamDescription() {
-               return array(
-                       'service' => 'Which of the available translation 
services to use.',
-                       'sourcelanguage' => 'A language code of the source 
text',
-                       'targetlanguage' => 'A language code of the suggestion',
-                       'text' => 'The text to find suggestions for',
-               );
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getDescription() {
-               return 'Query suggestions from translation memories';
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getExamples() {
-               return array(
-                       
'api.php?action=ttmserver&sourcelanguage=en&targetlanguage=fi&text=Help',
-               );
-       }
-
-       /**
-        * @see ApiBase::getExamplesMessages()
-        */
        protected function getExamplesMessages() {
                return array(
                        
'action=ttmserver&sourcelanguage=en&targetlanguage=fi&text=Help'
diff --git a/api/ApiTranslateSandbox.php b/api/ApiTranslateSandbox.php
index 2d4877d..46cf168 100644
--- a/api/ApiTranslateSandbox.php
+++ b/api/ApiTranslateSandbox.php
@@ -207,27 +207,4 @@
                        'email' => array( ApiBase::PARAM_TYPE => 'string' ),
                );
        }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getParamDescription() {
-               $action = TranslateUtils::getTokenAction( 'translatesandbox' );
-
-               return array(
-                       'do' => 'What to do',
-                       'userid' => 'User ids of the users being managed. Use 0 
for creations.',
-                       'token' => "A token previously acquired with $action",
-                       'username' => 'Username when creating user',
-                       'password' => 'Password when creating user',
-                       'email' => 'Email when creating user',
-               );
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getDescription() {
-               return 'Signup and manage sandboxed users';
-       }
 }
diff --git a/api/ApiTranslateUser.php b/api/ApiTranslateUser.php
index fab75f9..0058f72 100644
--- a/api/ApiTranslateUser.php
+++ b/api/ApiTranslateUser.php
@@ -27,25 +27,6 @@
                $this->getResult()->addValue( null, $this->getModuleName(), 
$output );
        }
 
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getDescription() {
-               return 'Translation related information about the user. 
Experimental.';
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getExamples() {
-               return array(
-                       'api.php?action=translateuser',
-               );
-       }
-
-       /**
-        * @see ApiBase::getExamplesMessages()
-        */
        protected function getExamplesMessages() {
                return array(
                        'action=translateuser'
diff --git a/api/ApiTranslationReview.php b/api/ApiTranslationReview.php
index c54ed9d..ed225c9 100644
--- a/api/ApiTranslationReview.php
+++ b/api/ApiTranslationReview.php
@@ -159,37 +159,6 @@
                );
        }
 
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getParamDescription() {
-               $action = TranslateUtils::getTokenAction( 'translationreview' );
-
-               return array(
-                       'revision' => 'The revision number to review',
-                       'token' => "A token previously acquired with $action",
-               );
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getDescription() {
-               return 'Mark translations reviewed';
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getExamples() {
-               return array(
-                       'api.php?action=translationreview&revision=1&token=foo',
-               );
-       }
-
-       /**
-        * @see ApiBase::getExamplesMessages()
-        */
        protected function getExamplesMessages() {
                return array(
                        'action=translationreview&revision=1&token=foo'
diff --git a/api/ApiTranslationStash.php b/api/ApiTranslationStash.php
index 5486432..caa4fda 100644
--- a/api/ApiTranslationStash.php
+++ b/api/ApiTranslationStash.php
@@ -124,44 +124,6 @@
                );
        }
 
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getParamDescription() {
-               $action = TranslateUtils::getTokenAction( 'translationstash' );
-
-               return array(
-                       'subaction' => 'Action',
-                       'title' => 'Title of the translation unit page',
-                       'translation' => 'Translation made by the user',
-                       'metadata' => 'Json object',
-                       'token' => "A token previously acquired with $action",
-                       'username' => 'Optionally the user whose stash to get. '
-                               . 'Only privileged users can do this',
-               );
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getDescription() {
-               return 'Add translations to stash';
-       }
-
-       /**
-        * @deprecated since MediaWiki core 1.25
-        */
-       public function getExamples() {
-               return array(
-                       
"api.php?action=translationstash&subaction=add&title=MediaWiki:Jan/fi&" .
-                               "translation=tammikuu&metadata={}",
-                       "api.php?action=translationstash&subaction=query",
-               );
-       }
-
-       /**
-        * @see ApiBase::getExamplesMessages()
-        */
        protected function getExamplesMessages() {
                return array(
                        
'action=translationstash&subaction=add&title=MediaWiki:Jan/fi&translation=tammikuu&metadata={}'
diff --git a/hooks.txt b/hooks.txt
index 97b908e..a3d4b1c 100644
--- a/hooks.txt
+++ b/hooks.txt
@@ -88,15 +88,11 @@
  MessageHandle   $handle: An object representing the translation page (e.g. 
'MediaWiki:Example/qqq')
  array          &$boxes: An associative array to be appended to (format: 
'name' => 'some HTML string')
 
-;TranslateGetAPIMessageGroupsParameterDescs: Provides an opportunity to 
document any parameters added with 'TranslateGetAPIMessageGroupsParameterList'.
- array          &$paramDescs: An associative array of parameters, name => 
description.
- string          $p: The prefix for action=query&meta=messagegroups (currently 
mg, but could change), useful for documentation
-
 ;TranslateGetAPIMessageGroupsParameterList: Allows extra parameters to be 
added to the action=query&meta=messagegroups module
  array          &$params: An associative array of possible parameters (name => 
details; see ApiQueryMessageGroups.php for correct spacing)
 
 ;TranslateGetAPIMessageGroupsPropertyDescs: Allows extra properties to be 
added to captured by action=query&meta=messagegroups&mgprop=foo|bar|bat module
- array          &$properties: An associative array of properties, name => 
description.
+ array          &$properties: An associative array of properties, name => 
description (which is ignored).
 
 ;TranslateGetExtraInputs: Provides an opportunity to add extra form inputs to 
to the default translation editor
  string         &$translation: The translation as it stands

-- 
To view, visit https://gerrit.wikimedia.org/r/272711
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieff04e06ecc8e415c517e63029faa4a18af9fe2b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to