http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73934
Revision: 73934
Author: nikerabbit
Date: 2010-09-29 07:38:53 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Start cleaning up MessageGroups (class) api by introducing static getAllGroups()
Modified Paths:
--------------
trunk/extensions/Translate/MessageGroups.php
trunk/extensions/Translate/TranslatePage.php
trunk/extensions/Translate/api/ApiQueryMessageCollection.php
trunk/extensions/Translate/api/ApiQueryMessageGroups.php
Modified: trunk/extensions/Translate/MessageGroups.php
===================================================================
--- trunk/extensions/Translate/MessageGroups.php 2010-09-29 07:35:51 UTC
(rev 73933)
+++ trunk/extensions/Translate/MessageGroups.php 2010-09-29 07:38:53 UTC
(rev 73934)
@@ -984,6 +984,14 @@
}
}
+ /**
+ * Get all enabled message groups.
+ * @return \arrayof{String,MessageGroup}
+ */
+ public static function getAllGroups() {
+ return self::singleton()->getGroups();
+ }
+
/// @todo Make protected.
public $classes;
private function __construct() {
Modified: trunk/extensions/Translate/TranslatePage.php
===================================================================
--- trunk/extensions/Translate/TranslatePage.php 2010-09-29 07:35:51 UTC
(rev 73933)
+++ trunk/extensions/Translate/TranslatePage.php 2010-09-29 07:38:53 UTC
(rev 73934)
@@ -238,7 +238,7 @@
/* Selectors ahead */
protected function groupSelector() {
- $groups = MessageGroups::singleton()->getGroups();
+ $groups = MessageGroups::getAllGroups();
$selector = new HTMLSelector( 'group', 'group',
$this->options['group'] );
foreach ( $groups as $id => $class ) {
@@ -403,7 +403,7 @@
public function getGroupStructure() {
global $wgTranslateGroupStructure;
- $groups = MessageGroups::singleton()->getGroups();
+ $groups = MessageGroups::getAllGroups();
$structure = array();
foreach ( $groups as $id => $o ) {
Modified: trunk/extensions/Translate/api/ApiQueryMessageCollection.php
===================================================================
--- trunk/extensions/Translate/api/ApiQueryMessageCollection.php
2010-09-29 07:35:51 UTC (rev 73933)
+++ trunk/extensions/Translate/api/ApiQueryMessageCollection.php
2010-09-29 07:38:53 UTC (rev 73934)
@@ -113,7 +113,7 @@
public function getAllowedParams() {
return array(
'group' => array(
- ApiBase::PARAM_TYPE => array_keys(
MessageGroups::singleton()->getGroups() ),
+ ApiBase::PARAM_TYPE => array_keys(
MessageGroups::>getAllGroups() ),
ApiBase::PARAM_REQUIRED => true,
),
'language' => array(
@@ -173,7 +173,7 @@
}
protected function getExamples() {
- $groups = MessageGroups::singleton()->getGroups();
+ $groups = MessageGroups::getAllGroups();
$group = key( $groups );
return array(
Modified: trunk/extensions/Translate/api/ApiQueryMessageGroups.php
===================================================================
--- trunk/extensions/Translate/api/ApiQueryMessageGroups.php 2010-09-29
07:35:51 UTC (rev 73933)
+++ trunk/extensions/Translate/api/ApiQueryMessageGroups.php 2010-09-29
07:38:53 UTC (rev 73934)
@@ -25,7 +25,7 @@
public function execute() {
$params = $this->extractRequestParams();
- $groups = MessageGroups::singleton()->getGroups();
+ $groups = MessageGroups::getAllGroups();
$result = $this->getResult();
foreach ( $groups as $id => $g ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
