Merge pull request #12059 from snipe/fixes/consumables_files_translations

Use the generic file uploads strings

Author: snipe

app/Http/Controllers/Consumables/ConsumablesFilesController.php

@@ -68,15 +68,15 @@ public function store(AssetFileRequest $request, $consumableId = null)
                 }
 
 
-                return redirect()->route('consumables.show', $consumable->id)->with('success', trans('admin/consumables/message.upload.success'));
+                return redirect()->route('consumables.show', $consumable->id)->with('success', trans('general.file_upload_success'));
 
             }
 
-            return redirect()->route('consumables.show', $consumable->id)->with('error', trans('admin/consumables/message.upload.nofiles'));
+            return redirect()->route('consumables.show', $consumable->id)->with('error', trans('general.no_files_uploaded'));
         }
         // Prepare the error message
         return redirect()->route('consumables.index')
-            ->with('error', trans('admin/consumables/message.does_not_exist'));
+            ->with('error', trans('general.file_does_not_exist'));
     }
 
     /**
@@ -114,7 +114,7 @@ public function destroy($consumableId = null, $fileId = null)
         }
 
         // Redirect to the licence management page
-        return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
+        return redirect()->route('consumables.index')->with('error', trans('general.file_does_not_exist'));
     }
 
     /**
@@ -171,6 +171,6 @@ public function show($consumableId = null, $fileId = null, $download = true)
             }
         }
 
-        return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist', ['id' => $fileId]));
+        return redirect()->route('consumables.index')->with('error', trans('general.file_does_not_exist', ['id' => $fileId]));
     }
 }