Index: modules/comment/comment.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.admin.inc,v
retrieving revision 1.47
diff -u -p -r1.47 comment.admin.inc
--- modules/comment/comment.admin.inc	25 Jun 2010 21:24:35 -0000	1.47
+++ modules/comment/comment.admin.inc	19 Jul 2010 04:36:23 -0000
@@ -65,14 +65,24 @@ 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')),
   );
 
+  $comment_fields = array('cid', 'subject', 'name', 'changed');
+
+  // 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');
+    $languages = language_list();
+    $comment_fields[] = 'language';
+  }
+  $header['operations'] = array('data' => t('Operations'));
+
   $query = db_select('comment', 'c')->extend('PagerDefault')->extend('TableSort');
   $query->join('node', 'n', 'n.nid = c.nid');
   $query->addField('n', 'title', 'node_title');
   $result = $query
-    ->fields('c', array('cid', 'subject', 'name', 'changed'))
+    ->fields('c', $comment_fields)
     ->condition('c.status', $status)
     ->limit(50)
     ->orderByHeader($header)
@@ -114,13 +124,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($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.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.test,v
retrieving revision 1.84
diff -u -p -r1.84 comment.test
--- modules/comment/comment.test	7 Jul 2010 17:00:42 -0000	1.84
+++ modules/comment/comment.test	19 Jul 2010 04:36:23 -0000
@@ -985,6 +985,43 @@ class CommentApprovalTest extends Commen
 }
 
 /**
+ * Functional tests for comment language administration.
+ */
+class CommentLanguageAdministrationTest extends DrupalWebTestCase {
+  public static function getInfo() {
+    return array(
+      'name' => 'Comment language administration',
+      'description' => 'Test the language administration for comments.',
+      'group' => 'Comment',
+    );
+  }
+
+  function setUp() {
+    parent::setUp('comment', 'locale');
+  }
+
+  function testLanguageAdministration() {
+    $this->admin_user = $this->drupalCreateUser(array('administer comments', 'access administration pages', 'administer languages', 'create article content'));
+    $this->drupalLogin($this->admin_user);
+    // Test that the language column is not present with only one language
+    // enabled.
+    $this->drupalGet('admin/content/comment');
+    $this->assertNoText(t('Language'), t('The language column is not present.'));
+    // Add Italian language.
+    $this->drupalGet('admin/config/regional/language/add');
+    $edit = array(
+      'langcode' => 'it',
+    );
+    $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language'));
+    $this->assertText('it', t('Language added successfully.'));
+    // Test that the language column is present with more than one language
+    // enabled.
+    $this->drupalGet('admin/content/comment');
+    $this->assertText(t('Language'), t('The language column is present.'));
+  }
+}
+
+/**
  * Functional tests for the comment module blocks.
  */
 class CommentBlockFunctionalTest extends CommentHelperCase {