diff --git a/modules/field.views.inc b/modules/field.views.inc
index dd4363f..7130126 100644
--- a/modules/field.views.inc
+++ b/modules/field.views.inc
@@ -400,6 +400,45 @@ function field_views_field_default_views_data($field) {
           'field_name' => $field['field_name'],
         );
       }
+
+      // Expose additional language column for translatable fields.
+      if (!empty($field['translatable'])) {
+        $title_language = t('@label (!name:language)', array('@label' => $label, '!name' => $field['field_name']));
+        $title_short_language = t('@label:language', array('@label' => $label));
+
+        $data[$table]['language'] = array(
+          'group' => $group,
+          'title' => $title_language,
+          'title short' => $title_short_language,
+          'help' => t('Language - Appears in: @bundles.', array('@bundles' => implode(', ', $bundles_names))),
+        );
+        $data[$table]['language']['field'] = array(
+          'handler' => 'views_handler_field_locale_language',
+        );
+        $data[$table]['language']['argument'] = array(
+          'field' => 'language',
+          'table' => $table,
+          'handler' => 'views_handler_argument_locale_language',
+          'additional fields' => $additional_fields,
+          'empty field name' => t('<No value>'),
+          'field_name' => $field['field_name'],
+        );
+        $data[$table]['language']['filter'] = array(
+          'field' => 'language',
+          'table' => $table,
+          'handler' => 'views_handler_filter_locale_language',
+          'additional fields' => $additional_fields,
+          'field_name' => $field['field_name'],
+          'allow empty' => TRUE,
+        );
+        $data[$table]['language']['sort'] = array(
+          'field' => 'language',
+          'table' => $table,
+          'handler' => 'views_handler_sort',
+          'additional fields' => $additional_fields,
+          'field_name' => $field['field_name'],
+        );
+      }
     }
   }
 
diff --git a/modules/locale/views_handler_field_locale_language.inc b/modules/locale/views_handler_field_locale_language.inc
index 0ff36a8..72e7a63 100644
--- a/modules/locale/views_handler_field_locale_language.inc
+++ b/modules/locale/views_handler_field_locale_language.inc
@@ -26,6 +26,6 @@ class views_handler_field_locale_language extends views_handler_field {
   function render($values) {
     $languages = locale_language_list(empty($this->$options['native_language']) ? 'name' : 'native');
     $value = $this->get_value($values);
-    return isset($languages[$value]) ? $languages[$value]->name : '';
+    return isset($languages[$value]) ? $languages[$value] : '';
   }
 }