Changeset 59

Timestamp:

03/03/2009 10:23:57 PM (3 years ago)

Author:

amir

Message:

Minor fixes:
Don't load js library when not in edit mode.
Enable translating the widget's checkbox (i.e. edit translation)
Use allign instead of ltr/rtl in widget.

Location:

trunk/WordPress/plugin/transposh

Files:

• transposh.php (modified) (1 diff)
• transposh_widget.php (modified) (6 diffs)

trunk/WordPress/plugin/transposh/transposh.php

@@ -278 +278 @@
 function insert_javascript_includes()
 {
-    global $plugin_url;
+    global $plugin_url, $is_edit_mode, $wp_query;
+
+    if (!($wp_query->query_vars[EDIT_PARAM] == "1" ||
+         $wp_query->query_vars[EDIT_PARAM] == "true"))
+    {
+        //check permission later - for now just make sure we don't load the
+        //js code when it is not needed
+        return;
+    }
+    
 
     $overlib_dir = "$plugin_url/js/overlibmws";

trunk/WordPress/plugin/transposh/transposh_widget.php

@@ -102 +102 @@
     
         echo $before_widget . $before_title . __(no_translate("Transposh")) . $after_title;
-        echo "<span class=\"" . NO_TRANSLATE_CLASS . "\" >";
-    
+            
         switch ($options['style']) {
                 case 1: // flags
             //keep the flags in the same direction regardless of the overall page direction
-            echo "<div dir=rtl>"; 
-            
+            echo "<div style=\"text-align: left;\" class=\"" . NO_TRANSLATE_CLASS . "\" >"; 
+
             global $plugin_url;
             $using_permalinks = $wp_rewrite->using_permalinks();
@@ -131 +130 @@
                                 }
                         }
-
             echo "</div>";
             
@@ -141 +139 @@
 
             echo "<form action=\"$page_url\" method=\"post\">";
+            echo "<span class=\"" . NO_TRANSLATE_CLASS . "\" >";
                         echo "<select name=\"lang\"     id=\"lang\" onchange=\"Javascript:this.form.submit();\">";
                         echo "<option value=\"none\">[Language]</option>";
@@ -153 +152 @@
                                 {
                                         $is_selected = ($lang == $code ? "selected=\"selected\"" : "" );
-                                        echo "<option value=\"$code\" $is_selected>" . no_translate($language) . "</option>";
+                                        echo "<option value=\"$code\" $is_selected>" . $language . "</option>";
                     $is_showing_languages = TRUE;
                                 }
                         }
                         echo "</select><br/>";
+            echo "</span>"; // the no_translate for the language list
         }
 
@@ -169 +169 @@
             echo "<input type=\"checkbox\" name=\"" . EDIT_PARAM . "\" value=\"1\"" .
                 ($is_edit ? "checked=\"1\"" : "0") .
-                "\" onClick=\"this.form.submit();\"/>Edit Translation<br/>";
+                "\" onClick=\"this.form.submit();\"/>&nbsp;Edit Translation";
         }
         
@@ -181 +181 @@
 
     echo "</form>";
-    echo "</span>"; // the no_translate for the widget
 
     echo $after_widget;