### Eclipse Workspace Patch 1.0
#P drupal_test_7
Index: modules/field/field.info.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.info.inc,v
retrieving revision 1.8
diff -u -r1.8 field.info.inc
--- modules/field/field.info.inc	10 Jul 2009 05:58:13 -0000	1.8
+++ modules/field/field.info.inc	16 Jul 2009 00:19:32 -0000
@@ -70,16 +70,21 @@
  *   * module: module that exposes the entity type
  */
 function _field_info_collate_types($reset = FALSE) {
+  global $language;
   static $info;
 
+  // The informations contain translated strings, and are thus cached by
+  // language.
+  $langcode = $language->language;
+
   if ($reset) {
     $info = NULL;
-    cache_clear_all('field_info_types', 'cache_field');
+    cache_clear_all('field_info_types:', 'cache_field', TRUE);
     return;
   }
 
   if (!isset($info)) {
-    if ($cached = cache_get('field_info_types', 'cache_field')) {
+    if ($cached = cache_get("field_info_types:$langcode", 'cache_field')) {
       $info = $cached->data;
     }
     else {
@@ -145,7 +150,7 @@
       }
       drupal_alter('fieldable_info', $info['fieldable types']);
 
-      cache_set('field_info_types', $info, 'cache_field');
+      cache_set("field_info_types:$langcode", $info, 'cache_field');
     }
   }
 
Index: modules/image/image.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/image/image.module,v
retrieving revision 1.2
diff -u -r1.2 image.module
--- modules/image/image.module	15 Jul 2009 17:40:17 -0000	1.2
+++ modules/image/image.module	16 Jul 2009 00:19:32 -0000
@@ -383,7 +383,7 @@
 
   // Clear image style and effect caches.
   cache_clear_all('image_styles', 'cache');
-  cache_clear_all('image_effects', 'cache');
+  cache_clear_all('image_effects:', 'cache', TRUE);
   drupal_static_reset('image_styles');
   drupal_static_reset('image_effects');
 
@@ -487,10 +487,16 @@
  * @see image_effect_definition_load()
  */
 function image_effect_definitions() {
+  global $language;
+
+  // The informations contain translated strings, and are thus cached by
+  // language.
+  $langcode = $language->language;
+
   $effects = &drupal_static(__FUNCTION__);
 
   if (!isset($effects)) {
-    if ($cache = cache_get('image_effects') && !empty($cache->data)) {
+    if ($cache = cache_get("image_effects:$langcode") && !empty($cache->data)) {
       $effects = $cache->data;
     }
     else {
@@ -505,7 +511,7 @@
         };
       }
       uasort($effects, '_image_effect_definitions_sort');
-      cache_set('image_effects', $effects);
+      cache_set("image_effects:$langcode", $effects);
     }
   }