Changeset 698

Timestamp:

12/12/2011 01:23:24 AM (5 months ago)

Author:

ofer

Message:

Better loading for backend scripts, allow changing of comment languages

Location:

trunk/WordPress/plugin/transposh

Files:

• core/constants.php (modified) (1 diff)
• js/transposhbackend.js (modified) (1 diff)
• js/transposhcommentslang.js (added)
• transposh.php (modified) (2 diffs)
• wp/transposh_admin.php (modified) (7 diffs)
• wp/transposh_postpublish.php (modified) (3 diffs)

trunk/WordPress/plugin/transposh/core/constants.php

@@ -111 +111 @@
         'yi' => 'Yiddish,יי֎דיש,europeanunion,'
     );
+    
+    public static function get_language_name($lang) {
+       list ($langname, $langorigname, $flag) = explode(",", transposh_consts::$languages[$lang]);
+       return $langname;
+    }
+
+    public static function get_language_orig_name($lang) {
+       list ($langname, $langorigname, $flag) = explode(",", transposh_consts::$languages[$lang]);
+       return $langorigname;
+    }
+
     // Language which are read from right to left (rtl)
     public static $rtl_languages = array('ar', 'he', 'fa', 'ur', 'yi');

trunk/WordPress/plugin/transposh/js/transposhbackend.js

@@ -261 +261 @@
 
     // If we have a single post, we can just go through with it
-    $(document).ready(function () {
+    $(function () {
         if (t_be.post) {
             translate_post(t_be.post);

trunk/WordPress/plugin/transposh/transposh.php

@@ -711 +711 @@
         if (!($this->edit_mode || $this->is_auto_translate_permitted() || is_admin()))
                 return; // TODO, check just for settings page admin and pages with our translate
-
-        wp_enqueue_script('transposh', $this->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/transposh.js', array('jquery'), TRANSPOSH_PLUGIN_VER);
+        wp_register_script('transposh', $this->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/transposh.js', array('jquery'), TRANSPOSH_PLUGIN_VER);
         // true -> 1, false -> nothing
         $script_params = array(
@@ -761 +760 @@
 //          'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};'
         wp_localize_script('transposh', 't_jp', $script_params);
+        // only enqueue on real pages, other admin scripts that need this will register a dependency
+        if (($this->edit_mode || $this->is_auto_translate_permitted()) && !is_admin()) {
+            wp_enqueue_script('transposh');
+        }
         logger('Added transposh_js', 4);
     }

trunk/WordPress/plugin/transposh/wp/transposh_admin.php

@@ -40 +40 @@
         // register the callback been used if options of page been submitted and needs to be processed
         add_action('admin_post_save_transposh', array(&$this, 'on_save_changes'));
+        // allow language change for comments
+        add_filter('comment_row_actions', array(&$this, 'comment_row_actions'), 999, 2);
         // register ajax callbacks
         add_action('wp_ajax_tp_close_warning', array(&$this, 'on_ajax_tp_close_warning'));
@@ -48 +50 @@
         add_action('wp_ajax_tp_translate_all', array(&$this, 'on_ajax_tp_translate_all'));
         add_action('wp_ajax_tp_post_phrases', array(&$this, 'on_ajax_tp_post_phrases'));
+        add_action('wp_ajax_tp_comment_lang', array(&$this, 'on_ajax_tp_comment_lang'));
     }
 
@@ -171 +174 @@
         // register callback gets call prior your own page gets rendered
         add_action('load-' . $this->pagehook, array(&$this, 'on_load_page'));
+        add_action('load-edit-comments.php', array(&$this, 'on_load_comments_page'));
+    }
+
+    function on_load_comments_page() {
+        wp_enqueue_script('transposhcomments', $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/transposhcommentslang.js', array('jquery'), TRANSPOSH_PLUGIN_VER);
     }
 
@@ -184 +192 @@
         //            wp_enqueue_style("transposh_flags",$this->transposh->transposh_plugin_url."/widgets/flags/tpw_flags.css",array(),TRANSPOSH_PLUGIN_VER);
         wp_enqueue_script('jquery-ui-droppable');
-        wp_enqueue_script('transposh_settings', $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/transposhsettings.js', array(), TRANSPOSH_PLUGIN_VER, true);
+        wp_enqueue_script('transposh_settings', $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/transposhsettings.js', array('transposh'), TRANSPOSH_PLUGIN_VER, true);
         // MAKESURE 3.3+ css
         // wp_enqueue_script('jquery-ui-progressbar');
@@ -190 +198 @@
         wp_enqueue_style('jqueryui', 'http://ajax.googleapis.com/ajax/libs/jqueryui/' . JQUERYUI_VER . '/themes/ui-lightness/jquery-ui.css', array(), JQUERYUI_VER);
         wp_enqueue_script('jqueryui', 'http://ajax.googleapis.com/ajax/libs/jqueryui/' . JQUERYUI_VER . '/jquery-ui.min.js', array('jquery'), JQUERYUI_VER, true);
-        wp_enqueue_script('transposh_backend', $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/transposhbackend.js', array(), TRANSPOSH_PLUGIN_VER, true);
+        wp_enqueue_script('transposh_backend', $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/transposhbackend.js', array('transposh'), TRANSPOSH_PLUGIN_VER, true);
         $script_params = array(
             'l10n_print_after' =>
@@ -592 +600 @@
     }
 
+    function comment_row_actions($actions, $comment) {
+        $comment_lang = get_comment_meta($comment->comment_ID, 'tp_language', true);
+        if (!$comment_lang) {
+            $text = __('Unset', TRANSPOSH_TEXT_DOMAIN);
+        } else {
+            $text = transposh_consts::get_language_orig_name($comment_lang);
+        }
+        $actions['language'] = __('Language', TRANSPOSH_TEXT_DOMAIN) . "(<a data-cid=\"{$comment->comment_ID}\" data-lang=\"{$comment_lang}\" href=\"\" onclick=\"return false\">$text</a>)";
+        return $actions;
+    }
+
     // ajax stuff!
     function on_ajax_tp_close_warning() {
@@ -641 +660 @@
     }
 
+    // Handle comments language change on the admin side
+    function on_ajax_tp_comment_lang() {
+        delete_comment_meta($_GET['cid'], 'tp_language');
+        if ($_GET['lang'])
+                add_comment_meta($_GET['cid'], 'tp_language', $_GET['lang'], true);
+        die();
+    }
+
 }
 

trunk/WordPress/plugin/transposh/wp/transposh_postpublish.php

@@ -55 +55 @@
         if (get_post_meta($_GET['post'], 'transposh_can_translate', true)) { // do isdefined stuff
             $this->just_published = true; // this is later used in the meta boxes //XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-            wp_enqueue_script("transposh_backend", $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/transposhbackend.js', array('jquery'), TRANSPOSH_PLUGIN_VER, true);
+            wp_enqueue_script("transposh_backend", $this->transposh->transposh_plugin_url . '/' . TRANSPOSH_DIR_JS . '/transposhbackend.js', array('transposh'), TRANSPOSH_PLUGIN_VER, true);
             $script_params = array(
                 'post' => $_GET['post'],
@@ -210 +210 @@
      */
     function on_edit($postID) {
+        // TODO - CHECK if (!isset($_POST['transposh_tp_language'])) return;
         add_post_meta($postID, 'transposh_can_translate', 'true', true);
         if ($_POST['transposh_tp_language'] == '') {
@@ -221 +222 @@
             }
         }
-        logger($postID . ' ' . $_POST['transposh_tp_language']);
+        logger($postID . ' ' . $_POST['transposh_tp_language']); //??
     }