--- F:/Documents and Settings/justin/Desktop/Main/Software/_Staging_Area/D6.x/i18n-6.x-1.5.tar/i18n/i18ncontent/i18ncontent.module	Thu Mar 04 13:51:54 2010
+++ F:/EngNet - Justin/Backups/civilwatch.eng.co.za/2010-07-13/public_html/sites/all/modules/i18n/i18ncontent/i18ncontent.module	Tue Jul 13 08:43:00 2010
@@ -32,7 +32,9 @@
   // Add translated help text for node add pages
   if (!menu_get_object() && $arg[1] == 'add' && $arg[2]) {
     $type = str_replace('-', '_', $arg[2]);
-    if ($help = i18nstrings_ts("nodetype:type:$type:help")) {
+    // Fetch default language node type help
+    $source = i18ncontent_node_help($type);
+    if ($help = i18nstrings("nodetype:type:$type:help", $source->source)) {
       return '<p>'. filter_xss_admin($help) .'</p>';
     }
   }
@@ -79,10 +81,11 @@
       // Replace the help text default value in the node type form with data from
       // i18nstrings. Help text is handled in hook_node_type() and hook_help().
       $type = $form['#node_type']->type;
-      // Use the default language for this.
-      $language = language_default('language');
       if ($type) {
-        $form['submission']['help']['#default_value'] = i18nstrings_ts("nodetype:type:$type:help", $form['submission']['help']['#default_value'], $language);
+        // Fetch default language node type help
+        $source = i18ncontent_node_help($type);
+        // We dont need to pass the value through i18nstrings_ts()
+        $form['submission']['help']['#default_value'] = $source->source;
       }
       break;
 
@@ -204,4 +207,13 @@
   }
 
   return $output;
-}
\ No newline at end of file
+}
+
+/**
+ * Fetch default source for node type help
+ */
+function i18ncontent_node_help($type) {
+  $context = i18nstrings_context("nodetype:type:$type:help");
+  $source = i18nstrings_get_source($context);
+  return $source;
+}