From 924b0c417ce7104da7e42b0772f12d4e396cdd31 Mon Sep 17 00:00:00 2001
From: Gabor Szanto <hello@szantogabor.com>
Date: Mon, 11 Jul 2011 13:30:48 +0200
Subject: [PATCH] #1109108: #2 Change generated id's for localized keys

---
 ...includes/handlers.inc    |    6 ++++--
 ...plugins/views_plugin_display.inc |    4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/includes/handlers.inc b/includes/handlers.inc
index 7f59c0b..2650a18 100644
--- a/includes/handlers.inc
+++ b/includes/handlers.inc
@@ -289,12 +289,14 @@ class views_handler extends views_object {
     if ($this->view->display_handler->is_defaulted($plural)) {
       $display_id = 'default';
     }
-
+  	if (isset($options['id'])) {
+    	$this->id = $options['id'];
+    }
     $this->localization_keys = array(
       $display_id,
       $this->handler_type,
       $options['table'],
-      $options['field']
+      $options['id']
     );

     $this->unpack_options($this->options, $options);
diff --git a/plugins/views_plugin_display.inc b/plugins/views_plugin_display.inc
index 65aaf0d..87b31b8 100644
--- a/plugins/views_plugin_display.inc
+++ b/plugins/views_plugin_display.inc
@@ -26,7 +26,7 @@
 class views_plugin_display extends views_plugin {
   /**
    * The top object of a view.
-   *
+   *
    * @var view
    */
   var $view = NULL;
@@ -2609,7 +2609,7 @@ class views_plugin_display extends views_plugin {
       $handler = views_get_handler($info['table'], $info['field'], $handler_type);
       if ($handler) {
         $handler->init($this->view, $info);
-        $handler->unpack_translatables($translatable, array_merge($parents, array($handler_type, $info['table'], $info['field'])));
+        $handler->unpack_translatables($translatable, array_merge($parents, array($handler_type, $info['table'], $info['id'])));
       }

       // Prevent reference problems.
--
1.7.4.1