Runs searches against fields with the Translate behavior

src/Model/Behavior/SearchableBehavior.php

@@ -11,6 +11,7 @@
 namespace Search\Model\Behavior;
 
 use Cake\Core\Configure;
+use Cake\I18n\I18n;
 use Cake\ORM\Behavior;
 use Cake\ORM\Query;
 use Cake\ORM\Table;
@@ -240,9 +241,8 @@ protected function _addCondLike($data, $field) {
 
 		$cond = [];
 		foreach ($fieldNames as $fieldName) {
-			if (strpos($fieldName, '.') === false) {
-				$fieldName = $this->_table->alias() . '.' . $fieldName;
-			}
+
+			$fieldName = $this->_getFullFieldName($fieldName);
 
 			if ($field['before'] === true) {
 				$field['before'] = '%';
@@ -325,9 +325,9 @@ protected function _addCondValue($data, $field) {
 
 		$cond = [];
 		foreach ($fieldNames as $fieldName) {
-			if (strpos($fieldName, '.') === false) {
-				$fieldName = $this->_table->alias() . '.' . $fieldName;
-			}
+
+            $fieldName = $this->_getFullFieldName($fieldName);
+
 			if (is_array($fieldValue) && empty($fieldValue)) {
 				continue;
 			}
@@ -375,4 +375,32 @@ protected function _addCondFinder(Query $query, $data, $field) {
 		}
 		return $query;
 	}
+
+
+    /**
+     * Returns the full field name including the table alias.
+     * If the table has the translate behavior and the field is configured to be
+     * translated, returns the corresponding field to filter by the translated
+     * content.
+     *
+     * @param $fieldName Field name
+     * @return string
+     */
+	protected function _getFullFieldName($fieldName)
+    {
+        // If the fieldName already contains a table alias, do nothing.
+        if (strpos($fieldName, '.') === false) {
+            // If this is a translated field, search in the translated table instead of the original one
+            if ($this->_table->hasBehavior('Translate') &&
+                $this->_table->locale() != I18n::defaultLocale() &&
+                in_array($fieldName, $this->_table->behaviors()->get('Translate')->config('fields'))) {
+                $fieldName = $this->_table->alias() . '_' . $fieldName . '_translation.content';
+            } else {
+                $fieldName = $this->_table->alias() . '.' . $fieldName;
+            }
+        }
+
+        return $fieldName;
+    }
+
 }

tests/Fixture/ColorsFixture.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright 2009 - 2014, Cake Development Corporation (http://cakedc.com)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright Copyright 2009 - 2014, Cake Development Corporation (http://cakedc.com)
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+namespace Search\Test\Fixture;
+
+use Cake\TestSuite\Fixture\TestFixture;
+
+/**
+ * Tag Fixture
+ */
+class ColorsFixture extends TestFixture
+{
+
+    /**
+     * Fields
+     *
+     * @var array $fields
+     */
+    public $fields = [
+        'id' => ['type' => 'string', 'null' => false, 'default' => null, 'length' => 36],
+        'name' => ['type' => 'string', 'null' => false, 'default' => null, 'length' => 30],
+    ];
+
+}