From c5d5f81ea23e8ac32789b165791e02c0771d8f31 Mon Sep 17 00:00:00 2001
From: Michael Dale <dale@users.mediawiki.org>
Date: Sat, 31 Oct 2009 19:14:55 +0000
Subject: [PATCH] * some js2 language updates

---
 js2/mwEmbed/jsScriptLoader.php      |  23 ++--
 js2/mwEmbed/php/script-cache/README |   7 +-
 js2/mwEmbed/tests/testLang.html     | 184 +++++++++++++++-------------
 js2/mwEmbed/tests/testLang.js       |   9 +-
 4 files changed, 120 insertions(+), 103 deletions(-)

diff --git a/js2/mwEmbed/jsScriptLoader.php b/js2/mwEmbed/jsScriptLoader.php
index 259675b46b..d65b1dd77e 100644
--- a/js2/mwEmbed/jsScriptLoader.php
+++ b/js2/mwEmbed/jsScriptLoader.php
@@ -173,19 +173,19 @@ class jsScriptLoader {
 			echo $this->jsout;
 		}
 	}
-	
-	function clientAcceptsGzip() {		
+
+	function clientAcceptsGzip() {
 		$m = array();
 		if( preg_match(
 			'/\bgzip(?:;(q)=([0-9]+(?:\.[0-9]+)))?\b/',
 			$_SERVER['HTTP_ACCEPT_ENCODING'],
 			$m ) ) {
-			if( isset( $m[2] ) && ( $m[1] == 'q' ) && ( $m[2] == 0 ) ) 
-				return false;				
+			if( isset( $m[2] ) && ( $m[1] == 'q' ) && ( $m[2] == 0 ) )
+				return false;
 			//no gzip support found
-			return true;	
-		}	
-		return false;	
+			return true;
+		}
+		return false;
 	}
 	/*
 	 * postProcRequestVars uses globals, configuration and mediaWiki to test wiki-titles and files exist etc.
@@ -208,6 +208,15 @@ class jsScriptLoader {
 			$this->urid = $wgStyleVersion;
 		}
 
+		//get the language code (if not provided use the "default" language
+		if ( isset( $_GET['lang'] ) && $_GET['lang'] != '' ) {
+			//make sure its a valid lang code:
+			$this->langCode = preg_replace( "/[^A-Za-z]/", '', $_GET['lang']);
+		}else{
+			//set english as default
+			$this->langCode = 'en';
+		}
+
 		$reqClassList = false;
 		if ( isset( $_GET['class'] ) && $_GET['class'] != '' ) {
 			$reqClassList = explode( ',', $_GET['class'] );
diff --git a/js2/mwEmbed/php/script-cache/README b/js2/mwEmbed/php/script-cache/README
index a42bd3ed47..9704dc4121 100644
--- a/js2/mwEmbed/php/script-cache/README
+++ b/js2/mwEmbed/php/script-cache/README
@@ -1,11 +1,6 @@
-This folder holds cached versions of grouped script requests (if running mwEmbed in stand-alone-mode.
-(otherwise  $wgFileCacheDirectory from mediaWiki is used) 
+This folder holds cached versions of grouped script requests
 
 Be sure to enable write access by your web-server to this directory. 
-  
-You can specify a different directory by updating the $wgFileCacheDirectory variable in noMediaWikiConfig.php
 
 You can empty this directory at any time and should not be a problem.
 
-You may want to update your include call since the script server sends long expire headers since it ment to work in conjunction with mediaWiki dynamic pages that output fresh request ids as scripts update. 
-
diff --git a/js2/mwEmbed/tests/testLang.html b/js2/mwEmbed/tests/testLang.html
index 1f10058da5..3c6a7b4c76 100644
--- a/js2/mwEmbed/tests/testLang.html
+++ b/js2/mwEmbed/tests/testLang.html
@@ -8,11 +8,14 @@ td{
 }
 </style>
 <script type="text/javascript" >
+//for just setting one or two to test at a time for debug
+var langKeyDebug = ['en'];
+
 //shortLangKey is an array of at least one language from every group in cldrConverter.php
-var shortLangKey = ['en','az', 'da', 'pt'];
+var langKeyGroups = ['en','az', 'da', 'pt', 'fr', 'lv', 'ga','hr','cy','mk','mt','pl','sl'];
 
 //longlangKey is every language we have a much more verbose test
-var longLangKey = [
+var langKeyAll = [
 		//no plurals, there are no rules
 		'az','fa','hu','ja','ko','my to','tr','vi','yo','zh',
 		'bo','dz','id','jv ka','km','kn','ms','th',
@@ -173,103 +176,116 @@ var longLangKey = [
 
 js2AddOnloadHook( function(){
 	//do mauall script loaders calls to test multiple languages:
-	
+	function doLangTable(langSet){		
 		//build table output: 
-		var o = '<table>';		
-		var msgTestSet = { 
-					
-			'test_plural_msg':[ 0, 1, 2, 5, 21, 30 ], 
-			
-			'undelete_short': [ 0, 1, 2, 5, 21, 30 ],
-			
+		var msgTestSet = { 												
+			'undelete_short': [ 0, 1, 2, 5, 21, 30 ],			
 			//category-subcat-count' has two params:
 			'category-subcat-count' : [ 
 				[0,10], 
 				[1,2], 
-				[3,30] ]
-			
-			};
+				[3,30] 
+			]			
+		};
 					
 		var passTest=0;
 		var failTest=0;
 		var testCount=0;	
-		//now for each langage msg: 
-		$j.each(msgTestSet, function(mKey, mTestSet){
-			//output table names:
-			o+='<tr>'+
-					'<td>$1:</td>'+
-					'<td width="14%">Msg key</td>'+
-					'<td width="34%">Msg text</td>'+
-					'<td width="24%">Msg Transform JS</td>'+
-					'<td width="24%">Msg Transform Mw</td>'+
-				'</tr>';
-		
-			//for each number value
-			for(var i in mTestSet){
-				var numVal = mTestSet[i];						
-				var numKey = (typeof numVal== 'object')? numVal.join( '_' ).replace('/ /', '_') : numVal; 											
-				o+='<tr>'+
-						'<td>' + numVal + '</td>' + 
-						'<td>' + mKey + '</td>' + 
-						'<td>' + $mw.lang.gMsgNoTrans( mKey ) + '</td>' + 
-						'<td id="' + mKey + '_' + numKey + '_js">' + $mw.lang.gM( mKey, numVal ) + '</td>';
-				//show mw col:						
-				if( mKey.substr(0, 5) == 'test_' ){
-					o+='<td> (test msg) </td>';
-				}else{  
-					o+='<td id="' + mKey + '_' + numKey + '">loading...</td>';					
-					
-					//get transform from mw (& compare and highlight)
-					function doPopWmMsg(mKey, numVal, numKey){ 
-						testCount++;
-						$j('#score_card').html('Running Tests <span id="perc_done">0</sapn>% done');												
-						do_api_req({
-							'data': {
-								'action':'parse',
-								'text': $mw.lang.gMsgSwap( mKey, numVal)
-							},
-							'url' : '../../../api.php'					
-						}, function( data ) {							
-							var t = '#'+ mKey + '_'+ numKey; 
-							if(data.parse && data.parse.text && data.parse.text['*']){
-								$j(t).html( data.parse.text['*'] );
-								//just get the part in the <p> to compare with js version
-								if( $j.trim( $j(t + ' p').html() )  != $j.trim( $j(t + '_js').html() ) ){									
-									$j(t).css('color', 'red');
-									failTest++;
-								}else{
-									$j(t).css('color', 'green');
-									passTest++;
-								}
-								var perc = ( failTest + passTest ) / testCount
-								if( perc != 1){
-									$j('#perc_done').html( Math.round(perc*1000)/1000 + '%');
-								}else{
-									$j('#score_card').html( "Passed: " + passTest + ' Failed:' +failTest);
-								}			
-							}else{
-								$t.html(' error ');
-							}
-						});
-					};
-					//pop off an anonymous function call: 
-					doPopWmMsg(mKey, numVal, numKey);
-				} 
-				o+='</tr>';										
-			}
-			//output a spacer:
-			o+='<tr><td colspan="6" height="20"> </td></tr>';			
-		});
-		o+='</table>';
-		//put the output into the page: 
-		$j('#table_out').html( o );
+		$j.each(langSet, function(na, langKey){					
+			js_log('load language key: ' + langKey);			
+			//do a manual call to the script-lodaer:
+			js_log('do load: ' + '../../../mwScriptLoader.php?class=$mw.testLang&urid=5&lang='+langKey );
+			$j.getScript('../../../mwScriptLoader.php?class=$mw.testLang&urid=8&lang='+langKey, function(){
+				var o='';
+				o+='<tr><td colspan="6" height="20" style="font-size:large"><b>Lang:' + langKey + '</b></td></tr>';		
+				//now for each langage msg: 
+				$j.each(msgTestSet, function(mKey, mTestSet){
+					//output table names:
+					o+='<tr>'+
+							'<td>$1[,$2]</td>'+
+							'<td width="14%">Msg key</td>'+
+							'<td width="34%">Msg text</td>'+
+							'<td width="24%">Msg Transform JS</td>'+
+							'<td width="24%">Msg Transform Mw</td>'+
+						'</tr>';
+				
+					//for each number value
+					for(var i in mTestSet){
+						var numVal = mTestSet[i];						
+						var numKey = (typeof numVal== 'object')? numVal.join( '_' ).replace('/ /', '_') : numVal;
+						var tkey = mKey + '_' + numKey + '_' + langKey; 											
+						o+='<tr>'+
+								'<td>' + numVal + '</td>' + 
+								'<td>' + mKey + '</td>' + 
+								'<td>' + $mw.lang.gMsgNoTrans( mKey ) + '</td>' + 
+								'<td id="' + tkey + '_js">' + $mw.lang.gM( mKey, numVal ) + '</td>';
+						//show mw col:						
+						if( mKey.substr(0, 5) == 'test_' ){
+							o+='<td> (test msg) </td>';
+						}else{  
+							o+='<td id="' + tkey + '">loading...</td>';					
+							
+							//get transform from mw (& compare and highlight)
+							function doPopWmMsg(mKey, numVal, numKey){ 
+								//set the local tkey:
+								var tkey = mKey + '_' + numKey + '_' + langKey;
+								testCount++;
+								$j('#score_card').html('Running Tests <span id="perc_done">0</sapn>% done');	
+								var msgparam = (typeof numVal== 'object')? numVal.join( '|' ) : numVal;		
+								do_api_req({
+									'data': {
+										'action' : 'parse',
+										'text' : '{{int:' + mKey + '|' + msgparam + '}}'
+									},
+									'url' : '../../../api.php'					
+								}, function( data ) {							
+									var t = '#'+ tkey ; 								
+									if(data.parse && data.parse.text && data.parse.text['*']){
+										$j(t).html( data.parse.text['*'] );
+										//just get the part in the <p> to compare with js version
+										if( $j.trim( $j(t + ' p').html() )  != $j.trim( $j(t + '_js').html() ) ){									
+											$j(t).css('color', 'red');
+											failTest++;
+										}else{
+											$j(t).css('color', 'green');
+											passTest++;
+										}
+										var perc = ( failTest + passTest ) / testCount
+										if( perc != 1){
+											$j('#perc_done').html( Math.round(perc*1000)/1000 + '%');
+										}else{
+											var failHtlm = (failTest == 0)?failTest: '<span style="color:red">'+ failTest+'</span>';
+											$j('#score_card').html( 
+												'Passed: <span style="color:green">' + passTest + '</span> Failed:' + failHtlm );
+										}			
+									}else{
+										$t.html(' error ');
+									}
+								});
+							};
+							//pop off an anonymous function call
+							doPopWmMsg(mKey, numVal, numKey);
+						} 
+						o+='</tr>';										
+					}
+					//output a spacer:
+					o+='<tr><td colspan="6" height="20"> </td></tr>';			
+				});
+				//put the output into the page: 
+				$j('#table_out').append( o );
+			});
+		});// each lang key
+	}
+	//by default run the "debug" set:
+	doLangTable( langKeyDebug );
 });
+
 </script>
 </head>
 <body>
 <h3>Test Javascript plural msg transformations</h3>
 <div id="score_card" style="font-size:large"></div>
-<div id="table_out"></div>
+<table id="table_out"></table>
 
 
 </body>
diff --git a/js2/mwEmbed/tests/testLang.js b/js2/mwEmbed/tests/testLang.js
index 2314304f45..10a346e5b0 100644
--- a/js2/mwEmbed/tests/testLang.js
+++ b/js2/mwEmbed/tests/testLang.js
@@ -1,12 +1,9 @@
 /* a simple language tester replacements
  */
 
-loadGM({
-	//test msg with English words to see whats going on
-	'test_plural_msg' : '{{PLURAL:$1|one|other}}',
-	//sample real world msgs: 
-	'undelete_short'  : 'Undelete {{PLURAL:$1|one edit|$1 edits}}',
-	'category-subcat-count' : "fish {{PLURAL:$2|This {{PLURAL:$1|fistsub|$1 secondsub}} category has only the following subcategory.|This category has the following {{PLURAL:$1|subcategory|$1 subcategories}}, out of $2 total.}}"	
+loadGM({	
+	"undelete_short"  : "Undelete {{PLURAL:$1|one edit|$1 edits}}",
+	"category-subcat-count" : "{{PLURAL:$2|This category has only the following subcategory.|This category has the following {{PLURAL:$1|subcategory|$1 subcategories}}, out of $2 total.}}"	
 });
 
 $mw.lang.loadRS({
-- 
2.20.1