From 5134e571091a64e5dc0cddddcf8249b5767015a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 19 Jul 2018 08:45:39 +0000
Subject: [PATCH] Search: better translation of search criteria in "natural
 language" for ISNULL function

SVN:trunk[5957]
---
 core/oql/expression.class.inc.php      | 3 ++-
 dictionaries/en.dictionary.itop.ui.php | 2 ++
 dictionaries/fr.dictionary.itop.ui.php | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index 3d3f4e80e..12b4fcc31 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -1803,6 +1803,7 @@ class FunctionExpression extends Expression
 		$sVerb = '';
 		switch ($this->m_sVerb)
 		{
+			case 'ISNULL':
 			case 'NOW':
 				$sVerb = $this->VerbToNaturalLanguage();
 				break;
@@ -1833,7 +1834,7 @@ class FunctionExpression extends Expression
 		{
 			$sOperation .= $sVerb;
 		}
-		return $sOperation;
+		return '('.$sOperation.')';
 	}
 
 	private function VerbToNaturalLanguage()
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index 9b20f0935..63a90a26a 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1515,6 +1515,7 @@ When associated with a trigger, each action is given an "order" number, specifyi
 Dict::Add('EN US', 'English', 'English', array(
 	'Expression:Operator:AND' => ' AND ',
 	'Expression:Operator:OR' => ' OR ',
+	'Expression:Operator:=' => ': ',
 
 	'Expression:Unit:Short:DAY' => 'd',
 	'Expression:Unit:Short:WEEK' => 'w',
@@ -1526,4 +1527,5 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Expression:Unit:Long:MINUTE' => 'minute(s)',
 
 	'Expression:Verb:NOW' => 'now',
+	'Expression:Verb:ISNULL' => ': undefined',
 ));
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index 3435d32a8..cac02df9d 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -1348,6 +1348,7 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Expression:Operator:AND' => ' ET ',
 	'Expression:Operator:OR' => ' OU ',
+	'Expression:Operator:=' => ' : ',
 
 	'Expression:Unit:Short:DAY' => 'j',
 	'Expression:Unit:Short:WEEK' => 's',
@@ -1359,4 +1360,5 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Expression:Unit:Long:MINUTE' => 'minute(s)',
 
 	'Expression:Verb:NOW' => 'maintenant',
+	'Expression:Verb:ISNULL' => ' : non défini',
 ));