From 981c252b0dd286b4c314d2219197f6ed244a2c64 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Tue, 16 Aug 2005 20:58:27 +0000
Subject: [PATCH] merge the generated .po with the .pot generated from source.

---
 maintenance/lang2po.php | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/maintenance/lang2po.php b/maintenance/lang2po.php
index 4e7ebae4b6..2976a7e5e9 100644
--- a/maintenance/lang2po.php
+++ b/maintenance/lang2po.php
@@ -13,7 +13,8 @@ require_once('languages.inc');
 
 define('ALL_LANGUAGES',    true);
 define('XGETTEXT_BIN',     'xgettext');
-define('MSGINIT_BIN',      'msginit');
+define('MSGMERGE_BIN',     'msgmerge');
+
 define('XGETTEXT_OPTIONS', '-n --keyword=wfMsg ');
 
 define('LOCALE_OUTPUT_DIR', $IP.'/locale');
@@ -98,14 +99,27 @@ function generatePo($langcode, &$messages) {
 	}
 }
 
+function applyPot($langcode) {
+	$langdir = LOCALE_OUTPUT_DIR.'/'.$langcode;
+
+	$from = $langdir.'/fromlanguagefile.po';
+	$pot = LOCALE_OUTPUT_DIR.'/wfMsg.pot';
+	$dest = $langdir.'/messages.po';
+
+	// Merge template and generate file to get final .po	
+	exec(MSGMERGE_BIN." $from $pot -o $dest ");
+	// delete no more needed file
+	unlink($from);
+}
 
 // Generate a template .pot based on source tree
-echo "Getting 'gettext' default messages from sources\n";
+echo "Getting 'gettext' default messages from sources:";
 exec( XGETTEXT_BIN
   .' '.XGETTEXT_OPTIONS
   .' -o '.$IP.'/locale/wfMsg.pot'
   .' '.$IP.'/includes/*php'
   );
+echo "done.\n";
 
 
 $langTool = new languages();
@@ -121,6 +135,9 @@ foreach ( $langTool->getList() as $langcode) {
 		echo "ok\n";
 		if( ! generatePo($langcode, $$arr) ) {
 			echo "ERROR: Failed to wrote file.\n";
+		} else {
+			echo "Applying template:";
+			applyPot($langcode);
 		}
 	}
 }
-- 
2.20.1