r83348 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r83347‎ | r83348 | r83349 >
Date:01:00, 6 March 2011
Author:siebrand
Status:deferred
Tags:
Comment:
Use --output-file instead of --update for msgmerge. Otherwise line length will not be corrected if the target file is up to date with the POT file.
Modified paths:
  • /trunk/extensions/Translate/scripts/export.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Translate/scripts/export.php
——@@ -146,7 +146,7 @@
147147 if ( $definitionFile ) {
148148 if ( is_file( $definitionFile ) ) {
149149 $targetFileName = $ffs->getWritePath() . $group->getTargetFilename( $collection->code );
150 - $cmd = "msgmerge --quiet --update --backup=off " . $targetFileName . ' ' . $definitionFile;
 150+ $cmd = "msgmerge --quiet --output-file=" . $targetFileName . ' ' . $targetFileName . ' ' . $definitionFile;
151151 wfShellExec( $cmd, $ret );
152152
153153 // Report on errors.

Status & tagging log