Changeset 753

Timestamp:

12/08/2012 03:29:13 AM (5 months ago)

Author:

ofer

Message:

Removed distinction between editable and viewable languages, now only active languages exist

Location:

trunk/WordPress/plugin/transposh

Files:

• css/admin.css (modified) (2 diffs)
• js/admin/languages.js (modified) (4 diffs)
• transposh.php (modified) (10 diffs)
• wp/transposh_admin.php (modified) (8 diffs)
• wp/transposh_db.php (modified) (4 diffs)
• wp/transposh_options.php (modified) (3 diffs)
• wp/transposh_postpublish.php (modified) (1 diff)
• wp/transposh_widget.php (modified) (1 diff)

trunk/WordPress/plugin/transposh/css/admin.css

@@ -1 +1 @@
 /* 
-    Document   : admin
-    Created on : 24/11/2012, 04:12:31
-    Author     : root
-    Description:
-        Purpose of the stylesheet follows.
+    Document   : admin.css
+    Created on : 24/11/2012
+    Description: Style sheet for admin pages        
 */
 
 #icon-transposh-logo {
-    background: url(../img/tplogo32.png) no-repeat;
+    background: url('../img/tplogo32.png') no-repeat;
     /*float: left;*/
 }
@@ -38 +36 @@
     background: #FFE45C;
 }
-.active {
+.lng_active {
     background: #45FF51;
-}
-.translateable {
-    background: #FFFF51;
 }
 .hidden {

trunk/WordPress/plugin/transposh/js/admin/languages.js

@@ -18 +18 @@
 (function ($) { // closure
     $(function() {
-        // clicking anonymous will make translatables active
-        $("#tr_anon").click(function() {
-            if ($("#tr_anon").attr("checked")) {
-                $(".translateable").addClass("active").removeClass("translateable");
-                $("#sortable .active").each(function () {
-                    $("input",this).val($(this).attr("id")+",v,t");
-                })
-            }
-            $("#yellowcolor").toggleClass("hidden");
-        });
-
         // makes the languages sortable, with placeholder, also prevent unneeded change after sort
         $("#sortable").sortable({
@@ -50 +39 @@
         // enable all languages
         $("#selectall").click(function(){
-            $("#sortable .languages").addClass("active").removeClass("translateable");
-            $("#sortable .active").each(function () {
-                $("input",this).val($(this).attr("id")+",v,t");
+            $("#sortable .languages").addClass("lng_active");
+            $("#sortable .lng_active").each(function () {
+                $("input",this).val($(this).attr("id")+",v");
             })
             return false;
@@ -60 +49 @@
         clickfunction = function () {
             if ($(this).attr("id") == $("#default_list li").attr("id")) return;
-            if ($("#tr_anon").attr("checked")) {
-                $(this).toggleClass("active");
-            } else {
-                if ($(this).hasClass("active")) {
-                    $(this).removeClass("active");
-                    $(this).addClass("translateable")
-                }
-                else {
-                    if ($(this).hasClass("translateable")) {
-                        $(this).removeClass("translateable");
-                    }
-                    else {
-                        $(this).addClass("active")
-                    }
-                }
-            }
+            $(this).toggleClass("lng_active");
             // set new value
-            $("input",this).val($(this).attr("id")+($(this).hasClass("active") ? ",v":",")+($(this).hasClass("translateable") ? ",t":","));
+            $("input",this).val($(this).attr("id")+($(this).hasClass("lng_active") ? ",v":","));
         }
         $(".languages").dblclick(clickfunction).click(clickfunction);
@@ -87 +61 @@
             drop: function(ev, ui) {
                 $("#default_list").empty();
-                $(ui.draggable.clone().removeAttr("style").removeClass("active").removeClass("translateable")).appendTo("#default_list").show("slow");
+                $(ui.draggable.clone().removeAttr("style").removeClass("lng_active")).appendTo("#default_list").show("slow");
                 $("#default_list .logoicon").remove();
-                $("#sortable").find("#"+ui.draggable.attr("id")).addClass("active");
+                $("#sortable").find("#"+ui.draggable.attr("id")).addClass("lng_active");
             }
         });

trunk/WordPress/plugin/transposh/transposh.php

@@ -148 +148 @@
                 tp_logger(preg_replace('|^' . preg_quote(WP_PLUGIN_DIR, '|') . '/|', '', __FILE__), 4); // includes transposh dir and php
             
-        // TODO: get_class_methods to replace said mess, other way?
+// TODO: get_class_methods to replace said mess, other way?
         add_filter('plugin_action_links_' . preg_replace('|^' . preg_quote(WP_PLUGIN_DIR, '|') . '/|', '', __FILE__), array(&$this, 'plugin_action_links'));
         add_filter('query_vars', array(&$this, 'parameter_queryvars'));
@@ -222 +222 @@
         // CHECK TODO!!!!!!!!!!!!
         $this->tgl = transposh_utils::get_language_from_url($_SERVER['REQUEST_URI'], $this->home_url);
-        if (!$this->options->is_viewable_language($this->tgl) && !$this->options->is_editable_language($this->tgl)) {
+        if (!$this->options->is_active_language($this->tgl)) {
             $this->tgl = '';
         }
@@ -503 +503 @@
         // TODO TOCHECK!!!!!!!!!!!!!!!!!!!!!!!!!!1
         $this->target_language = $this->tgl;
-        // avoid viewing of editable languages which are not viewable by non translators
-        if (!$this->options->is_viewable_language($this->target_language) &&
-                $this->options->is_editable_language($this->target_language) &&
-                !$this->is_translator()) {
-            $this->target_language = '';
-        }
         if (!$this->target_language)
                 $this->target_language = $this->options->default_language;
@@ -813 +807 @@
                 return false;
 
-        return $this->options->is_editable_language($this->target_language);
+        return $this->options->is_active_language($this->target_language);
     }
 
@@ -831 +825 @@
                 return false;
 
-        return $this->options->is_editable_language($this->target_language);
+        return $this->options->is_active_language($this->target_language);
     }
 
@@ -1166 +1160 @@
     function transposh_locale_filter($locale) {
         $lang = transposh_utils::get_language_from_url($_SERVER['REQUEST_URI'], $this->home_url);
-        if (!$this->options->is_viewable_language($lang)) {
+        if (!$this->options->is_active_language($lang)) {
             $lang = '';
         }
@@ -1232 +1226 @@
     }
 
-    // Proxyed google translate suggestions
+    // Proxied google translate suggestions
     function on_ajax_nopriv_tp_gsp() {
         $i = 0;
@@ -1240 +1234 @@
         $tl = $_GET['tl'];
         // we want to avoid unneeded work or dos attacks on languages we don't support
-        if (!in_array($tl, transposh_consts::$google_languages) || !$this->options->is_editable_language($tl))
+        if (!in_array($tl, transposh_consts::$google_languages) || !$this->options->is_active_language($tl))
                 return;
         $sl = 'auto';
@@ -1281 +1275 @@
     }
 
-    // Proxyed translation for google translate
+    // Proxied translation for google translate
     function on_ajax_nopriv_tp_gp() {
         // we need curl for this proxy
@@ -1289 +1283 @@
         $tl = $_GET['tl'];
         // we want to avoid unneeded work or dos attacks on languages we don't support
-        if (!in_array($tl, transposh_consts::$google_languages) || !$this->options->is_editable_language($tl))
+        if (!in_array($tl, transposh_consts::$google_languages) || !$this->options->is_active_language($tl))
                 return;
         // source language

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

@@ -87 +87 @@
             case 'tp_langs':
                 $viewable_langs = array();
-                $editable_langs = array();
 
                 tp_logger($_POST['anonymous']);
                 // first set the default language
-                list ($langcode, $viewable, $translateable) = explode(",", $_POST['languages'][0]);
+                list ($langcode, ) = explode(",", $_POST['languages'][0]);
                 $this->transposh->options->default_language = $langcode;
                 unset($_POST['languages'][0]);
@@ -97 +96 @@
                 // update the list of supported/editable/sortable languages
                 tp_logger($_POST['languages']);
-                foreach ($_POST['languages'] as $code => $lang) {
-                    list ($langcode, $viewable, $translateable) = explode(",", $lang);
+                foreach ($_POST['languages'] as $lang) {
+                    list ($langcode, $viewable) = explode(",", $lang);
                     $sorted_langs[$langcode] = $langcode;
                     if ($viewable) {
                         $viewable_langs[$langcode] = $langcode;
-                        // force that every viewable lang is editable
-                        $editable_langs[$langcode] = $langcode;
-                    }
-
-                    if ($translateable) {
-                        $editable_langs[$langcode] = $langcode;
                     }
                 }
 
                 $this->transposh->options->viewable_languages = implode(',', $viewable_langs);
-                $this->transposh->options->editable_languages = implode(',', $editable_langs);
                 $this->transposh->options->sorted_languages = implode(',', $sorted_langs);
                 break;
@@ -189 +181 @@
                 '<p>' . __('For further help and assistance, please look at the following resources:', TRANSPOSH_TEXT_DOMAIN) . '</p>' .
                 '<a href="http://transposh.org/">' . __('Plugin homepage', TRANSPOSH_TEXT_DOMAIN) . '</a><br/>' .
-                '<a href="http://transposh.org/faq/">' . __('Frequently asked questions', TRANSPOSH_TEXT_DOMAIN) . '</a><br/>'.
-                '<a href="http://trac.transposh.org/">' . __('Development website', TRANSPOSH_TEXT_DOMAIN) . '</a><br/>' ;
+                '<a href="http://transposh.org/faq/">' . __('Frequently asked questions', TRANSPOSH_TEXT_DOMAIN) . '</a><br/>' .
+                '<a href="http://trac.transposh.org/">' . __('Development website', TRANSPOSH_TEXT_DOMAIN) . '</a><br/>';
         return $text;
     }
@@ -215 +207 @@
                 add_action('admin_print_scripts-' . $submenu_page, array(&$this, 'admin_print_scripts'));
             }
-
         }
         // DOC
@@ -275 +266 @@
             $this->localeright = 'left';
         }
-        
+
         // the followings are integrations with the wordpress admin interface
         $screen = get_current_screen();
@@ -359 +350 @@
 
         echo '<div class="clear"></div>';
-
     }
 
@@ -395 +385 @@
             tp_logger($langcode, 5);
             list ($langname, $langorigname, $flag) = explode(",", $langrecord);
-            echo '<li id="' . $langcode . '" class="languages ' . ($this->transposh->options->is_viewable_language($langcode) || $this->transposh->options->is_default_language($langcode) ? "active" : "")
-            . (!$this->transposh->options->is_viewable_language($langcode) && $this->transposh->options->is_editable_language($langcode) ? "translateable" : "") . '"><div style="float:' . $this->localeleft . '">'
+            echo '<li id="' . $langcode . '" class="languages ' . ($this->transposh->options->is_active_language($langcode) || $this->transposh->options->is_default_language($langcode) ? "lng_active" : "")
+            . '"><div style="float:' . $this->localeleft . '">'
             . transposh_utils::display_flag("{$this->transposh->transposh_plugin_url}/img/flags", $flag, false /* $langorigname,$this->transposh->options->get_widget_css_flags() */)
             // DOC THIS BUGBUG fix!
-            . '<input type="hidden" name="languages[]" value="' . $langcode . ($this->transposh->options->is_viewable_language($langcode) ? ",v" : ",") . ($this->transposh->options->is_editable_language($langcode) ? ",t" : ",") . '" />'
+            . '<input type="hidden" name="languages[]" value="' . $langcode . ($this->transposh->options->is_active_language($langcode) ? ",v" : ",") . '" />'
             . '&nbsp;<span class="langname">' . $langorigname . '</span><span class="langname hidden">' . $langname . '</span></div>';
             if (in_array($langcode, transposh_consts::$google_languages))
@@ -420 +410 @@
         echo '<li><a href="#" id="sortname">' . __('Sort by language name', TRANSPOSH_TEXT_DOMAIN) . '</a></li>';
         echo '<li><a href="#" id="sortiso">' . __('Sort by lSO code', TRANSPOSH_TEXT_DOMAIN) . '</a></li></ul>';
-        echo __('Legend:', TRANSPOSH_TEXT_DOMAIN) . ' ' . __('Green - active', TRANSPOSH_TEXT_DOMAIN) . ', <span id="yellowcolor"' . ($this->transposh->options->allow_anonymous_translation ? ' class ="hidden"' : '') . '>' . __('Yellow - translateable (only translators will see this language)', TRANSPOSH_TEXT_DOMAIN) . ', </span>' . __('blank - inactive', TRANSPOSH_TEXT_DOMAIN);
         echo '</div>';
     }

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

@@ -198 +198 @@
         }
         // make sure $lang is reasonable, unless someone is messing with us, it will be ok
-        if (!($this->transposh->options->is_editable_language($lang))) return;
+        if (!($this->transposh->options->is_active_language($lang))) return;
 
         // If we have nothing, we will do nothing
@@ -239 +239 @@
         } else {
             // make sure $lang is reasonable, unless someone is messing with us, it will be ok
-            if (!($this->transposh->options->is_editable_language($lang)))
-                    return;
+            if (!($this->transposh->options->is_active_language($lang))) return;
             $query = "SELECT * FROM {$this->translation_table} WHERE original = '$original' and lang = '$lang' ";
             $row = $GLOBALS['wpdb']->get_row($query);
@@ -324 +323 @@
         for ($i = 0; $i < $items; $i++) {
             if (isset($_POST["ln$i"])) {
-                if (!$this->transposh->options->is_editable_language($_POST["ln$i"])) {
+                if (!$this->transposh->options->is_active_language($_POST["ln$i"])) {
                     $all_editable = false;
                     break;
@@ -478 +477 @@
         // Check permissions, first the lanugage must be on the edit list. Then either the user
         // is a translator or automatic translation if it is enabled.
-        if (!($this->transposh->options->is_editable_language($lang) && $this->transposh->is_translator())) {
+        if (!($this->transposh->options->is_active_language($lang) && $this->transposh->is_translator())) {
             tp_logger("Unauthorized history request " . $_SERVER['REMOTE_ADDR'], 1);
             header('HTTP/1.0 401 Unauthorized history');

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

@@ -73 +73 @@
  * @property string           $viewable_languages    Option defining the list of currently viewable languages
  * @property transposh_option $viewable_languages_o 
- * @property string           $editable_languages    Option defining the list of currently editable languages
- * @property transposh_option $editable_languages_o 
  * @property string           $sorted_languages      Option defining the ordered list of languages @since 0.3.9
  * @property transposh_option $sorted_languages_o 
@@ -212 +210 @@
         $this->register_option('default_language', TP_OPT_STRING); // default?
         $this->register_option('viewable_languages', TP_OPT_STRING);
-        $this->register_option('editable_languages', TP_OPT_STRING);
         $this->register_option('sorted_languages', TP_OPT_STRING);
 
@@ -318 +315 @@
 
     /**
-     * Determine if the given language in on the list of editable languages
-     * @return boolean Is this language editable?
-     */
-    function is_editable_language($language) {
-        if ($this->is_default_language($language)) return true;
-        return (strpos($this->editable_languages . ',', $language . ',') !== false);
-    }
-
-    /**
-     * Determine if the given language in on the list of viewable languages
+     * Determine if the given language in on the list of active languages
      * @return boolean Is this language viewable?
      */
-    function is_viewable_language($language) {
+    function is_active_language($language) {
         if ($this->is_default_language($language)) return true;
         return (strpos($this->viewable_languages . ',', $language . ',') !== false);

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

@@ -146 +146 @@
 
         foreach ($phrases as $key) {
-            foreach (explode(',', $this->transposh->options->editable_languages) as $lang) {
+            foreach (explode(',', $this->transposh->options->viewable_languages) as $lang) {
                 // if this isn't the default language or we specifically allow default language translation, we will seek this out...
                 // as we don't normally want to auto-translate the default language -FIX THIS to include only correct stuff, how?

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

@@ -214 +214 @@
             list ($langname, $language, $flag) = explode(',', $langrecord);
 
-            // Only send languages which are viewable or (editable and the user is a translator)
-            if ($this->transposh->options->is_viewable_language($code) ||
-                    ($this->transposh->options->is_editable_language($code) && $this->transposh->is_translator()) ||
+            // Only send languages which are active
+            if ($this->transposh->options->is_active_language($code) ||
                     ($this->transposh->options->is_default_language($code))) {
                 // now we alway do this... maybe cache this to APC/Memcache