diff --git a/modules/translation/views_handler_field_node_language.inc b/modules/translation/views_handler_field_node_language.inc
index 93bd883..c3c0d3c 100644
--- a/modules/translation/views_handler_field_node_language.inc
+++ b/modules/translation/views_handler_field_node_language.inc
@@ -7,6 +7,7 @@ class views_handler_field_node_language extends views_handler_field_node {
   function option_definition() {
     $options = parent::option_definition();
     $options['native_language'] = array('default' => FALSE);
+    $options['short_language'] = array('default' => FALSE, 'bool' => TRUE);
 
     return $options;
   }
@@ -19,12 +20,22 @@ class views_handler_field_node_language extends views_handler_field_node {
       '#default_value' => $this->options['native_language'],
       '#description' => t('If enabled, the native name of the language will be displayed'),
     );
+    $form['short_language'] = array(
+      '#title' => t('Short language'),
+      '#type' => 'checkbox',
+      '#default_value' => $this->options['short_language'],
+      '#description' => t('If enabled, the language will be displayed as lettercode'),
+    );
   }
 
   function render($values) {
-    $languages = views_language_list(empty($this->options['native_language']) ? 'name' : 'native');
     $value = $this->get_value($values);
-    $value = isset($languages[$value]) ? $languages[$value] : '';
+    if (!$this->options['short_language']) {
+      // Extract language in long format using admin preference
+      $languages = views_language_list(empty($this->options['native_language']) ? 'name' : 'native');
+      // Display language only if available in admin choice format
+      $value = isset($languages[$value]) ? $languages[$value] : '';
+    }
     return $this->render_link($value, $values);
   }
 }