Merge commit 'd64f51b4'

* commit 'd64f51b4':
  Squashed 'Modules/Media/' changes from 7c04ced..b312928

Modules/Media/Http/Controllers/Admin/MediaController.php

@@ -95,7 +95,7 @@ class MediaController extends AdminBaseController
     {
         $this->file->update($file, $request->all());
 
-        Flash::success('File updated');
+        Flash::success(trans('media::messages.file updated'));
         return Redirect::route('dashboard.media.index');
     }
 
@@ -111,7 +111,7 @@ class MediaController extends AdminBaseController
         $this->imagy->deleteAllFor($file);
         $this->file->destroy($file);
 
-        Flash::success('File deleted');
+        Flash::success(trans('media::messages.file deleted'));
         return Redirect::route('dashboard.media.index');
     }
 }

Modules/Media/Image/ThumbnailsManager.php

@@ -31,7 +31,7 @@ class ThumbnailsManager
         $thumbnails = [];
         foreach ($this->module->enabled() as $enabledModule) {
             $configuration = $this->config->get(strtolower($enabledModule->getName()) . '::thumbnails');
-            $thumbnails = array_merge($thumbnails, $configuration);
+            if (!is_null($configuration)) $thumbnails = array_merge($thumbnails, $configuration);
         }
 
         return $thumbnails;

Modules/Media/Resources/lang/en/messages.php

+<?php
+
+return [
+    'file updated' => 'File updated',
+    'file deleted' => 'File deleted',
+];

Modules/Media/Resources/lang/fr/messages.php

+<?php
+
+return [
+    'file updated' => 'Fichier mit à jour',
+    'file deleted' => 'File suprimer',
+];

Modules/Media/Resources/views/admin/index.blade.php

@@ -140,20 +140,21 @@ $( document ).ready(function() {
 <script type="text/javascript">
     $(function () {
         $('.data-table').dataTable({
-            "bPaginate": true,
-            "bLengthChange": true,
-            "bFilter": true,
-            "bSort": true,
-            "bInfo": true,
-            "bAutoWidth": true,
-            "oLanguage": {
-                "sUrl": '<?php echo Module::asset("core:js/vendor/datatables/{$locale}.json") ?>'
+            "paginate": true,
+            "lengthChange": true,
+            "filter": true,
+            "sort": true,
+            "info": true,
+            "autoWidth": true,
+            "order": [[ 0, "desc" ]],
+            "language": {
+                "url": '<?php echo Module::asset("core:js/vendor/datatables/{$locale}.json") ?>'
             },
-            "aoColumns": [
+            "columns": [
                 null,
                 null,
                 null,
-                { "bSortable": false }
+                { "sortable": false }
             ]
         });
     });