| Index: trunk/phase3/includes/diff/HTMLDiff.php |
| — | — | @@ -772,9 +772,9 @@ |
| 773 | 773 | if ($this->sem == TagToStringFactory::MOVED) { |
| 774 | 774 | $txt->addHtml( wfMsgExt( 'diff-movedoutof', 'parseinline', $tagDescription ) ); |
| 775 | 775 | } else if ($this->sem == TagToStringFactory::STYLE) { |
| 776 | | - $txt->addHtml($tagDescription . ' ' . wfMsgExt( 'diff-styleremoved' , 'parseinline' ) ); |
| | 776 | + $txt->addHtml( wfMsgExt( 'diff-styleremoved' , 'parseinline', $tagDescription ) ); |
| 777 | 777 | } else { |
| 778 | | - $txt->addHtml($tagDescription . ' ' . wfMsgExt( 'diff-removed' , 'parseinline' ) ); |
| | 778 | + $txt->addHtml( wfMsgExt( 'diff-removed' , 'parseinline', $tagDescription ) ); |
| 779 | 779 | } |
| 780 | 780 | $this->addAttributes($txt, $this->node->attributes); |
| 781 | 781 | $txt->addHtml('.'); |
| — | — | @@ -788,9 +788,9 @@ |
| 789 | 789 | if ($this->sem == TagToStringFactory::MOVED) { |
| 790 | 790 | $txt->addHtml( wfMsgExt( 'diff-movedto' , 'parseinline', $tagDescription) ); |
| 791 | 791 | } else if ($this->sem == TagToStringFactory::STYLE) { |
| 792 | | - $txt->addHtml($tagDescription . ' ' . wfMsgExt( 'diff-styleadded', 'parseinline' ) ); |
| | 792 | + $txt->addHtml( wfMsgExt( 'diff-styleadded', 'parseinline', $tagDescription ) ); |
| 793 | 793 | } else { |
| 794 | | - $txt->addHtml($tagDescription . ' ' . wfMsgExt( 'diff-added', 'parseinline' ) ); |
| | 794 | + $txt->addHtml( wfMsgExt( 'diff-added', 'parseinline', $tagDescription ) ); |
| 795 | 795 | } |
| 796 | 796 | $this->addAttributes($txt, $this->node->attributes); |
| 797 | 797 | $txt->addHtml('.'); |
| — | — | @@ -844,13 +844,13 @@ |
| 845 | 845 | if( wfEmptyMsg( 'diff-' . $this->node->qName, $tagDescription ) ){ |
| 846 | 846 | $tagDescription = "<" . $this->node->qName . ">"; |
| 847 | 847 | } |
| 848 | | - $txt->addHtml( wfMsgExt('diff-changedto', 'parseinline' ) . ' ' . $tagDescription); |
| | 848 | + $txt->addHtml( wfMsgExt('diff-changedto', 'parseinline', $tagDescription ) ); |
| 849 | 849 | $this->addAttributes($txt, $this->node->attributes); |
| 850 | 850 | $txt->addHtml('.'); |
| 851 | 851 | } |
| 852 | 852 | |
| 853 | 853 | public function getRemovedDescription(ChangeText $txt) { |
| 854 | | - $txt->addHtml( wfMsgExt('diff-changedfrom', 'parseinline' ) . ' ' . $tagDescription); |
| | 854 | + $txt->addHtml( wfMsgExt('diff-changedfrom', 'parseinline', $tagDescription ) ); |
| 855 | 855 | $this->addAttributes($txt, $this->node->attributes); |
| 856 | 856 | $txt->addHtml('.'); |
| 857 | 857 | } |
| — | — | @@ -864,7 +864,7 @@ |
| 865 | 865 | |
| 866 | 866 | protected function addAttributes(ChangeText $txt, array $attributes) { |
| 867 | 867 | if (array_key_exists('href', $attributes)) { |
| 868 | | - $txt->addHtml(' ' . wfMsgExt( 'diff-withdestination', 'parseinline' ) . ' ' . htmlspecialchars($attributes['href'])); |
| | 868 | + $txt->addHtml(' ' . wfMsgExt( 'diff-withdestination', 'parseinline', htmlspecialchars($attributes['href']) ) ); |
| 869 | 869 | unset($attributes['href']); |
| 870 | 870 | } |
| 871 | 871 | parent::addAttributes($txt, $attributes); |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1344,15 +1344,15 @@ |
| 1345 | 1345 | 'editundo' => 'undo', |
| 1346 | 1346 | 'diff-multi' => '({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} not shown.)', |
| 1347 | 1347 | 'diff-movedto' => 'moved to $1', |
| 1348 | | -'diff-styleadded' => 'style added', |
| 1349 | | -'diff-added' => 'added', |
| 1350 | | -'diff-changedto' => 'changed to', |
| | 1348 | +'diff-styleadded' => '$1 style added', |
| | 1349 | +'diff-added' => '$1 added', |
| | 1350 | +'diff-changedto' => 'changed to $1', |
| 1351 | 1351 | 'diff-movedoutof' => 'moved out of $1', |
| 1352 | | -'diff-styleremoved' => 'style removed', |
| 1353 | | -'diff-removed' => 'removed', |
| 1354 | | -'diff-changedfrom' => 'changed from', |
| | 1352 | +'diff-styleremoved' => '$1 style removed', |
| | 1353 | +'diff-removed' => '$1 removed', |
| | 1354 | +'diff-changedfrom' => 'changed from $1', |
| 1355 | 1355 | 'diff-src' => 'source', |
| 1356 | | -'diff-withdestination' => 'with destination', |
| | 1356 | +'diff-withdestination' => 'with destination $1', |
| 1357 | 1357 | 'diff-with' => ' with $1 $2', |
| 1358 | 1358 | 'diff-with-additional' => '$1 $2', # only translate this message to other languages if you have to change it |
| 1359 | 1359 | 'diff-with-final' => ' and $1 $2', |