| Index: trunk/extensions/Translate/scripts/export.php |
| — | — | @@ -109,12 +109,16 @@ |
| 110 | 110 | |
| 111 | 111 | foreach ( $groups as $groupId => $group ) { |
| 112 | 112 | if ( !$group instanceof MessageGroup ) { |
| 113 | | - STDERR( "Invalid group: " . $groupId ); |
| | 113 | + STDERR( "Unknown message group $groupId" ); |
| 114 | 114 | exit( 1 ); |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | | - STDERR( 'Exporting ' . $groupId ); |
| | 117 | + if ( $group->isMeta() ) { |
| | 118 | + STDERR( "Skipping meta message group $groupId" ); |
| | 119 | + } |
| 118 | 120 | |
| | 121 | + STDERR( "Exporting $groupId" ); |
| | 122 | + |
| 119 | 123 | $langs = $reqLangs; |
| 120 | 124 | if ( $threshold ) { |
| 121 | 125 | $stats = MessageGroupStats::forGroup( $groupId ); |
| Index: trunk/extensions/Translate/MessageGroups.php |
| — | — | @@ -1333,22 +1333,17 @@ |
| 1334 | 1334 | /** |
| 1335 | 1335 | * Get message groups for corresponding message group ids. |
| 1336 | 1336 | * |
| 1337 | | - * @param $ids array Group IDs |
| 1338 | | - * @param $skipMeta bool Skip aggregate message groups |
| 1339 | | - * @return array |
| | 1337 | + * @param $ids array of message group ids |
| | 1338 | + * @return array array of message groups indexed by message group ids |
| 1340 | 1339 | * @since 2012-02-13 |
| 1341 | 1340 | */ |
| 1342 | | - public static function getGroupsById( array $ids, $skipMeta = false ) { |
| | 1341 | + public static function getGroupsById( array $ids ) { |
| 1343 | 1342 | $groups = array(); |
| 1344 | 1343 | foreach ( $ids as $id ) { |
| 1345 | 1344 | $group = self::getGroup( $id ); |
| 1346 | 1345 | |
| 1347 | 1346 | if ( $group !== null ) { |
| 1348 | | - if ( $skipMeta && $group->isMeta() ) { |
| 1349 | | - continue; |
| 1350 | | - } else { |
| 1351 | | - $groups[$id] = $group; |
| 1352 | | - } |
| | 1347 | + $groups[$id] = $group; |
| 1353 | 1348 | } else { |
| 1354 | 1349 | wfDebug( __METHOD__ . ": Invalid message group id: $id\n" ); |
| 1355 | 1350 | } |