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

- Implementation of the localization... on going...

Browse Source 
SVN:trunk[399]
This commit is contained in:
Denis Flaven
2010-05-04 15:14:22 +00:00
parent 89dffd2845
commit cfc69316d1
3 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dictionaries/dictionary.itop.ui.php
View File

@@ -320,6 +320,8 @@ Dict::Add('EN US', 'English', 'English', array(
'UI:Button:DoImport' => ' Run the Import ! ',
'UI:Button:Done' => ' Done ',
'UI:Button:SimulateImport' => ' Simulate the Import ',
'UI:Button:Test' => 'Test!',
'UI:Button:Evaluate' => ' Evaluate ',
'UI:SearchToggle' => 'Search',
'UI:ClickToCreateNew' => 'Click here to create a new %1$s',
'UI:NoObjectToDisplay' => 'No object to display.',
@@ -438,6 +440,18 @@ Dict::Add('EN US', 'English', 'English', array(
'UI:Audit:HeaderNbObjects' => '# Objects',
'UI:Audit:HeaderNbErrors' => '# Errors',
'UI:Audit:PercentageOk' => '% Ok',
'UI:RunQuery:Title' => 'iTop - OQL Query Evaluation',
'UI:RunQuery:QueryExamples' => 'Query Examples',
'UI:RunQuery:HeaderPurpose' => 'Purpose',
'UI:RunQuery:HeaderPurpose+' => 'Explanation about the query',
'UI:RunQuery:HeaderOQLExpression' => 'OQL Expression',
'UI:RunQuery:HeaderOQLExpression+' => 'The query in OQL syntax',
'UI:RunQuery:ExpressionToEvaluate' => 'Expression to evaluate: ',
'UI:RunQuery:MoreInfo' => 'More information about the query: ',
'UI:RunQuery:DevelopedQuery' => 'Redevelopped query expression: ',
'UI:RunQuery:SerializedFilter' => 'Serialized filter: ',
'UI:RunQuery:Error' => 'An error occured while running the query: %1$s',
));

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

@@ -315,6 +315,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'UI:Button:DoImport' => ' Lancer l\'import ! ',
'UI:Button:Done' => ' Terminé ',
'UI:Button:SimulateImport' => ' Simuler l\'import ',
'UI:Button:Test' => 'Tester !',
'UI:Button:Evaluate' => ' Exécuter ',
'UI:SearchToggle' => 'Recherche',
@@ -439,6 +441,18 @@ Dict::Add('FR FR', 'French', 'Français', array(
'UI:Audit:HeaderNbErrors' => 'Nb d\'Erreurs',
'UI:Audit:PercentageOk' => '% Ok',
'UI:RunQuery:Title' => 'iTop - Evaluation de requêtes OQL',
'UI:RunQuery:QueryExamples' => 'Exemples de requêtes',
'UI:RunQuery:HeaderPurpose' => 'Objectif',
'UI:RunQuery:HeaderPurpose+' => 'But de la requête',
'UI:RunQuery:HeaderOQLExpression' => 'Requête OQL',
'UI:RunQuery:HeaderOQLExpression+' => 'La requête en OQL',
'UI:RunQuery:ExpressionToEvaluate' => 'Requête à exécuter : ',
'UI:RunQuery:MoreInfo' => 'Plus d\'information sur le requête: ',
'UI:RunQuery:DevelopedQuery' => 'Requête OQL décompilée : ',
'UI:RunQuery:SerializedFilter' => 'Version sérialisée : ',
'UI:RunQuery:Error' => 'Une erreur s\'est produite durant l\'exécution de la requête: %1$s',
));
?>

26
pages/run_query.php
View File

@@ -45,16 +45,16 @@ function ShowExamples($oP, $sExpression)
$bUsingExample = true;
}
//$aDisplayData[$sTopic][] = array(
$aDisplayData['Query examples'][] = array(
$aDisplayData[Dict::S('UI:RunQuery:QueryExamples')][] = array(
'desc' => "<div style=\"$sHighlight\">".htmlentities($sDescription)."</div>",
'oql' => "<div style=\"$sHighlight\">".htmlentities($sOql)."</div>",
'go' => "<form method=\"get\"><input type=\"hidden\" name=\"expression\" value=\"$sOql\"><input type=\"submit\" value=\"Test!\" $sDisable></form>\n",
'go' => "<form method=\"get\"><input type=\"hidden\" name=\"expression\" value=\"$sOql\"><input type=\"submit\" value=\"".Dict::S('UI:Button:Test')."\" $sDisable></form>\n",
);
}
}
$aDisplayConfig = array();
$aDisplayConfig['desc'] = array('label' => 'Target', 'description' => '');
$aDisplayConfig['oql'] = array('label' => 'OQL Expression', 'description' => '');
$aDisplayConfig['desc'] = array('label' => Dict::S('UI:RunQuery:HeaderPurpose'), 'description' => Dict::S('UI:RunQuery:HeaderPurpose+'));
$aDisplayConfig['oql'] = array('label' => Dict::S('UI:RunQuery:HeaderOQLExpression'), 'description' => Dict::S('UI:RunQuery:HeaderOQLExpression+'));
$aDisplayConfig['go'] = array('label' => '', 'description' => '');
foreach ($aDisplayData as $sTopic => $aQueriesDisplayData)
@@ -72,7 +72,7 @@ $oAppContext = new ApplicationContext();
$iActiveNodeId = utils::ReadParam('menu', -1);
$currentOrganization = utils::ReadParam('org_id', '');
$oP = new iTopWebPage("iTop - Expression Evaluation", $currentOrganization);
$oP = new iTopWebPage(Dict::S('UI:RunQuery:Title'), $currentOrganization);
// Main program
$sExpression = utils::ReadParam('expression', '');
@@ -97,9 +97,9 @@ try
}
$oP->add("<form method=\"get\">\n");
$oP->add("Expression to evaluate:<br/>\n");
$oP->add(Dict::S('UI:RunQuery:ExpressionToEvaluate')."<br/>\n");
$oP->add("<textarea cols=\"120\" rows=\"8\" name=\"expression\">$sExpression</textarea>\n");
$oP->add("<input type=\"submit\" value=\" Evaluate \">\n");
$oP->add("<input type=\"submit\" value=\"".Dict::S('UI:Button:Evaluate')."\">\n");
$oP->add("</form>\n");
if (!empty($sExpression))
@@ -113,22 +113,20 @@ try
$oResultBlock->Display($oP, 1);
$oP->p('');
$oP->StartCollapsibleSection('More info on the query', false);
$oP->p('Query expression redevelopped: '.$oFilter->ToOQL());
$oP->p('Serialized filter: '.$oFilter->serialize());
$oP->StartCollapsibleSection(Dict::S('UI:RunQuery:MoreInfo'), false);
$oP->p(Dict::S('UI:RunQuery:DevelopedQuery').$oFilter->ToOQL());
$oP->p(Dict::S('UI:RunQuery:SerializedFilter').$oFilter->serialize());
$oP->EndCollapsibleSection();
}
}
}
catch(CoreException $e)
{
$oP->p('<b>An error occured while running the query:</b>');
$oP->p($e->getHtmlDesc());
$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->getHtmlDesc()).'</b>');
}
catch(Exception $e)
{
$oP->p('<b>An error occured while running the query:</b>');
$oP->p($e->getMessage());
$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->getMessage()).'</b>');
}
$oP->output();