Changeset 117

Timestamp:

03/29/2009 02:52:42 AM (3 years ago)

Author:

ofer

Message:

Another attempt at #24, seems much better this time

Location:

trunk/WordPress/plugin/transposh

Files:

• js/transposh.js (modified) (3 diffs)
• transposh.css (modified) (2 diffs)
• transposh.php (modified) (4 diffs)
• transposh_db.php (modified) (2 diffs)
• transposh_widget.php (modified) (2 diffs)

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

@@ -59 +59 @@
 //Ajax translation
 function ajax_translate(original,translation,source,segment_id) {
-        var token = jQuery("#tr_" + segment_id).attr('token');
-        var query = 'token=' +  token +
-    '&translation=' + escape(translation) +
-    '&lang=' + transposh_params['lang'] +
-    '&source=' + source +
-    '&translation_posted=1';
-        
     jQuery.ajax({  
         type: "POST",
         url: transposh_params['post_url'],
-        data: query,  
+        data: {token: jQuery("#tr_" + segment_id).attr('token'),
+                                translation: translation,
+                                lang: transposh_params['lang'],
+                                source: source,
+                                translation_posted: "1"},
         success: function(req) {
                 var pre_translated = jQuery("#tr_" + segment_id).html();
@@ -83 +80 @@
                     //current img 
                     var img = jQuery("#tr_img_" + img_segment_id).attr('src');
-
-                    //rewrite onclick function - in case of re-edit
-                    jQuery("#tr_img_" + img_segment_id).click(function () {
-                        translate_dialog(original, translation, img_segment_id);
-                    });
-
-                    // handle image
-                    if(jQuery.trim(translation).length == 0) {
+                    if (img != undefined) {
+                        //rewrite onclick function - in case of re-edit
+                        jQuery("#tr_img_" + img_segment_id).click(function () {
+                                translate_dialog(original, translation, img_segment_id);
+                        });
+                        img = img.substr(0,img.lastIndexOf("/")) + "/";
+                        // handle image
+                        if(jQuery.trim(translation).length == 0) {
                         //switch to the edit img
-                        img = img.replace(/translate_fix.png/, "translate.png");
-                        img = img.replace(/translate_auto.png/, "translate.png");
-                    } else {
-                        if (source == 1) {
-                                //switch to the auto img
-                                img = img.replace(/translate.png/, "translate_auto.png");                               
+                                img += "translate.png";
                         } else {
-                                //switch to the fix img
-                                img = img.replace(/translate.png/, "translate_fix.png");
-                                img = img.replace(/translate_auto.png/, "translate_fix.png");
+                                if (source == 1) {
+                                        //switch to the auto img
+                                        img += "translate_auto.png";                            
+                                } else {
+                                //      switch to the fix img
+                                        img += "translate_fix.png";
+                                }
                         }
-                    }
-                    //rewrite image
-                    jQuery("#tr_img_" + img_segment_id).attr('src', img);
+                        //      rewrite image
+                        jQuery("#tr_img_" + img_segment_id).attr('src', img);
+                    };
                                 
                         });
                 
             //close dialog
-            cClick();
+                if (typeof cClick == 'function' && source == 0) {
+                        cClick();
+                }
         },
                 
@@ -119 +117 @@
         }
     });
-
 }
 

trunk/WordPress/plugin/transposh/transposh.css

@@ -81 +81 @@
 .olraisedBlue {
     text-align:center; 
-    background:#33aaff url(raised_blue.gif) repeat-x bottom left;}
+    background:#33aaff url(js/overlibmws/raised_blue.gif) repeat-x bottom left;}
 
 table.olraisedBlue {
@@ -93 +93 @@
 
 input.olinput {
-    background:white url(inputText.gif) repeat-x bottom left; 
+    background:white url(js/overlibmws/inputText.gif) repeat-x bottom left; 
     min-height:16px;
     font-family:Verdana,Arial,Helvetica,sans-serif; 

trunk/WordPress/plugin/transposh/transposh.php

@@ -145 +145 @@
 
         $url = html_entity_decode($url, ENT_NOQUOTES);
-        
+
         if(!$enable_permalinks_rewrite)
         {
@@ -183 +183 @@
         $url = preg_replace("/&$/", "", $url);
         $url = preg_replace("/\?$/", "", $url);
-                
+
         $url = htmlentities($url, ENT_NOQUOTES);
-        
+
         return $url;
 }
@@ -483 +483 @@
                 return;
         }
+
+        $lang = $wp_query->query_vars[LANG_PARAM];
+        $editable_langs = get_option(EDITABLE_LANGS);
+
+        if(strpos($editable_langs, $lang) === FALSE)
+        {
+                //not an editable language - no need for any css.
+                return;
+        }
+
         //include the transposh.css
         wp_enqueue_style("transposh","$plugin_url/transposh.css",array(),'1.0.1');
@@ -499 +509 @@
                 return;
         }
-        
         $lang = $wp_query->query_vars[LANG_PARAM];
         $editable_langs = get_option(EDITABLE_LANGS);
-        
+
         if(strpos($editable_langs, $lang) === FALSE)
         {
-                //not an editable language - no need for any js.        
-                return;
-        }
-        
+                //not an editable language - no need for any js.
+                return;
+        }
+
         $is_edit_param_enabled = $wp_query->query_vars[EDIT_PARAM];
-        
+
         if (!$is_edit_param_enabled && ! $enable_auto_translate)
         {

trunk/WordPress/plugin/transposh/transposh_db.php

@@ -99 +99 @@
 
 /*
-* Helper function for annoying strings from php escape (%u2019)
-*/
-function utf8_urldecode($str) {
-    $str = preg_replace("/%u([0-9a-f]{3,4})/i","&#x\\1;",urldecode($str));
-    return html_entity_decode($str,null,'UTF-8');;
-}
-
-/*
  * A new translation has been posted, update the translation database.
  */
@@ -115 +107 @@
         $ref=getenv('HTTP_REFERER');
         $original =  base64_url_decode($_POST['token']);
-        $translation = utf8_urldecode($_POST['translation']);
+        $translation = $_POST['translation'];
         $lang = $_POST['lang'];
         $source = $_POST['source'];
 
+        logger("Enter " . __FILE__ . " Params: $original , $translation, $lang," . $ref, 3);
         if(!isset($original) || !isset($translation) || !isset($lang))
         {

trunk/WordPress/plugin/transposh/transposh_widget.php

@@ -45 +45 @@
                         $is_edit = $_POST[EDIT_PARAM];
                         $ref = rewrite_url_lang_param($ref, $lang, $is_edit);
-                        
+
                         //ref is generated with html entities encoded, needs to be
                         //decoded when used in the http header (i.e. 302 redirect)
@@ -210 +210 @@
     $url = preg_replace("/$home_url_quoted\/(..\/)/", "$home_url/",  $url);
 
+    //some more cleans
+    $url = preg_replace("/&$/", "", $url);
+        $url = preg_replace("/\?$/", "", $url);
+
     return $url;
 }