| Index: trunk/extensions/Translate/TranslateEditAddons.php |
| — | — | @@ -116,11 +116,7 @@ |
| 117 | 117 | $en = $group->getMessage( $key, 'en' ); |
| 118 | 118 | $xx = $group->getMessage( $key, $code ); |
| 119 | 119 | |
| 120 | | - // Definition |
| 121 | 120 | $boxes = array(); |
| 122 | | - if ( $en !== null ) { |
| 123 | | - $boxes[] = self::doBox( $en, 'en', wfMsg( self::MSG . 'definition' ) ); |
| 124 | | - } |
| 125 | 121 | |
| 126 | 122 | // In other languages (if any) |
| 127 | 123 | $inOtherLanguages = array(); |
| — | — | @@ -157,7 +153,7 @@ |
| 158 | 154 | // Current committed translation |
| 159 | 155 | // Should this be higher up, because it's not as importad as definition for example |
| 160 | 156 | if ( $xx !== null && $code !== 'en' ) { |
| 161 | | - $boxes[] = self::dobox( $xx, $code, wfMsg( self::MSG . 'committed' ) ); |
| | 157 | + //$boxes[] = self::dobox( $xx, $code, wfMsg( self::MSG . 'committed' ) ); |
| 162 | 158 | |
| 163 | 159 | // Append translation from the file to edit area, if it's empty. |
| 164 | 160 | if ($object->firsttime && $object->textbox1 === '') { |
| — | — | @@ -165,6 +161,12 @@ |
| 166 | 162 | } |
| 167 | 163 | } |
| 168 | 164 | |
| | 165 | + // Definition |
| | 166 | + if ( $en !== null ) { |
| | 167 | + $boxes[] = self::doBox( $en, 'en', wfMsg( self::MSG . 'definition' ) ); |
| | 168 | + } |
| | 169 | + |
| | 170 | + |
| 169 | 171 | // Some syntactic checks |
| 170 | 172 | $translation = $object->textbox1 ? $object->textbox1 : $xx; |
| 171 | 173 | if ( $translation ) { |
| Index: trunk/extensions/Translate/MessageChecks.php |
| — | — | @@ -25,23 +25,23 @@ |
| 26 | 26 | $warnings = array(); |
| 27 | 27 | |
| 28 | 28 | if ( count($values = self::checkParameters( $message )) ) { |
| 29 | | - $warnings[] = wfMsgExt( self::MSG . 'parameters', 'parse', implode( ', ', $values ) ); |
| | 29 | + $warnings[] = wfMsgExt( self::MSG . 'parameters', 'parseinline', implode( ', ', $values ) ); |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | if ( count($values = self::checkBalance( $message )) ) { |
| 33 | | - $warnings[] = wfMsgExt( self::MSG . 'balance', 'parse', wfEscapeWikiText( implode( ', ', $values ) ) ); |
| | 33 | + $warnings[] = wfMsgExt( self::MSG . 'balance', 'parseinline', wfEscapeWikiText( implode( ', ', $values ) ) ); |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | if ( count($values = self::checkLinks( $message )) ) { |
| 37 | | - $warnings[] = wfMsgExt( self::MSG . 'links', 'parse', wfEscapeWikiText( implode( ', ', $values ) ) ); |
| | 37 | + $warnings[] = wfMsgExt( self::MSG . 'links', 'parseinline', wfEscapeWikiText( implode( ', ', $values ) ) ); |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | if ( count($values = self::checkXHTML( $message )) ) { |
| 41 | | - $warnings[] = wfMsgExt( self::MSG . 'xhtml', 'parse', htmlspecialchars( implode( ', ', $values ) ) ); |
| | 41 | + $warnings[] = wfMsgExt( self::MSG . 'xhtml', 'parseinline', htmlspecialchars( implode( ', ', $values ) ) ); |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | if ( self::checkPlural( $message ) ) { |
| 45 | | - $warnings[] = wfMsgExt( self::MSG . 'plural', 'parse' ); |
| | 45 | + $warnings[] = wfMsgExt( self::MSG . 'plural', 'parseinline' ); |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | return $warnings; |