Merge remote-tracking branch 'origin/master'

Author: curry684

src/Resources/assets/js/datatables.js

@@ -38,7 +38,7 @@
         }).done(function(data) {
             var rebuild = true, cached;
 
-            var dtOpts = $.extend({}, data.options, options, {
+            var dtOpts = $.extend({}, data.options, config.options, options, {
                 ajax: function (request, drawCallback, settings) {
                     if (rebuild) {
                         data.draw = request.draw;

src/Twig/DataTablesExtension.php

@@ -47,7 +47,9 @@ public function getFunctions()
                 return json_encode([
                     'name' => $dataTable->getName(),
                     'method' => $dataTable->getMethod(),
-                    'language' => $this->getLanguageSettings($dataTable),
+                    'options' => [
+                        'language' => $this->getLanguageSettings($dataTable),
+                    ],
                 ]);
             }, ['is_safe' => ['html']]),
         ];
@@ -78,7 +80,6 @@ private function render(\Twig_Environment $twig, string $template, DataTable $da
 
     private function getOptions(DataTable $datatable, $options)
     {
-        $locale = $this->translator->getLocale();
         $result = array_merge($datatable->getOptions(), $options);
 
         $result['columns'] = array_map(