[Phpfreechat-svn] SF.net SVN: phpfreechat: [680] trunk/src

[<ke...@us...>]

Revision: 680
Author:   kerphi
Date:     2006-08-18 14:44:47 -0700 (Fri, 18 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/phpfreechat/?rev=680&view=rev

Log Message:
-----------
Now the pfcResource::getLabel javascript method can handle multi-parameters.

Modified Paths:
--------------
    trunk/src/client/pfcresource.js
    trunk/src/phpfreechat.class.php

Added Paths:
-----------
    trunk/lib/javascript/sprintf2.js
Added: trunk/lib/javascript/sprintf2.js
===================================================================
--- trunk/lib/javascript/sprintf2.js	                        (rev 0)
+++ trunk/lib/javascript/sprintf2.js	2006-08-18 21:44:47 UTC (rev 680)
@@ -0,0 +1,27 @@
+function sprintf2(arg) {
+ if( arg.length < 2 ) {
+  return arg[0];
+ }
+ var data = arg[ 0 ];
+ for( var k=1; k<arg.length; ++k ) {
+  switch( typeof( arg[ k ] ) )
+  {
+   case 'string':
+    data = data.replace( /%s/, arg[ k ] );
+    break;
+   case 'number':
+    data = data.replace( /%d/, arg[ k ] );
+    break;
+   case 'boolean':
+    data = data.replace( /%b/, arg[ k ] ? 'true' : 'false' );
+    break;
+   default:
+    /// function | object | undefined
+    break;
+  }
+ }
+ return( data );
+}
+if( !String.sprintf2 ) {
+ String.sprintf2 = sprintf2;
+}
\ No newline at end of file

Modified: trunk/src/client/pfcresource.js
===================================================================
--- trunk/src/client/pfcresource.js	2006-08-18 16:40:23 UTC (rev 679)
+++ trunk/src/client/pfcresource.js	2006-08-18 21:44:47 UTC (rev 680)
@@ -19,10 +19,11 @@
     this.labels[key] = value;
   },
 
-  getLabel: function(key, params)
+  getLabel: function()
   {
+    var key = this.getLabel.arguments[0];
     if (this.labels[key])
-      return this.labels[key];
+      return String.sprintf2(this.getLabel.arguments); //this.labels[key];
     else
       return "";
   },
@@ -62,3 +63,20 @@
   }
   
 };
+
+
+
+
+
+ 
+
+
+
+ 
+
+
+
+
+
+
+

Modified: trunk/src/phpfreechat.class.php
===================================================================
--- trunk/src/phpfreechat.class.php	2006-08-18 16:40:23 UTC (rev 679)
+++ trunk/src/phpfreechat.class.php	2006-08-18 21:44:47 UTC (rev 680)
@@ -108,6 +108,7 @@
     $js[] = "lib/javascript/myprototype.js";
     $js[] = "lib/javascript/regex.js";
     $js[] = "lib/javascript/utf8.js";
+    $js[] = "lib/javascript/sprintf2.js";
     $js[] = "src/client/pfcclient.js";
     $js[] = "src/client/pfcgui.js";
     $js[] = "src/client/pfcresource.js";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.