diff --git a/dictionaries/ui/components/datatable/en.dictionary.itop.datatable.php b/dictionaries/ui/components/datatable/en.dictionary.itop.datatable.php index f8cd9c3d5..ee95e3d71 100644 --- a/dictionaries/ui/components/datatable/en.dictionary.itop.datatable.php +++ b/dictionaries/ui/components/datatable/en.dictionary.itop.datatable.php @@ -19,13 +19,14 @@ // Display DataTable Dict::Add('EN US', 'English', 'English', array( - 'UI:Datatables:Language:Processing' => 'Please wait...', - 'UI:Datatables:Language:LengthMenu' => '_MENU_ per page', - 'UI:Datatables:Language:ZeroRecords' => 'No result', - 'UI:Datatables:Language:Info' => '_TOTAL_ item(s)', - 'UI:Datatables:Language:InfoEmpty' => 'No information', - 'UI:Datatables:Language:EmptyTable' => 'No data available in this table', + 'UI:Datatables:Language:Processing' => 'Please wait...', + 'UI:Datatables:Language:LengthMenu' => '_MENU_ per page', + 'UI:Datatables:Language:ZeroRecords' => 'No result', + 'UI:Datatables:Language:Info' => '_TOTAL_ item(s)', + 'UI:Datatables:Language:InfoEmpty' => 'No information', + 'UI:Datatables:Language:EmptyTable' => 'No data available in this table', + 'UI::Datatables:Language:Error' => 'An error occured while running the query', 'UI:Datatables:Language:DisplayLength:All' => 'All', - 'UI:Datatables:Language:Sort:Ascending' => 'enable for an ascending sort', - 'UI:Datatables:Language:Sort:Descending' => 'enable for a descending sort', + 'UI:Datatables:Language:Sort:Ascending' => 'enable for an ascending sort', + 'UI:Datatables:Language:Sort:Descending' => 'enable for a descending sort', )); \ No newline at end of file diff --git a/dictionaries/ui/components/datatable/fr.dictionary.itop.datatable.php b/dictionaries/ui/components/datatable/fr.dictionary.itop.datatable.php index 3915ae698..4687120f5 100644 --- a/dictionaries/ui/components/datatable/fr.dictionary.itop.datatable.php +++ b/dictionaries/ui/components/datatable/fr.dictionary.itop.datatable.php @@ -18,13 +18,14 @@ */ // Display DataTable Dict::Add('FR FR', 'French', 'Français', array( - 'UI:Datatables:Language:Processing' => 'Patientez ...', - 'UI:Datatables:Language:LengthMenu' => '_MENU_ par page', - 'UI:Datatables:Language:ZeroRecords' => 'Pas de résultat', - 'UI:Datatables:Language:Info' => '_TOTAL_ élément(s)', - 'UI:Datatables:Language:InfoEmpty' => 'Pas d\'information', - 'UI:Datatables:Language:EmptyTable' => 'Pas de résultat', + 'UI:Datatables:Language:Processing' => 'Patientez ...', + 'UI:Datatables:Language:LengthMenu' => '_MENU_ par page', + 'UI:Datatables:Language:ZeroRecords' => 'Pas de résultat', + 'UI:Datatables:Language:Info' => '_TOTAL_ élément(s)', + 'UI:Datatables:Language:InfoEmpty' => 'Pas d\'information', + 'UI:Datatables:Language:EmptyTable' => 'Pas de résultat', + 'UI::Datatables:Language:Error' => 'Erreur lors du chargement des données', 'UI:Datatables:Language:DisplayLength:All' => 'Tous', - 'UI:Datatables:Language:Sort:Ascending' => 'tri croissant', - 'UI:Datatables:Language:Sort:Descending' => 'tri décroissant', + 'UI:Datatables:Language:Sort:Ascending' => 'tri croissant', + 'UI:Datatables:Language:Sort:Descending' => 'tri décroissant', )); \ No newline at end of file diff --git a/sources/Controller/AjaxRenderController.php b/sources/Controller/AjaxRenderController.php index 1942eb52c..98ea043e7 100644 --- a/sources/Controller/AjaxRenderController.php +++ b/sources/Controller/AjaxRenderController.php @@ -415,7 +415,7 @@ class AjaxRenderController } } } - if (isset($aObject)) { + if (isset($aObj)) { if ($sIdName != "") { if (isset($aObj[$sIdName])) { $aObj["id"] = $aObj[$sIdName]; diff --git a/templates/base/components/datatable/layout.ready.js.twig b/templates/base/components/datatable/layout.ready.js.twig index de73d2f8a..26fbcc6f4 100644 --- a/templates/base/components/datatable/layout.ready.js.twig +++ b/templates/base/components/datatable/layout.ready.js.twig @@ -28,7 +28,7 @@ var oTable{{ sListIDForVarSuffix }} = $('#{{ oUIBlock.GetId() }}').DataTable({ infoEmpty: "{{ 'UI:Datatables:Language:InfoEmpty'|dict_s }}", infoFiltered: "({{ 'UI:Datatables:Language:InfoFiltered'|dict_s }})", emptyTable: "{{ 'UI:Datatables:Language:EmptyTable'|dict_s }}", - errorMessage: "{{ 'UI:RunQuery:Error'|dict_s }}", + errorMessage: "{{ 'UI::Datatables:Language:Error'|dict_s }}", buttonOk: "{{ 'UI:Button:Ok'|dict_s }}", paginate: { first: "",