commit 6c7accfd47bcb0b968ac8245ba547fe54780983e
Author: fago <nuppla@zites.net>
Date:   Fri Mar 23 11:19:07 2012 -0600

    comment fixes

diff --git a/core/modules/entity/entity.class.inc b/core/modules/entity/entity.class.inc
index ea2e62b..97e0b5d 100644
--- a/core/modules/entity/entity.class.inc
+++ b/core/modules/entity/entity.class.inc
@@ -392,6 +392,8 @@ class Entity implements EntityInterface {
    * Determines the language code to use for a field.
    */
   protected function getFieldLangcode($field, $langcode = NULL) {
+    // Only apply the langcode if the entity is language specific, thus has a
+    // language assigned.
     if (field_is_translatable($this->entityType, $field) && ($default_language = $this->language())) {
       return isset($langcode) ? $langcode : $default_language->langcode;
     }
diff --git a/core/modules/entity/tests/entity.test b/core/modules/entity/tests/entity.test
index d3c954b..85af915 100644
--- a/core/modules/entity/tests/entity.test
+++ b/core/modules/entity/tests/entity.test
@@ -157,7 +157,7 @@ class EntityTranslationTestCase extends DrupalWebTestCase {
     $this->assertEqual($value, array(0 => array('value' => 'default value')), 'Untranslated value retrieved.');
 
     // Set the value in a certain language. As the entity is not translatable it
-    // should use the default language.
+    // should use the default language and so ignore the specified language.
     $entity->set($this->field_name, array(0 => array('value' => 'default value2')), $this->langcodes[1]);
     $value = $entity->get($this->field_name);
     $this->assertEqual($value, array(0 => array('value' => 'default value2')), 'Untranslated value updated.');