Changeset 4968

Timestamp:

03/06/2007 12:39:46 AM (18 years ago)

Author:

ryan

Message:

JS localization from mdawaffe. fixes #3911

Location:

trunk/wp-includes

Files:

• js/list-manipulation.js (moved) (moved from trunk/wp-includes/js/list-manipulation-js.php) (4 diffs)
• script-loader.php (modified) (7 diffs)

trunk/wp-includes/js/list-manipulation.js

@@ -1 @@
-<?php @require_once('../../wp-config.php'); cache_javascript_headers(); ?>
-addLoadEvent(function(){theList=new listMan();});
-function deleteSomething(what,id,message,obj){if(!obj)obj=theList;if(!message)message="<?php printf(js_escape(__('Are you sure you want to delete this %s?')),"'+what+'"); ?>";if(confirm(message))return obj.ajaxDelete(what,id);else return false;}
-function dimSomething(what,id,dimClass,obj){if(!obj)obj=theList;return obj.ajaxDimmer(what,id,dimClass);}
+addLoadEvent( function() {
+    if ( 'undefined' != typeof listManL10n )
+        Object.extend(listMan.prototype, listManL10n);
+    theList = new listMan();
+} );
+
+function deleteSomething( what, id, message, obj ) {
+    if ( !obj )
+        obj=theList;
+    if ( !message )
+        message = obj.delText.replace(/%/g, what);
+    if( confirm(message) )
+        return obj.ajaxDelete( what, id );
+    else return false;
+}
+
+function dimSomething( what, id, dimClass, obj ) {
+    if ( !obj )
+        obj = theList;
+    return obj.ajaxDimmer(what,id,dimClass);
+}
 
 var listMan = Class.create();
@@ -19 +36 @@
     dataStore: null,
     formStore: null,
+
+    jumpText: 'Jump to new item',
+    delText: 'Are you sure you want to delete this %s?',
 
     initialize: function(theListId) {
@@ -54 +74 @@
                         showLinkMessage += m;
                     else
-                        showLinkMessage += "<a href='#" + what + '-' + id + "'><?php echo js_escape(__('Jump to new item')); ?>";
+                        showLinkMessage += "<a href='#" + what + '-' + id + "'>" + tempObj.jumpText + "</a>";
                 });
                 if ( tempObj.showLink && showLinkMessage )
@@ -128 +148 @@
         var id = this.topAdder ? this.theList.firstChild.id : this.theList.lastChild.id;
         if ( this.alt )
-            if ( this.theList.childNodes.length % 2 )
+            if ( ( this.theList.childNodes.length + this.altOffset ) % 2 )
                 Element.addClassName($(id),this.alt);
         Fat.fade_element(id);

trunk/wp-includes/script-loader.php

@@ -22 +22 @@
         $this->add( 'autosave', '/wp-includes/js/autosave-js.php', array('prototype', 'sack'), '20070116');
         $this->add( 'wp-ajax', '/wp-includes/js/wp-ajax-js.php', array('prototype'), '20070118');
-        $this->add( 'listman', '/wp-includes/js/list-manipulation-js.php', array('wp-ajax', 'fat'), '20070118');
+        $this->add( 'listman', '/wp-includes/js/list-manipulation.js', array('wp-ajax', 'fat'), '20070305');
+        $this->localize( 'listman', 'listManL10n', array(
+            'jumpText' => __('Jump to new item'),
+            'delText' => __('Are you sure you want to delete this %s?')
+        ) );
         $this->add( 'scriptaculous-root', '/wp-includes/js/scriptaculous/wp-scriptaculous.js', array('prototype'), '1.7.0');
         $this->add( 'scriptaculous-builder', '/wp-includes/js/scriptaculous/builder.js', array('scriptaculous-root'), '1.7.0');
@@ -84 +88 @@
                     $src = apply_filters( 'script_loader_src', $src );
                     echo "<script type='text/javascript' src='$src'></script>\n";
+                    $this->print_scripts_l10n( $handle );
                 }
                 $this->printed[] = $handle;
@@ -90 +95 @@
     }
 
+    function print_scripts_l10n( $handle ) {
+        if ( empty($this->scripts[$handle]->l10n_object) || empty($this->scripts[$handle]->l10n) || !is_array($this->scripts[$handle]->l10n) )
+            return;
+
+        $object_name = $this->scripts[$handle]->l10n_object;
+
+        echo "<script type='text/javascript'>\n";
+        echo "/* <![CDATA[ */\n";
+        echo "\t$object_name = {\n";
+        $eol = '';
+        foreach ( $this->scripts[$handle]->l10n as $var => $val ) {
+            echo "$eol\t\t$var: \"" . js_escape( $val ) . '"';
+            $eol = ",\n";
+        }
+        echo "\n\t}\n";
+        echo "/* ]]> */\n";
+        echo "</script>\n";
+    }
 
     /**
@@ -141 +164 @@
     }
 
+    /**
+     * Localizes a script
+     *
+     * Localizes only if script has already been added
+     *
+     * @param string handle Script name
+     * @param string object_name Name of JS object to hold l10n info
+     * @param array l10n Array of JS var name => localized string
+     * @return bool Successful localization
+     */
+    function localize( $handle, $object_name, $l10n ) {
+        if ( !isset($this->scripts[$handle]) )
+            return false;
+        return $this->scripts[$handle]->localize( $object_name, $l10n );
+    }
+
     function remove( $handles ) {
         foreach ( (array) $handles as $handle )
@@ -183 +222 @@
     var $deps = array();
     var $ver = false;
-    var $args = false;
+    var $l10n_object = '';
+    var $l10n = array();
 
     function _WP_Script() {
@@ -192 +232 @@
             $this->ver = false;
     }
+
+    function localize( $object_name, $l10n ) {
+        if ( !$object_name || !is_array($l10n) )
+            return false;
+        $this->l10n_object = $object_name;
+        $this->l10n = $l10n;
+        return true;
+    }
 }
 
@@ -228 +276 @@
 }
 
+/**
+ * Localizes a script
+ *
+ * Localizes only if script has already been added
+ *
+ * @see WP_Script::localize()
+ */
+function wp_localize_script( $handle, $object_name, $l10n ) {
+    global $wp_scripts;
+    if ( !is_a($wp_scripts, 'WP_Scripts') )
+        return false;
+
+    return $wp_scripts->localize( $handle, $object_name, $l10n );
+}
+
 function wp_deregister_script( $handle ) {
     global $wp_scripts;