From 9b120272b51cb20cb3e4ca4d03ea19b19ae4d462 Mon Sep 17 00:00:00 2001
From: Michael Dale <dale@users.mediawiki.org>
Date: Thu, 1 Oct 2009 18:10:45 +0000
Subject: [PATCH] * updated php merge script to accept -j (to merge php msg to
 js) and -p to merge js msg to php)

---
 .../php/maintenance/mergeJavascriptMsg.php    | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php b/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php
index 91a97323b1..44d9982cb0 100644
--- a/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php
+++ b/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php
@@ -20,14 +20,32 @@ $mwEND_MSG_KEY = ',
 );';
 $mwLangFilePath = '../languages/mwEmbed.i18n.php';
 include_once( $mwLangFilePath );
-// get options (like override JS or override PHP)
 
-// merge left
-$mergeToPhp = false;
-$mergeToJS = true;
+function print_help(){
+?>
+This script helps merge msgs between javascript and php
+Usage:
+	-j merges javascript msgs into php
+	-p merges php msgs back into javascript
+
+<?php
+die();
+}
+
+// get options (like override JS or override PHP)
+if ($argc != 2 || in_array($argv[1], array('--help', '-help', '-h', '-?'))) {
+	print_help();
+}
+$mergeToPhp = $mergeToJS = false;
+
+if( $argv[1] == '-j' ){
+	$mergeToPhp = true;
+}else if( $argv[1] == '-p' ) {
+	$mergeToJS = true;
+}else{
+	print_help();
+}
 
-if ( $mergeToPhp && $mergeToJS )
-die( 'Please only set either $mergeToPhp or $mergeToJS' );
 
 if ( $mergeToPhp )
 print "Will merge *Javascript to PHP* in 3 seconds ";
-- 
2.20.1