| Index: trunk/translatewiki/StatusNet/StatusNet.yaml |
| — | — | @@ -33,7 +33,7 @@ |
| 34 | 34 | |
| 35 | 35 | GROUPS: |
| 36 | 36 | - out-statusnet-core |
| 37 | | - - out-statusnet-plugin-* |
| | 37 | + - out-statusnet-plugin-0-all |
| 38 | 38 | --- |
| 39 | 39 | BASIC: |
| 40 | 40 | id: out-statusnet-plugin-0-all |
| Index: trunk/extensions/Translate/Groups.php |
| — | — | @@ -660,15 +660,19 @@ |
| 661 | 661 | return $all; |
| 662 | 662 | } |
| 663 | 663 | |
| 664 | | - public function initCollection( $code ) { |
| | 664 | + protected function loadMessagesFromCache( $groups ) { |
| 665 | 665 | $messages = array(); |
| 666 | | - |
| 667 | | - foreach ( $this->getGroups() as $group ) { |
| | 666 | + foreach ( $groups as $group ) { |
| 668 | 667 | if ( $group instanceof MessageGroupOld ) { |
| 669 | 668 | $messages += $group->getDefinitions(); |
| 670 | 669 | continue; |
| 671 | 670 | } |
| 672 | 671 | |
| | 672 | + if ( $group instanceof AggregateMessageGroup ) { |
| | 673 | + $messages += $this->loadMessagesFromCache( $group->getGroups() ); |
| | 674 | + continue; |
| | 675 | + } |
| | 676 | + |
| 673 | 677 | $cache = new MessageGroupCache( $group ); |
| 674 | 678 | if ( $cache->exists() ) { |
| 675 | 679 | foreach ( $cache->getKeys() as $key ) { |
| — | — | @@ -676,7 +680,12 @@ |
| 677 | 681 | } |
| 678 | 682 | } |
| 679 | 683 | } |
| | 684 | + return $messages; |
| | 685 | + } |
| | 686 | + |
| 680 | 687 | |
| | 688 | + public function initCollection( $code ) { |
| | 689 | + $messages = $this->loadMessagesFromCache( $this->getGroups() ); |
| 681 | 690 | $namespace = $this->getNamespace(); |
| 682 | 691 | $definitions = new MessageDefinitions( $messages, $namespace ); |
| 683 | 692 | $collection = MessageCollection::newFromDefinitions( $definitions, $code ); |