--- /helpinject.module	א מאי 31 17:06:05 2009
+++ /helpinject-new.module	ב יוני 29 11:43:53 2009
@@ -902,15 +902,23 @@
  */
 function theme_helpinject_topic($nid) {
   if (user_access('view advanced help popup')) {
+    global $language;
     $node = node_load($nid);
+    $path = 'node/' . $node->nid;
+    // Check if current language is the help language, if not switch the node
+    if ($node->language != $language->language) {
+      $path2 = array();
+      $path2 = translation_path_get_translations($path);
+      $path3 = $path2[$language->language];
+    }
+    else {
+    $path3 = 'node/' . $node->nid;
+    }
     drupal_add_css(drupal_get_path('module', 'advanced_help') . '/help-icon.css');
-    return l('<span>' . t('Help') . '</span>', "helpinject/node/$nid", array(
+    return l('<span>' . t('Help') . '</span>', $path3, array(
       'attributes' => array(
-        'class' => 'advanced-help-link',
-        'onclick' => "var w=window.open(this.href, 'advanced_help_window', 'width=500,height=500,scrollbars,resizable'); w.focus(); return false;",
-        'title' => $node->title,
+        'class' => 'advanced-help-link popups',
       ),
-      'query' => array('popup' => TRUE),
       'html' => TRUE)
     );
   }