--- modules/locale/views_handler_field_locale_language.inc	2009-02-21 00:02:09.000000000 +0100
+++ modules/locale/views_handler_field_locale_language.inc	2010-04-26 22:05:03.671875000 +0200
@@ -5,8 +5,25 @@
  * Field handler to translate a language into its readable form.
  */
 class views_handler_field_locale_language extends views_handler_field {
+  function option_definition() {
+    $options = parent::option_definition();
+    $options['native_language'] = array('default' => FALSE);
+
+    return $options;
+  }
+
+  function options_form(&$form, &$form_state) {
+    parent::options_form($form, $form_state);
+    $form['native_language'] = array(
+      '#title' => t('Native language'),
+      '#type' => 'checkbox',
+      '#default_value' => $this->options['native_language'],
+      '#description' => t('If enabled, the language name will be displayed in the native language'),
+    );
+  }
+
   function render($values) {
-    $languages = language_list();
-    return isset($languages[$values->{$this->field_alias}]) ? $languages[$values->{$this->field_alias}]->name : '';
+    $languages = locale_language_list(empty($this->$options['native_language']) ? 'name' : 'native');
+    return isset($languages[$values->{$this->field_alias}]) ? $languages[$values->{$this->field_alias}] : '';
   }
 }