| Index: trunk/extensions/Translate/scripts/export.php |
| — | — | @@ -98,8 +98,9 @@ |
| 99 | 99 | if ( isset( $options['group'] ) ) { |
| 100 | 100 | $groupIds = explode( ',', trim( $options['group'] ) ); |
| 101 | 101 | } |
| | 102 | + |
| 102 | 103 | $groupIds = MessageGroups::expandWildcards( $groupIds ); |
| 103 | | -$groups = MessageGroups::getGroupsById( $groupIds ); |
| | 104 | +$groups = MessageGroups::getGroupsById( $groupIds, true ); |
| 104 | 105 | |
| 105 | 106 | if ( !count( $groups ) ) { |
| 106 | 107 | STDERR( "EE1: No valid message groups identified." ); |
| Index: trunk/extensions/Translate/MessageGroups.php |
| — | — | @@ -1319,18 +1319,22 @@ |
| 1320 | 1320 | /** |
| 1321 | 1321 | * Get message groups for corresponding message group ids. |
| 1322 | 1322 | * |
| 1323 | | - * @param $groups array Group IDs |
| 1324 | | - * @param $groupPrefix string Prefix for groups |
| | 1323 | + * @param $ids array Group IDs |
| | 1324 | + * @param $skipMeta bool Skip aggregate message groups |
| 1325 | 1325 | * @return array |
| 1326 | 1326 | * @since 2012-02-13 |
| 1327 | 1327 | */ |
| 1328 | | - public static function getGroupsById( array $ids ) { |
| | 1328 | + public static function getGroupsById( array $ids, $skipMeta = false ) { |
| 1329 | 1329 | $groups = array(); |
| 1330 | 1330 | foreach ( $ids as $id ) { |
| 1331 | 1331 | $group = self::getGroup( $id ); |
| 1332 | 1332 | |
| 1333 | 1333 | if ( $group !== null ) { |
| 1334 | | - $groups[$id] = $group; |
| | 1334 | + if( $group->isMeta() && $skipMeta ) { |
| | 1335 | + continue; |
| | 1336 | + } else { |
| | 1337 | + $groups[$id] = $group; |
| | 1338 | + } |
| 1335 | 1339 | } else { |
| 1336 | 1340 | wfDebug( __METHOD__ . ": Invalid message group id: $id\n" ); |
| 1337 | 1341 | } |