* added support for merging php -> js (already supported js -> php)

diff --git a/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php b/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php
index ec97bf3..70f8855 100644 (file)
--- a/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php
+++ b/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php
@@ -1,10 +1,10 @@
 <?php
 /**
-* Merges in JavaScript with mwEmbed.i18n.php
-*
-* @file
-* @ingroup Maintenance
-*/
+ * Merges in JavaScript with mwEmbed.i18n.php
+ *
+ * @file
+ * @ingroup Maintenance
+ */
 
 # Abort if called from a web server
 if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
@@ -13,69 +13,171 @@ if ( isset( $_SERVER ) && array_key_exists( 'REQUEST_METHOD', $_SERVER ) ) {
 }
 define( 'MEDIAWIKI', true );
 // get the scriptLoader globals:
-require_once( '../../jsScriptLoader.php' );
+require_once('../../jsScriptLoader.php');
 
 $mwSTART_MSG_KEY = '$messages[\'en\'] = array(';
 $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;
+
+if( $mergeToPhp && $mergeToJS)
+       die('please only set either $mergeToPhp or $mergeToJS');
+
+if( $mergeToPhp )
+       print "Will merge *Javascript to PHP* in 3 seconds ";
+
+if( $mergeToJS )
+       print "Will merge *PHP to Javascript* in 3 seconds ";
+
+for($i=0;$i<3;$i++){
+       print '.';
+       sleep(1);
+}
+
 // read in mwEmbed.i18n.php
 $rawLangFile = file_get_contents( $mwLangFilePath );
 
-$startInx = strpos( $rawLangFile, $mwSTART_MSG_KEY ) + strlen( $mwSTART_MSG_KEY );
-$endInx = strpos( $rawLangFile, $mwEND_MSG_KEY ) + 1;
-if ( $startInx === false || $endInx === false ) {
-       print "Could not find $mwSTART_MSG_KEY or $mwEND_MSG_KEY in mwEmbed.i18n.php \n";
+$startInx = strpos( $rawLangFile, $mwSTART_MSG_KEY) + strlen( $mwSTART_MSG_KEY );
+$endInx = strpos( $rawLangFile, $mwEND_MSG_KEY ) +1;
+if( $startInx === false || $endInx === false ){
+    print "Could not find $mwSTART_MSG_KEY or $mwEND_MSG_KEY in mwEmbed.i18n.php \n";
        exit();
 }
 
 $preFile = substr( $rawLangFile, 0, $startInx );
-$msgSet = substr( $rawLangFile, $startInx, $endInx - $startInx );
+$msgSet = substr( $rawLangFile, $startInx, $endInx-$startInx );
 $postFile = substr( $rawLangFile, $endInx );
 
 // build replacement from all javascript in mwEmbed
-$path = realpath( '../../' );
+$path = realpath('../../');
 
 $curFileName = '';
 // @@todo existing msgSet should be parsed (or we just "include" the file first)
 $msgSet = "";
 
 $objects = new RecursiveIteratorIterator( new RecursiveDirectoryIterator( $path ), RecursiveIteratorIterator::SELF_FIRST );
-foreach ( $objects as $fname => $object ) {
-       if ( substr( $fname, - 3 ) == '.js' ) {
-               $jsFileText = file_get_contents( $fname );
-               $mwPos = strpos( $fname, 'mwEmbed' ) + 7;
-               $curFileName = substr( $fname, $mwPos );
-               if ( preg_match( '/loadGM\s*\(\s*{(.*)}\s*\)\s*/siU',   // @@todo fix: will break down if someone does }) in their msg text
-               $jsFileText,
-               $matches ) ) {
+foreach( $objects as $fname => $object){
+    if( substr( $fname, -3 ) == '.js' ){
+        $jsFileText = file_get_contents( $fname );
+        $mwPos = strpos( $fname, 'mwEmbed' ) + 7;
+        $curFileName = substr( $fname, $mwPos );
+        if( preg_match( '/loadGM\s*\(\s*{(.*)}\s*\)\s*/siU',   //@@todo fix: will break down if someone does }) in their msg text
+                                     $jsFileText,
+                                     $matches ) ){
                        $msgSet .= doJsonMerge( $matches[1] );
                }
        }
 }
-
-// rebuild and output to file
-if ( file_put_contents( $mwLangFilePath, trim( $preFile ) . "\n\t" . trim( $msgSet ) . "\n" . trim( $postFile ) ) ) {
-       print "Updated $mwLangFilePath file\n";
-       exit();
+// rebuild and output to single php file if mergeToPHP is on
+if($mergeToPhp){
+       if( file_put_contents( $mwLangFilePath, trim( $preFile ) . "\n\t" . trim( $msgSet ) . "\n" . trim( $postFile ) ) ){
+           print "updated $mwLangFilePath file\n";
+           exit();
+       }
 }
 
-function doJsonMerge( $json_txt ) {
-       global $curFileName;
 
-       $out = "\n\t/*
-\t * js file: {$curFileName}
-\t */\n";
+function doJsonMerge( $json_txt ){
+    global $curFileName,$fname, $messages, $mergeToJS, $jsFileText;
+
+    $outPhp = "\n\t/*
+\t* js file: {$curFileName}
+\t*/\n";
+
+       $jsMsgAry = array();
+       $doReplaceFlag = false;
+
        $jmsg = json_decode( '{' . $json_txt . '}', true );
-       if ( count( $jmsg ) != 0 ) {
-               foreach ( $jmsg as $k => $v ) {
-                       $out .= "\t'{$k}' => '" . str_replace( '\'', '\\\'', $v ) . "',\n";
+    if( count( $jmsg ) != 0 ){
+
+       foreach( $jmsg as $k => $v ){
+                       //check if the existing value is changed and merge and merge ->right
+                       if(isset( $messages['en'][$k] )){
+                               if($messages['en'][$k] != $v )
+                                       $doReplaceFlag=true;
+                               //add the actual value:
+                               $jsMsgAry[$k] = $messages['en'][$k];
+                               $doReplaceFlag=true;
+                       };
+               $outPhp.="\t'{$k}' => '" . str_replace( '\'', '\\\'', $v ) . "',\n";
                }
-               return $out;
-       } else {
-               print "Could not get any json vars from $curFileName\n";
-               return '';
-       }
+               //merge the jsLanguage array back in and wrap the output
+               if($mergeToJS){
+                       $json = json_encode($jsMsgAry );
+                       $json_txt = jsonReadable($json);
+                       //escape $1 for preg replace:
+                       $json_txt = str_replace('$', '\$', $json_txt);
+                       $str = preg_replace ('/loadGM\s*\(\s*{(.*)}\s*\)\s*/siU',
+                               "loadGM(" . $json_txt . ")",
+                                $jsFileText);
+
+                       if( file_put_contents($fname, $str) ){
+                               print "updated $curFileName from php\n";
+                       }else{
+                               die("could not write to: " . $fname);
+                       }
+               }
+               //return phpOut for building msgSet in outer function
+               return $outPhp;
+
+    } else {
+        print "could not get any json vars from:$curFileName \n";
+        return '';
+    }
+}
+
+function jsonReadable($json) {
+    $tabcount = 0;
+    $result = '';
+    $inquote = false;
+    $ignorenext = false;
+
+
+       $tab = "\t";
+       $newline = "\n";
+
+    for($i = 0; $i < strlen($json); $i++) {
+        $char = $json[$i];
+
+        if ($ignorenext) {
+            $result .= $char;
+            $ignorenext = false;
+        } else {
+            switch($char) {
+                case '{':
+                    $tabcount++;
+                    $result .= $char . $newline . str_repeat($tab, $tabcount);
+                    break;
+                case '}':
+                    $tabcount--;
+                    $result = trim($result) . $newline . str_repeat($tab, $tabcount) . $char;
+                    break;
+                case ',':
+                    $result .= $char . $newline . str_repeat($tab, $tabcount);
+                    break;
+                case ':':
+                       $result .= ' ' . $char . ' ';
+                       break;
+                case '"':
+                    $inquote = !$inquote;
+                    $result .= $char;
+                    break;
+                case '\\':
+                    if ($inquote) $ignorenext = true;
+                    $result .= $char;
+                    break;
+                default:
+                    $result .= $char;
+            }
+        }
+    }
+
+    return $result;
 }
+?>
\ No newline at end of file