Changeset 30

Timestamp:

02/21/09 20:26:24 (2 years ago)

Author:

blundeln

Message:

Updated module so translation doesn't happen when node loaded for editing. Please check it works. Users must use translation page (as matthew found) to edit pages. Edit tab will take longer to fix, but can probably be done in template variables.
Please confirm the bug is fixed. If not, I'll take another look.

Files:

• drupal/modules/simple_translation/trunk/TODO (modified) (1 diff)
• drupal/modules/simple_translation/trunk/patches/menu.inc.drupal-6.5.tree-item-hook.patch (modified) (1 diff)
• drupal/modules/simple_translation/trunk/patches/notes (added)
• drupal/modules/simple_translation/trunk/simple_translation.module (modified) (12 diffs)

drupal/modules/simple_translation/trunk/TODO

@@ +1 @@
+- Translation of CCK text fields
+- Translated attachments if they exist

drupal/modules/simple_translation/trunk/patches/menu.inc.drupal-6.5.tree-item-hook.patch

@@ -6 +6 @@
-   while ($item = db_fetch_array($result)) {
-+  
-
+Nick Blundell 2008: 
-+    foreach (module_implements('menu_tree_item_alter') as $name) {
-+      $function = $name .'_menu_tree_item_alter';

drupal/modules/simple_translation/trunk/simple_translation.module

@@ -9 +9 @@
-if (!function_exists("d")) {
-  function d($message, $item=null, $print=false) {
+    global $user;
+    if ($user->uid != 1) {
+      return;
+    }
-    if ($item) {
-      $message .= ": " . print_r($item,true);
@@ -29 +33 @@
-
-function simple_translation_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
-
+
+
+
+
-
-  global $language;
@@ -37 +44 @@
-    return;
-  }
- 
+
-  // Load the translation source node.
-  $sNode = safe_node_load($node->tnid);
@@ -56 +63 @@
-  // Replace the loaded node with the translated node.
-  //$node = $tNode;
+  //d("source node: $node->nid - trans node: $tNode->nid");
-  $node->title = $tNode->title;
-  $node->body = $tNode->body;
@@ -80 +88 @@
-    // Replace the menu title with the translated title.
-    // Remember, we hook node_load in this module to translate it.
+    // TODO: Would be more efficient to make a DB call to get title rather than node_load
-    $node = node_load($nid);
+    //d("Translating title ".$item["link_title"]. " to trans node title $node->title");
-    $item["link_title"] = $node->title;
-    return;
@@ -93 +103 @@
-function simple_translation_db_rewrite_sql($query, $primary_table, $primary_key, $args = array()){
-  // Adapted from i18n module
+ 
+  // Contrary to i18n, only act on views queries, so we don't break other system queries.
+  if (!array_key_exists('view',$args)) return;
-  
-  $query_mods = array();
@@ -112 +125 @@
-
-      // Show only translation sources from translation sets.
-
-
-
+tnid = 0 OR $primary_table.
+
+//d("query_mods", $query_mods); 
-  return $query_mods;
-}
@@ -120 +133 @@
-
-function simple_translation_views_pre_render(&$view) {
-  //d("result",$view->result);
-  foreach ($view->result as $item) {
-    if (!$item->nid) { continue; }
@@ -141 +153 @@
-/* Initialise the module. */
-function simple_translation_init() {
-
+
-  // Need to clear the menu cache to allow menu translation.
-  // TODO: Need to find a better way.
@@ -155 +167 @@
- * =======================================
- */
+
+
+function dont_translate() {
+  $path = $_GET['q'];
+  
+  if (stristr($path, "/translate")) { return true; }
+  if (stristr($path, "/edit")) { return true; }
+  //d($path);
+  return false;
+}
-
-/* Loads a node in such a way that it will not be processed recursively by our nodeapi hook. */
@@ -168 +190 @@
-/* Loads the translated version of a node or returns the original node if no translation. */
-function _load_translated_node(&$node, $language) {
-
+
+
+
-  // Return original if no trans source, non-lang specific node, or the node language is same as user language.
-  if (!($node->tnid and $language->language) or $language->language == $node->language) {
@@ -187 +211 @@
-
-
-/* 
- * =======================================
- * OLD STUFF
- * =======================================
- */
-
-function xxxsimple_translation_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
-  // TODO: When incomming node is a translated node, comments of trans source are not dispayed.
-
-  global $language;
-
-  if ($op != "alter") {
-    return;
-  }
-
-  // State what the arguments are.
-  $teaser = $a3;
-  $page = $a4;
-
-  // Get the translation source node of this node
-  $sNode = node_load($node->tnid);
-
-  if (!$sNode) {
-    return;
-  }
-
-  // Get the translated node.
-  $tNode = _load_translated_node($sNode, $language);
-  
-  if (!$tNode) {
-    return;
-  }
-
-  // Sadly need to re-build the node's content, since drupal_render cannot be called more than once on content.
-  $sNode = node_build_content($sNode, $teaser, $page);
-
-  // Render the node and update the originally rendered node.
-  $tNode = node_build_content($tNode, $teaser, $page);
-  
-  // Render the content in the correct language.
-  $sNode->content["body"] = $tNode->content["body"];
-  $renderedContent = drupal_render($sNode->content);
-  $sNode->teaser = $renderedContent;
-  $sNode->body = $renderedContent;
-  
-  // Update the page title.
-  $sNode->title = $tNode->title;
-  drupal_set_title(check_plain($sNode->title));
-
-  // Update the links
-  $sNode->links = module_invoke_all('link', 'node', $tNode, $teaser);
-  drupal_alter('link', $sNode->links, $tNode);
-
-  // Replace $node with the modified $sNode
-  $node = $sNode;
-}
-
-
-
-
-?>