* updated php merge script to accept -j (to merge php msg to js) and -p to merge...

diff --git a/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php b/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php
index 91a9732..44d9982 100644 (file)
--- 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 ";