Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.345
diff -u -r1.345 aggregator.module
--- modules/aggregator/aggregator.module	5 Jun 2007 12:13:21 -0000	1.345
+++ modules/aggregator/aggregator.module	27 Jun 2007 15:17:27 -0000
@@ -267,11 +267,11 @@
   if (user_access('access news feeds')) {
     if ($op == 'list') {
       $result = db_query('SELECT cid, title FROM {aggregator_category} ORDER BY title');
-      while ($category = db_fetch_object($result)) {
+      while ($category = dt('aggregator_category', db_fetch_object($result))) {
         $block['category-'. $category->cid]['info'] = t('!title category latest items', array('!title' => $category->title));
       }
       $result = db_query('SELECT fid, title FROM {aggregator_feed} ORDER BY fid');
-      while ($feed = db_fetch_object($result)) {
+      while ($feed = dt('aggregator_feed', db_fetch_object($result))) {
         $block['feed-'. $feed->fid]['info'] = t('!title feed latest items', array('!title' => $feed->title));
       }
     }
@@ -315,7 +315,7 @@
           break;
       }
       $items = array();
-      while ($item = db_fetch_object($result)) {
+      while ($item = dt('aggregator_item', db_fetch_object($result))) {
         $items[] = theme('aggregator_block_item', $item);
       }
 
@@ -1009,7 +1009,7 @@
 
   $header = array(t('Title'), t('Items'), t('Last update'), t('Next update'), array('data' => t('Operations'), 'colspan' => '3'));
   $rows = array();
-  while ($feed = db_fetch_object($result)) {
+  while ($feed = dt('aggregator_feed', db_fetch_object($result))) {
     $rows[] = array(l($feed->title, "aggregator/sources/$feed->fid"), format_plural($feed->items, '1 item', '@count items'), ($feed->checked ? t('@time ago', array('@time' => format_interval(time() - $feed->checked))) : t('never')), ($feed->checked ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - time()))) : t('never')), l(t('edit'), "admin/content/aggregator/edit/feed/$feed->fid"), l(t('remove items'), "admin/content/aggregator/remove/$feed->fid"), l(t('update items'), "admin/content/aggregator/update/$feed->fid"));
   }
   $output .= theme('table', $header, $rows);
@@ -1064,7 +1064,7 @@
  * Menu callback; displays all the items captured from a particular feed.
  */
 function aggregator_page_source() {
-  $feed = db_fetch_object(db_query('SELECT * FROM {aggregator_feed} WHERE fid = %d', arg(2)));
+  $feed = dt('aggregator_feed', db_fetch_object(db_query('SELECT * FROM {aggregator_feed} WHERE fid = %d', arg(2))));
   drupal_set_title(check_plain($feed->title));
   $info = theme('aggregator_feed', $feed);
 
@@ -1075,7 +1075,7 @@
  * Menu callback; displays all the items aggregated in a particular category.
  */
 function aggregator_page_category() {
-  $category = db_fetch_object(db_query('SELECT cid, title FROM {aggregator_category} WHERE cid = %d', arg(2)));
+  $category = dt('aggregator_category', db_fetch_object(db_query('SELECT cid, title FROM {aggregator_category} WHERE cid = %d', arg(2))));
 
   drupal_add_feed(url('aggregator/rss/'. arg(2)), variable_get('site_name', 'Drupal') .' '. t('aggregator - @title', array('@title' => $category->title)));
 
@@ -1092,13 +1092,13 @@
   $done = FALSE;
   $form['items'] = array();
   $form['categories'] = array('#tree' => TRUE);
-  while ($item = db_fetch_object($result)) {
+  while ($item = dt('aggregator_item', db_fetch_object($result))) {
     $form['items'][$item->iid] = array('#value' => theme('aggregator_page_item', $item));
     $form['categories'][$item->iid] = array();
     if ($categorize) {
       $categories_result = db_query('SELECT c.cid, c.title, ci.iid FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid AND ci.iid = %d', $item->iid);
       $selected = array();
-      while ($category = db_fetch_object($categories_result)) {
+      while ($category = dt('aggregator_category', db_fetch_object($categories_result))) {
         if (!$done) {
           $categories[$category->cid] = check_plain($category->title);
         }
@@ -1219,7 +1219,7 @@
   // arg(2) is the passed cid, only select for that category
   $result = NULL;
   if (arg(2)) {
-    $category = db_fetch_object(db_query('SELECT cid, title FROM {aggregator_category} WHERE cid = %d', arg(2)));
+    $category = dt('aggregator_category', db_fetch_object(db_query('SELECT cid, title FROM {aggregator_category} WHERE cid = %d', arg(2))));
     $url = '/categories/'. $category->cid;
     $title = ' '. t('in category') .' '. $category->title;
     $sql = 'SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_category_item} c LEFT JOIN {aggregator_item} i ON c.iid = i.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE cid = %d ORDER BY timestamp DESC, i.iid DESC';
@@ -1231,7 +1231,7 @@
     $result = db_query_range($sql, 0, variable_get('feed_default_items', 10));
   }
 
-  while ($item = db_fetch_object($result)) {
+  while ($item = dt('aggregator_item', db_fetch_object($result))) {
     switch (variable_get('feed_item_length', 'teaser')) {
       case 'teaser':
         $teaser = node_teaser($item->description);
@@ -1293,12 +1293,12 @@
   $result = db_query('SELECT c.cid, c.title, c.description FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid LEFT JOIN {aggregator_item} i ON ci.iid = i.iid GROUP BY c.cid, c.title, c.description');
   $output = "<div id=\"aggregator\">\n";
 
-  while ($category = db_fetch_object($result)) {
+  while ($category = dt('aggregator_category', db_fetch_object($result))) {
     $output .= '<h2>'. check_plain($category->title) ."</h2>\n";
     if (variable_get('aggregator_summary_items', 3)) {
       $list = array();
       $items = db_query_range('SELECT i.title, i.timestamp, i.link, f.title as feed_title, f.link as feed_link FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON i.iid = ci.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE ci.cid = %d ORDER BY i.timestamp DESC', $category->cid, 0, variable_get('aggregator_summary_items', 3));
-      while ($item = db_fetch_object($items)) {
+      while ($item = dt('aggregator_item', db_fetch_object($items))) {
         $list[] = theme('aggregator_summary_item', $item);
       }
       $output .= theme('item_list', $list);
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.840
diff -u -r1.840 node.module
--- modules/node/node.module	26 Jun 2007 22:27:25 -0000	1.840
+++ modules/node/node.module	27 Jun 2007 15:17:30 -0000
@@ -414,7 +414,7 @@
   }
 
   $type_result = db_query(db_rewrite_sql('SELECT nt.type, nt.* FROM {node_type} nt ORDER BY nt.type ASC', 'nt', 'type'));
-  while ($type_object = db_fetch_object($type_result)) {
+  while ($type_object = dt('node_type', db_fetch_object($type_result))) {
     if (!isset($_node_types[$type_object->type]) || $type_object->modified) {
       $_node_types[$type_object->type] = $type_object;
       $_node_names[$type_object->type] = $type_object->name;
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.664
diff -u -r1.664 common.inc
--- includes/common.inc	26 Jun 2007 22:21:08 -0000	1.664
+++ includes/common.inc	27 Jun 2007 15:17:25 -0000
@@ -738,6 +738,51 @@
 }
 
 /**
+ * Object translation
+ * 
+ * This is just a wrapper that will invoke the translation functions if they exist,
+ * otherwise it will just return the parameter.
+ * 
+ * Usage:
+ * @code
+ *   // This will translate the menu item to the current language
+ *   $item = dt('menu_item', $item); 
+ *   // Translate an aggregator category to the default language
+ *   $category = dt('aggregator_category', $category, language_default())
+ * @endcode
+ * 
+ * These functions are not implemented by Drupal core but this allows contributed
+ * modules to hook in and translate any kind of object.
+ * 
+ * Implementation -for the above usage examples:
+ * @code
+ *   function custom_dt_menu_item($item, $language) {
+ *     ...
+ *   }
+ *   function custom_dt_aggregator_category($category, $language) {
+ *     ...
+ *   }
+ * @endcode
+ * 
+ * @param $type
+ *   Type of object or parameter
+ * @param $param
+ *   Object to be translated
+ * @param $language
+ *   Optional language for translation
+ */
+
+function dt($type , $param, $dt_language = NULL) {
+  global $language;
+  
+  if (function_exists($function = 'custom_dt_'.$type)) {
+    return call_user_func($param, $dt_language ? $dt_language : $language);
+  } else {
+    return $param;
+  }
+}
+
+/**
  * @defgroup validation Input validation
  * @{
  * Functions to validate user input.