From e3d5b7c1501ecbd8d75855b020ae8d75eab6f296 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Wed, 17 Aug 2005 15:18:29 +0000
Subject: [PATCH] define 'msgmerge' options. Default to -v (verbose)

---
 maintenance/lang2po.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/maintenance/lang2po.php b/maintenance/lang2po.php
index dd9b014d33..3252fd0b56 100644
--- a/maintenance/lang2po.php
+++ b/maintenance/lang2po.php
@@ -16,7 +16,8 @@ define('XGETTEXT_BIN',     'xgettext');
 define('MSGMERGE_BIN',     'msgmerge');
 
 // used to generate the .pot
-define('XGETTEXT_OPTIONS', '-n --keyword=wfMsg --keyword=wfMsgForContent ');
+define('XGETTEXT_OPTIONS', '-n --keyword=wfMsg --keyword=wfMsgForContent --keyword=wfMsgHtml --keyword=wfMsgWikiHtml ');
+define('MSGMERGE_OPTIONS', ' -v ');
 
 define('LOCALE_OUTPUT_DIR', $IP.'/locale');
 
@@ -120,9 +121,9 @@ function applyPot($langcode) {
 	$dest = $langdir.'/messages.po';
 
 	// Merge template and generate file to get final .po	
-	exec(MSGMERGE_BIN." $from $pot -o $dest ");
+	exec(MSGMERGE_BIN.MSGMERGE_OPTIONS." $from $pot -o $dest ");
 	// delete no more needed file
-	unlink($from);
+//	unlink($from);
 }
 
 // Generate a template .pot based on source tree
-- 
2.20.1