Changeset 483

Timestamp:

08/06/2010 01:12:07 AM (18 months ago)

Author:

ofer

Message:

Fix #114 - phrase was incorrectly spelled, spilt third party support functions to their own file

Location:

trunk/WordPress/plugin/transposh

Files:

• core/parser.php (modified) (1 diff)
• transposh.php (modified) (9 diffs)
• wp/transposh_3rdparty.php (added)
• wp/transposh_ajax.php (modified) (2 diffs)
• wp/transposh_postpublish.php (modified) (1 diff)

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

@@ -282 +282 @@
 
     /**
-     * Create a pharse tag in the html dom tree
-     * @param int $start - beginning of pharse in element
-     * @param int $end - end of pharse in element
+     * Create a phrase tag in the html dom tree
+     * @param int $start - beginning of phrase in element
+     * @param int $end - end of phrase in element
      */
     function tag_phrase($string, $start, $end) {

trunk/WordPress/plugin/transposh/transposh.php

@@ -46 +46 @@
 require_once("wp/transposh_postpublish.php");
 require_once("wp/transposh_backup.php");
+require_once("wp/transposh_3rdparty.php");
 
 /**
@@ -63 +64 @@
     /** @var transposh_postpublish Happens after editing */
     public $postpublish;
+    /** @var transposh_3rdparty Happens after editing */
+    private $third_party;
 
     // list of properties
@@ -96 +99 @@
         $this->widget = new transposh_plugin_widget($this);
         $this->postpublish = new transposh_postpublish($this);
+        $this->third_party = new transposh_3rdparty($this);
 
         // "global" vars
@@ -132 +136 @@
         add_action('wp_print_scripts', array(&$this, 'add_transposh_js'));
 //        add_action('wp_head', array(&$this,'add_transposh_async'));
-        add_action("sm_addurl", array(&$this, 'add_sm_transposh_urls'));
         add_action('transposh_backup_event', array(&$this, 'run_backup'));
         add_action('comment_post', array(&$this, 'add_comment_meta_settings'), 1);
@@ -140 +143 @@
         add_filter('the_title', array(&$this, 'post_wrap'));
 
-        // buddypress compatability
-        add_filter('bp_uri', array(&$this, 'bp_uri_filter'));
-        add_filter('bp_get_activity_content_body', array(&$this, 'bp_get_activity_content_body'), 10, 2);
-        add_action('bp_activity_after_save', array(&$this, 'bp_activity_after_save'));
-        add_action('transposh_human_translation', array(&$this, 'transposh_buddypress_stream'), 10, 3);
-
         //TODO add_action('manage_comments_nav', array(&$this,'manage_comments_nav'));
         //TODO comment_row_actions (filter)
+        // toying around the mo/po stuff
+        add_filter('gettext', array(&$this, 'transposh_gettext_filter'), 10, 3);
+        add_filter('locale', array(&$this, 'transposh_locale_filter'));
+
 
         register_activation_hook(__FILE__, array(&$this, 'plugin_activate'));
@@ -706 +707 @@
 
     /**
-     * This function integrates with google sitemap generator, and adds for each viewable language, the rest of the languages url
-     * Also - priority is reduced by 0.2
-     * And this requires the following line at the sitemap-core.php, add-url function (line 1509 at version 3.2.2)
-     * do_action('sm_addurl', &$page);
-     * @param GoogleSitemapGeneratorPage $sm_page Object containing the page information
-     */
-    function add_sm_transposh_urls(&$sm_page) {
-        logger("in sitemap add url: " . $sm_page->GetUrl() . " " . $sm_page->GetPriority());
-        // we need the generator object (we know it must exist...)
-        $generatorObject = &GoogleSitemapGenerator::GetInstance();
-        // we reduce the priorty by 0.2, but not below zero
-        $sm_page->SetProprity(max($sm_page->GetPriority() - 0.2, 0));
-
-        $viewable_langs = explode(',', $this->options->get_viewable_langs());
-        $orig_url = $sm_page->GetUrl();
-        foreach ($viewable_langs as $lang) {
-            if (!$this->options->is_default_language($lang)) {
-                $newloc = $orig_url;
-                if ($this->options->get_enable_url_translate()) {
-                    $newloc = translate_url($newloc, $this->home_url, $lang, array(&$this->database, 'fetch_translation'));
-                }
-                $newloc = rewrite_url_lang_param($newloc, $this->home_url, $this->enable_permalinks_rewrite, $lang, false);
-                $sm_page->SetUrl($newloc);
-                $generatorObject->AddElement($sm_page);
-            }
-        }
-    }
-
-    /**
      * Runs a scheduled backup
      */
@@ -766 +738 @@
         return $url;
     }
-
-    /**
-     * This filter method helps buddypress understand the transposh generated URLs
-     * @param string $uri The url that was originally received
-     * @return string The url that buddypress should see
-     */
-    function bp_uri_filter($uri) {
-        $lang = get_language_from_url($uri, $this->home_url);
-        $uri = cleanup_url($uri, $this->home_url);
-        if ($this->options->get_enable_url_translate()) {
-            $uri = get_original_url($uri, '', $lang, array($this->database, 'fetch_original'));
-        }
-        return $uri;
-    }
-
-    /**
-     * After saving action, makes sure activity has proper language
-     * @param BP_Activity_Activity $params
-     */
-    function bp_activity_after_save($params) {
-        // we don't need to modify our own activity stream
-        if ($params->type == 'new_translation') return;
-        if (get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url))
-                bp_activity_update_meta($params->id, 'tp_language', get_language_from_url($_SERVER['HTTP_REFERER'], $this->home_url));
-    }
-
-    /**
-     * Change the display of activity content using the transposh meta
-     * @param string $content
-     * @param BP_Activity_Activity $activity
-     * @return string modified content
-     */
-    function bp_get_activity_content_body($content, $activity) {
-        $activity_lang = bp_activity_get_meta($activity->id, 'tp_language');
-        if ($activity_lang) {
-            $content = "<span lang =\"$activity_lang\">" . $content . "</span>";
-        }
-        return $content;
-    }
-
-    /**
-     * Add an item to the activity string upon translation
-     * @global object $bp the global buddypress
-     * @param string $translation
-     * @param string $original
-     * @param string $lang
-     */
-    function transposh_buddypress_stream($translation, $original, $lang) {
-        global $bp;
-
-        // we must have buddypress...
-        if (!function_exists('bp_activity_add')) return false;
-
-        // we only log translation for logged on users
-        if (!$bp->loggedin_user->id) return;
-
-        /* Because blog, comment, and blog post code execution happens before anything else
-          we may need to manually instantiate the activity component globals */
-        if (!$bp->activity && function_exists('bp_activity_setup_globals'))
-                bp_activity_setup_globals();
-
-        // just got this from buddypress, changed action and content
-        $values = array(
-            'user_id' => $bp->loggedin_user->id,
-            'action' => sprintf(__('%s translated a pharse to %s with transposh:', 'buddypress'), bp_core_get_userlink($bp->loggedin_user->id), substr($GLOBALS['languages'][$lang], 0, strpos($GLOBALS['languages'][$lang], ','))),
-            'content' => "Original: <span class=\"no_translate\">$original</span>\nTranslation: <span class=\"no_translate\">$translation</span>",
-            'primary_link' => '',
-            'component' => $bp->blogs->id,
-            'type' => 'new_translation',
-            'item_id' => false,
-            'secondary_item_id' => false,
-            'recorded_time' => gmdate("Y-m-d H:i:s"),
-            'hide_sitewide' => false
-        );
-
-        return bp_activity_add($values);
-    }
-
     /**
      * Modify comments to include the relevant language span
@@ -867 +761 @@
         global $id;
         $lang = get_post_meta($id, 'tp_language',true);
-        if ($lang) {
-            $text = "<span lang =\"$lang\">" . $text . "</span>";
-        }
+            if ($lang) {
+                $text = "<span lang =\"$lang\">" . $text . "</span>";
+            }
         return $text;
     }
@@ -898 +792 @@
     }
 
+    function transposh_gettext_filter($a, $orig, $domain) {
+        //logger("$a $orig $domain");
+        return $a;
+    }
+
+    function transposh_locale_filter($locale) {
+        //logger($locale);
+        return $locale;
+    }
+
 }
 

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

@@ -46 +46 @@
 //  the case of posted translation
 if (isset($_POST['translation_posted'])) {
-    // supercache invalidation of pages - first lets find if supercache is here
-    if (function_exists('wp_super_cache_init')) {
-        //Now, we are actually using the referrer and not the request, with some precautions
-        $GLOBALS['wp_cache_request_uri'] = substr($_SERVER['HTTP_REFERER'], stripos($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST']) + strlen($_SERVER[''] . $_SERVER['HTTP_HOST']));
-        $GLOBALS['wp_cache_request_uri'] = preg_replace('/[ <>\'\"\r\n\t\(\)]/', '', str_replace('/index.php', '/', str_replace('..', '', preg_replace("/(\?.*)?$/", '', $GLOBALS['wp_cache_request_uri']))));
-        // get some supercache variables
-        extract(wp_super_cache_init());
-        logger(wp_super_cache_init());
-        // this is hackery for logged in users, a cookie is added to the request somehow and gzip is not correctly set, so we forcefully fix this
-        if (!$cache_file) {
-            $GLOBALS['wp_cache_gzip_encoding'] = gzip_accepted();
-            unset($_COOKIE[key($_COOKIE)]);
-            extract(wp_super_cache_init());
-            logger(wp_super_cache_init());
-        }
-
-        $dir = get_current_url_supercache_dir();
-        // delete possible files that we can figure out, not deleting files for other cookies for example, but will do the trick in most cases
-        $cache_fname = "{$dir}index.html";
-        logger("attempting delete of supercache: $cache_fname");
-        @unlink($cache_fname);
-        $cache_fname = "{$dir}index.html.gz";
-        logger("attempting delete of supercache: $cache_fname");
-        @unlink($cache_fname);
-        logger("attempting delete of wp_cache: $cache_file");
-        @unlink($cache_file);
-        logger("attempting delete of wp_cache_meta: $meta_pathname");
-        @unlink($meta_pathname);
-
-        // go at edit pages too
-        $GLOBALS['wp_cache_request_uri'] .="?edit=1";
-        extract(wp_super_cache_init());
-        logger(wp_super_cache_init());
-        logger("attempting delete of edit_wp_cache: $cache_file");
-        @unlink($cache_file);
-        logger("attempting delete of edit_wp_cache_meta: $meta_pathname");
-        @unlink($meta_pathname);
-    }
-
-    if ($_POST['translation_posted'] == 2) {
-        $my_transposh_plugin->database->update_translation();
-    }
+    do_action('transposh_translation_posted');
+    $my_transposh_plugin->database->update_translation();
 }
 // getting translation history
@@ -124 +84 @@
     if (!function_exists('curl_init')) return;
     // we want to avoid unneeded work or dos attacks on languages we don't support
-    if (!in_array($_GET['tgl'], $google_proxied_languages) || !$my_transposh_plugin->options->is_editable_language($_GET['tgl'])) return;
+    if (!in_array($_GET['tgl'], $google_proxied_languages) || !$my_transposh_plugin->options->is_editable_language($_GET['tgl']))
+            return;
     $url = 'http://translate.google.com/translate_a/t?client=a&text=' . urlencode($_GET['tgp']) . '&tl=' . $_GET['tgl'] . '&sl=auto';
     $ch = curl_init();

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

@@ -102 +102 @@
         $phrases = array_merge($phrases, $phrases2);
 
-        // Add pharses from permalink
+        // Add phrases from permalink
         if ($this->transposh->options->get_enable_url_translate()) {
             $permalink = get_permalink($postID);