Index: modules/comment/comment.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.admin.inc,v
retrieving revision 1.36
diff -u -p -r1.36 comment.admin.inc
--- modules/comment/comment.admin.inc	3 Nov 2009 05:27:18 -0000	1.36
+++ modules/comment/comment.admin.inc	5 Nov 2009 12:46:55 -0000
@@ -63,16 +63,22 @@ function comment_admin_overview($form, &
     'author' => array('data' => t('Author'), 'field' => 'name'),
     'posted_in' => array('data' => t('Posted in'), 'field' => 'node_title'),
     'changed' => array('data' => t('Updated'), 'field' => 'changed', 'sort' => 'desc'),
-    'operations' => array('data' => t('Operations')),
   );
 
+  // Enable the language column if there are at least two languages enabled.
+  $multilingual = drupal_multilingual();
+  if ($multilingual) {
+    $header['language'] = array('data' => t('Language'), 'field' => 'c.language');
+  }
+  $header['operations'] = array('data' => t('Operations'));
+
   $query = db_select('comment', 'c')->extend('PagerDefault')->extend('TableSort');
   $query->join('users', 'u', 'u.uid = c.uid');
   $query->join('node', 'n', 'n.nid = c.nid');
   $query->addField('u', 'name', 'registered_name');
   $query->addField('n', 'title', 'node_title');
   $result = $query
-    ->fields('c', array('subject', 'nid', 'cid', 'comment', 'changed', 'status', 'name', 'homepage'))
+    ->fields('c', array('subject', 'nid', 'cid', 'comment', 'changed', 'status', 'name', 'homepage', 'language'))
     ->fields('u', array('uid'))
     ->condition('c.status', $status)
     ->limit(50)
@@ -83,6 +89,7 @@ function comment_admin_overview($form, &
   // Build a table listing the appropriate comments.
   $options = array();
   $destination = drupal_get_destination();
+  $languages = language_list();
 
   foreach ($result as $comment) {
     $options[$comment->cid] = array(
@@ -103,13 +110,16 @@ function comment_admin_overview($form, &
         ),
       ),
       'changed' => format_date($comment->changed, 'short'),
-      'operations' => array(
-        'data' => array(
-          '#type' => 'link',
-          '#title' => t('edit'),
-          '#href' => 'comment/' . $comment->cid . '/edit',
-          '#options' => array('query' => $destination),
-        ),
+    );
+    if ($multilingual) {
+       $options[$comment->cid]['language'] = empty($comment->language) ? t('Language neutral') : t($languages[$comment->language]->name);
+    }
+    $options[$comment->cid]['operations'] = array(
+      'data' => array(
+        '#type' => 'link',
+        '#title' => t('edit'),
+        '#href' => 'comment/' . $comment->cid . '/edit',
+        '#options' => array('query' => $destination),
       ),
     );
   }
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.800
diff -u -p -r1.800 comment.module
--- modules/comment/comment.module	3 Nov 2009 06:47:22 -0000	1.800
+++ modules/comment/comment.module	5 Nov 2009 14:03:25 -0000
@@ -1652,6 +1652,7 @@ function comment_form($form, &$form_stat
 
   $op = isset($_POST['op']) ? $_POST['op'] : '';
   $node = node_load($comment->nid);
+  $form['#node'] = $node;
 
   if (!$user->uid && variable_get('comment_anonymous_' . $node->type, COMMENT_ANONYMOUS_MAYNOT_CONTACT) != COMMENT_ANONYMOUS_MAYNOT_CONTACT) {
     $form['#attached']['library'][] = array('system', 'cookie');
Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.267
diff -u -p -r1.267 locale.module
--- modules/locale/locale.module	24 Oct 2009 05:13:44 -0000	1.267
+++ modules/locale/locale.module	5 Nov 2009 14:26:42 -0000
@@ -307,6 +307,10 @@ function locale_permission() {
       'title' => t('Translate the interface'),
       'description' => t('Translate the text of the website interface.'),
     ),
+    'change comments language' => array(
+      'title' => t('Change comments language'),
+      'description' => t('Change comments language on post and edit.'),
+    )
   );
 }
 
@@ -1105,3 +1109,20 @@ function locale_url_outbound_alter(&$pat
     }
   }
 }
+
+/**
+ * Implement hook_form_FORM_ID_alter().
+ */
+function locale_form_comment_form_alter(&$form, &$form_state, $form_id) {
+  // Add the language selector if the content type has multilingual support and
+  // the user has the 'change comments permission'.
+  if (locale_multilingual_node_type($form['#node']->type)) {
+    $form['language'] = array(
+      '#type' => 'select',
+      '#title' => t('Language'),
+      '#default_value' => (isset($form['language']['#value']) ? $form['language']['#value'] : ''),
+      '#options' => array('' => t('Language neutral')) + locale_language_list('name'),
+      '#access' => user_access('change comments language') 
+    );
+  }
+}