Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.333
diff -u -p -r1.333 bootstrap.inc
--- includes/bootstrap.inc	7 Dec 2009 07:25:24 -0000	1.333
+++ includes/bootstrap.inc	12 Dec 2009 11:56:27 -0000
@@ -1785,14 +1785,10 @@ function drupal_language_types() {
 }
 
 /**
- * Return true if there is more than one language enabled.
+ * Return TRUE if there is more than one language enabled.
  */
 function drupal_multilingual() {
-  static $multilingual;
-  if (!isset($multilingual)) {
-    $multilingual = variable_get('language_count', 1) > 1;
-  }
-  return $multilingual;
+  return variable_get('language_count', 1) > 1;
 }
 
 /**
Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.275
diff -u -p -r1.275 locale.module
--- modules/locale/locale.module	7 Dec 2009 05:02:37 -0000	1.275
+++ modules/locale/locale.module	12 Dec 2009 11:52:02 -0000
@@ -491,9 +491,8 @@ function locale_field_attach_view_alter(
  * Implements hook_entity_info_alter().
  */
 function locale_entity_info_alter(&$entity_info) {
-  $enabled = drupal_multilingual();
   foreach ($entity_info as $type => $info) {
-    $entity_info[$type]['translation']['locale'] = $enabled;
+    $entity_info[$type]['translation']['locale'] = TRUE;
   }
 }