composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Search: better translation of search criteria in "natural language" for ISNULL function

Browse Source 
SVN:trunk[5957]
This commit is contained in:
Eric Espié
2018-07-19 08:45:39 +00:00
parent 3d1ccf2028
commit 5134e57109
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/oql/expression.class.inc.php
View File

@@ -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()

2
dictionaries/en.dictionary.itop.ui.php
View File

@@ -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',
));

2
dictionaries/fr.dictionary.itop.ui.php
View File

@@ -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',
));