Merge branch 'release/v2.4.6'

Author: alexusmai

LICENSE.md

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) Aleksandr Manekin [email protected]
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "laravel-file-manager",
-  "version": "2.4.4",
+  "version": "2.4.6",
   "description": "File manager for Laravel",
   "keywords": [
     "laravel",

src/FileManager.vue

@@ -45,9 +45,12 @@ import Modal from './components/modals/Modal.vue';
 import InfoBlock from './components/blocks/InfoBlock.vue';
 import ContextMenu from './components/blocks/ContextMenu.vue';
 import Notification from './components/blocks/Notification.vue';
+// Mixins
+import translate from './mixins/translate';
 
 export default {
   name: 'FileManager',
+  mixins: [translate],
   components: {
     Navbar,
     FolderTree,
@@ -140,11 +143,18 @@ export default {
         // create notification, if find message text
         if (Object.prototype.hasOwnProperty.call(response.data, 'result')) {
           if (response.data.result.message) {
+            const message = {
+              status: response.data.result.status,
+              message: Object.prototype.hasOwnProperty.call(this.lang.response, response.data.result.message)
+                ? this.lang.response[response.data.result.message]
+                : response.data.result.message,
+            };
+
             // show notification
-            EventBus.$emit('addNotification', response.data.result);
+            EventBus.$emit('addNotification', message);
 
             // set action result
-            this.$store.commit('fm/messages/setActionResult', response.data.result);
+            this.$store.commit('fm/messages/setActionResult', message);
           }
         }
 
@@ -153,25 +163,45 @@ export default {
         // loading spinner -
         this.$store.commit('fm/messages/subtractLoading');
 
-        // set error message
-        this.$store.commit('fm/messages/setError', error);
-
         const errorMessage = {
+          status: 0,
+          message: '',
+        };
+
+        const errorNotificationMessage = {
           status: 'error',
           message: '',
         };
 
         // add message
         if (error.response) {
-          errorMessage.message = error.response.data.message || error.response.statusText;
+          errorMessage.status = error.response.status;
+
+          if (error.response.data.message) {
+            const trMessage = Object.prototype.hasOwnProperty.call(this.lang.response, error.response.data.message)
+              ? this.lang.response[error.response.data.message]
+              : error.response.data.message;
+
+            errorMessage.message = trMessage;
+            errorNotificationMessage.message = trMessage;
+          } else {
+            errorMessage.message = error.response.statusText;
+            errorNotificationMessage.message = error.response.statusText;
+          }
         } else if (error.request) {
+          errorMessage.status = error.request.status;
           errorMessage.message = error.request.statusText || 'Network error';
+          errorNotificationMessage.message = error.request.statusText || 'Network error';
         } else {
           errorMessage.message = error.message;
+          errorNotificationMessage.message = error.message;
         }
 
+        // set error message
+        this.$store.commit('fm/messages/setError', errorMessage);
+
         // show notification
-        EventBus.$emit('addNotification', errorMessage);
+        EventBus.$emit('addNotification', errorNotificationMessage);
 
         return Promise.reject(error);
       });

src/lang/ar.js

@@ -157,6 +157,33 @@ const ar = {
     cutToClipboard: 'قص إلى الحافظة!',
     copyToClipboard: 'نسخ إلى الحافظة!',
   },
+  response: {
+    noConfig: 'الاعدادت غير متوفرة!',
+    notFound: 'غير متوفر!',
+    diskNotFound: 'القرص غير موجود!',
+    pathNotFound: 'مسار غير موجود!',
+    diskSelected: 'تم اختيار القرص!',
+    // files
+    fileExist: 'الملف موجود بالفعل!',
+    fileCreated: 'تم إنشاء الملف!',
+    fileUpdated: 'تم تحديث الملف!',
+    fileNotFound: 'الملف غير موجود!',
+    // directories
+    dirExist: 'المجلد موجود بالفعل!',
+    dirCreated: 'تم أنشاء المجلد!',
+    dirNotFound: 'المجلد غير موجود',
+    // actions
+    uploaded: 'تم تحديث كل الملفات!',
+    notAllUploaded: 'بعض الملفات غير المحملة!',
+    delNotFound: 'بعض الملفات غير موجودة! تحديث!',
+    deleted: 'تم الحذف!',
+    renamed: 'أعيدت تسميتها!',
+    copied: 'تم النسخ بنجاح!',
+    // zip
+    zipError: 'خطأ في إنشاء الأرشيف!',
+    // acl
+    aclError: 'تم الرفض!',
+  },
 };
 
 export default ar;

src/lang/cs.js

@@ -158,6 +158,33 @@ const cs = {
     cutToClipboard: 'Vyjmuto do schránky!',
     copyToClipboard: 'Zkopírováno do schránky!',
   },
+  response: {
+    noConfig: 'Konfigurace nebyla nalezena!',
+    notFound: 'Nenalezeno!',
+    diskNotFound: 'Disk nebyla nalezen!',
+    pathNotFound: 'Cesta nebyla nalezena!',
+    diskSelected: 'Disk byl vybrán!',
+    // files
+    fileExist: 'Soubor již existuje!',
+    fileCreated: 'Soubor byl vytvořen!',
+    fileUpdated: 'Soubor byl aktualizován!',
+    fileNotFound: 'Soubor nebyl nalezen!',
+    // directories
+    dirExist: 'Složka již existuje!',
+    dirCreated: 'Složka byla vytvořena!',
+    dirNotFound: 'Složka nebyla nalezena',
+    // actions
+    uploaded: 'Všechny soubory byly nahrány!',
+    notAllUploaded: 'Některé soubory nebyly nahrány!',
+    delNotFound: 'Některé položky nebyly nalezeny!',
+    deleted: 'Smazáno!',
+    renamed: 'Přejmenováno!',
+    copied: 'Úspěšně zkopírováno!',
+    // zip
+    zipError: 'Chyba při vytváření archivu!',
+    // acl
+    aclError: 'Přístup odepřen!',
+  },
 };
 
 export default cs;

src/lang/de.js

@@ -157,6 +157,33 @@ const de = {
     cutToClipboard: 'Ausgeschnitten in die Zwischenablage!',
     copyToClipboard: 'Kopiert in die Zwischenablage!',
   },
+  response: {
+    noConfig: 'Konfiguration nicht gefunden!',
+    notFound: 'Nicht gefunden!',
+    diskNotFound: 'Festplatte nicht gefunden!',
+    pathNotFound: 'Pfad nicht gefunden!',
+    diskSelected: 'Festplatte ausgewählt!',
+    // files
+    fileExist: 'Datei existiert bereits!',
+    fileCreated: 'Datei erstellt!',
+    fileUpdated: 'Datei wurde aktualisiert!',
+    fileNotFound: 'Datei nicht gefunden!',
+    // directories
+    dirExist: 'Ordner existiert bereits!',
+    dirCreated: 'Ordner angelegt!',
+    dirNotFound: 'Ordner nicht gefunden',
+    // actions
+    uploaded: 'Alle Dateien wurden hochgeladen!',
+    notAllUploaded: 'Einige Dateien wurden nicht hochgeladen!',
+    delNotFound: 'Einige Dateien wurden nicht gefunden!',
+    deleted: 'Gelöscht!',
+    renamed: 'Umbenannt!',
+    copied: 'Erfolgreich kopiert!',
+    // zip
+    zipError: 'Fehler bei der Erstellung des Archivs!',
+    // acl
+    aclError: 'Zugriff verweigert!',
+  },
 };
 
 export default de;

src/lang/en.js

@@ -157,6 +157,33 @@ const en = {
     cutToClipboard: 'Cut to clipboard!',
     copyToClipboard: 'Copied to clipboard!',
   },
+  response: {
+    noConfig: 'Config not found!',
+    notFound: 'Not found!',
+    diskNotFound: 'Disk not found!',
+    pathNotFound: 'Path not found!',
+    diskSelected: 'Disk selected!',
+    // files
+    fileExist: 'File already exists!',
+    fileCreated: 'File created!',
+    fileUpdated: 'File updated!',
+    fileNotFound: 'File not found!',
+    // directories
+    dirExist: 'Directory already exists!',
+    dirCreated: 'Directory created!',
+    dirNotFound: 'Directory not found',
+    // actions
+    uploaded: 'All files uploaded!',
+    notAllUploaded: 'Some files weren\'t uploaded!',
+    delNotFound: 'Some items weren\'t founded!',
+    deleted: 'Deleted!',
+    renamed: 'Renamed!',
+    copied: 'Copied successfully!',
+    // zip
+    zipError: 'Error creating archive!',
+    // acl
+    aclError: 'Access denied!',
+  },
 };
 
 export default en;