From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Sun, 23 Aug 2009 12:53:57 +0000 (+0000)
Subject: * for php2js, all colons in messages will be replaced by " : ". That's not really... 
X-Git-Tag: 1.31.0-rc.0~40092
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=eea7122dd1c867f520af60619cc9feff2771d464;p=lhc%2Fweb%2Fwiklou.git

* for php2js, all colons in messages will be replaced by " : ". That's not really needed. Commented out and added FIXME. Was introduced in r55290.
* update command line output
---

diff --git a/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php b/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php
index 6760f54684..066642c9ea 100644
--- a/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php
+++ b/js2/mwEmbed/php/maintenance/mergeJavascriptMsg.php
@@ -126,14 +126,14 @@ function doJsonMerge( $json_txt ) {
 			if ( file_put_contents( $fname, $str ) ) {
 				print "\nupdated $curFileName from php\n\n";
 			} else {
-				die( "could not write to: " . $fname );
+				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";
+		print "Could not get any json vars from: $curFileName\n";
 		return '';
 	}
 }
@@ -170,9 +170,11 @@ function jsonReadable( $json ) {
 						$result .= $char . $newline . str_repeat( $tab, $tabcount );
 					}
 				break;
+/* FIXME: this will change "key" : "message:" to "key" : "messages : ". Not intended.
+          now "key" : "message" will become "key":"message:", but that's not too big of a problem.
 					case ':':
 					$result .= ' ' . $char . ' ';
-					break;
+					break; */
 				case '"':
 					$inquote = !$inquote;
 					$result .= $char;