| Index: trunk/extensions/Translate/scripts/magic-export.php |
| — | — | @@ -88,12 +88,15 @@ |
| 89 | 89 | include( $file ); |
| 90 | 90 | switch( $this->type ) { |
| 91 | 91 | case 'special': |
| 92 | | - // TODO: Rename to $specialPageAliases after the first export. |
| 93 | | - if ( !isset( $aliases ) ) { |
| | 92 | + if ( isset( $aliases ) ) { |
| | 93 | + $this->messagesOld[$group->getId()] = $aliases; |
| | 94 | + unset( $aliases ); |
| | 95 | + } elseif ( isset( $specialPageAliases ) ) { |
| | 96 | + $this->messagesOld[$group->getId()] = $specialPageAliases; |
| | 97 | + unset( $specialPageAliases ); |
| | 98 | + } else { |
| 94 | 99 | die( "File '$file' does not contain an aliases array.\n" ); |
| 95 | 100 | } |
| 96 | | - $this->messagesOld[$group->getId()] = $aliases; |
| 97 | | - unset( $aliases ); |
| 98 | 101 | break; |
| 99 | 102 | case 'magic': |
| 100 | 103 | if ( !isset( $magicWords ) ) { |
| Index: trunk/extensions/Translate/MessageGroups.php |
| — | — | @@ -377,7 +377,7 @@ |
| 378 | 378 | * Name of the array where all special page aliases are stored, if applicable. |
| 379 | 379 | * Only used in class SpecialPageAliasesCM |
| 380 | 380 | */ |
| 381 | | - protected $arrAlias = 'aliases'; |
| | 381 | + protected $arrAlias = 'specialPageAliases'; |
| 382 | 382 | |
| 383 | 383 | protected $path = null; |
| 384 | 384 | |
| Index: trunk/extensions/Translate/groups/mediawiki-defines.txt |
| — | — | @@ -1501,9 +1501,7 @@ |
| 1502 | 1502 | file = wikihiero/wikihiero.i18n.php |
| 1503 | 1503 | |
| 1504 | 1504 | Wikilog |
| 1505 | | -# FIXME: broken |
| 1506 | | -#aliasfile = Wikilog/Wikilog.i18n.alias.php |
| 1507 | | -#aliasvar = specialPageAliases |
| | 1505 | +aliasfile = Wikilog/Wikilog.i18n.alias.php |
| 1508 | 1506 | magicfile = Wikilog/Wikilog.i18n.magic.php |
| 1509 | 1507 | optional = wikilog-entry-footer, wikilog-title-item-full, wikilog-feed-title |
| 1510 | 1508 | optional = wikilog-comment-footer, wikilog-simple-signature |
| Index: trunk/extensions/Translate/groups/MediaWikiExtensions.php |
| — | — | @@ -78,7 +78,6 @@ |
| 79 | 79 | case 'desc': |
| 80 | 80 | case 'magicfile': |
| 81 | 81 | case 'aliasfile': |
| 82 | | - case 'aliasvar': |
| 83 | 82 | $newgroup[$key] = $value; |
| 84 | 83 | break; |
| 85 | 84 | case 'optional': |
| — | — | @@ -155,7 +154,7 @@ |
| 156 | 155 | 'url' => $url, |
| 157 | 156 | ); |
| 158 | 157 | |
| 159 | | - $copyvars = array( 'ignored', 'optional', 'var', 'desc', 'prefix', 'mangle', 'magicfile', 'aliasfile', 'aliasvar' ); |
| | 158 | + $copyvars = array( 'ignored', 'optional', 'var', 'desc', 'prefix', 'mangle', 'magicfile', 'aliasfile' ); |
| 160 | 159 | foreach ( $copyvars as $var ) { |
| 161 | 160 | if ( isset( $g[$var] ) ) { |
| 162 | 161 | $newgroup[$var] = $g[$var]; |
| — | — | @@ -209,7 +208,6 @@ |
| 210 | 209 | } |
| 211 | 210 | |
| 212 | 211 | if ( isset( $info['aliasfile'] ) ) $group->setAliasFile( $info['aliasfile'] ); |
| 213 | | - if ( isset( $info['aliasvar'] ) ) $group->setVariableNameAlias( $info['aliasvar'] ); |
| 214 | 212 | if ( isset( $info['magicfile'] ) ) $group->setMagicFile( $info['magicfile'] ); |
| 215 | 213 | |
| 216 | 214 | return $group; |