diff --git a/entityreference.module b/entityreference.module
old mode 100644
new mode 100755
index 5f03c5b..3e1ea4a
--- a/entityreference.module
+++ b/entityreference.module
@@ -1075,6 +1075,7 @@ function entityreference_field_formatter_info() {
       'settings' => array(
         'view_mode' => '',
         'links' => TRUE,
+        'use_content_language' => FALSE,
       ),
     ),
   );
@@ -1118,6 +1119,12 @@ function entityreference_field_formatter_settings_form($field, $instance, $view_
       '#title' => t('Show links'),
       '#default_value' => $settings['links'],
     );
+    
+    $element['use_content_language'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Use current content language'),
+      '#default_value' => $settings['use_content_language'],
+    );
   }
 
   return $element;
@@ -1140,6 +1147,7 @@ function entityreference_field_formatter_settings_summary($field, $instance, $vi
     $entity_info = entity_get_info($field['settings']['target_type']);
     $summary[] = t('Rendered as @mode', array('@mode' => isset($entity_info['view modes'][$settings['view_mode']]['label']) ? $entity_info['view modes'][$settings['view_mode']]['label'] : $settings['view_mode']));
     $summary[] = !empty($settings['links']) ? t('Display links') : t('Do not display links');
+    $summary[] = !empty($settings['use_content_language']) ? t('Use current content language') : t('Use field language');
   }
 
   return implode('<br />', $summary);
@@ -1238,6 +1246,9 @@ function entityreference_field_formatter_view($entity_type, $entity, $field, $in
         if ($depth > 20) {
           throw new EntityReferenceRecursiveRenderingException(t('Recursive rendering detected when rendering entity @entity_type(@entity_id). Aborting rendering.', array('@entity_type' => $entity_type, '@entity_id' => $item['target_id'])));
         }
+        if ($settings['use_content_language'] && !empty($GLOBALS['language_content']->language)) {
+          $langcode = $GLOBALS['language_content']->language;
+        }
 
         $entity = clone $item['entity'];
         unset($entity->content);