Index: modules/field/field.multilingual.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.multilingual.inc,v
retrieving revision 1.11
diff -u -p -r1.11 field.multilingual.inc
--- modules/field/field.multilingual.inc	1 Jun 2010 18:29:41 -0000	1.11
+++ modules/field/field.multilingual.inc	2 Aug 2010 07:41:42 -0000
@@ -216,10 +216,11 @@ function field_language($entity_type, $e
   if (!isset($display_languages[$entity_type][$id][$langcode])) {
     $display_language = array();
 
-    // By default display language is set to LANGUAGE_NONE. It is up to
-    // translation handlers to implement language fallback rules.
+    // By default display language is set to LANGUAGE_NONE if the field
+    // translation is not available. It is up to translation handlers to
+    // implement language fallback rules.
     foreach (field_info_instances($entity_type, $bundle) as $instance) {
-      $display_language[$instance['field_name']] = LANGUAGE_NONE;
+      $display_language[$instance['field_name']] = isset($entity->{$instance['field_name']}[$langcode]) ? $langcode : LANGUAGE_NONE;
     }
 
     if (field_has_translation_handler($entity_type)) {