From 63d4bfcf27a91abd36d1c3d90c7ff6c03b645190 Mon Sep 17 00:00:00 2001 From: Laurynas Gadliauskas Date: Mon, 16 Jan 2023 14:31:21 +0200 Subject: [PATCH 1/3] feat: add edit opt in ctx menu --- frontend/src/components/files/ContextMenu.vue | 18 ++++++++++++++++-- frontend/src/i18n/ar_AR.json | 19 ++++++++++--------- frontend/src/i18n/en_GB.json | 1 + frontend/src/i18n/es_AR.json | 1 + frontend/src/i18n/es_CO.json | 1 + frontend/src/i18n/es_ES.json | 1 + frontend/src/i18n/es_MX.json | 1 + frontend/src/i18n/fr_FR.json | 1 + frontend/src/i18n/id_ID.json | 7 ++++--- frontend/src/i18n/lt_LT.json | 9 +++++---- frontend/src/i18n/pt_BR.json | 1 + frontend/src/i18n/pt_PT.json | 17 +++++++++-------- frontend/src/i18n/ru_RU.json | 1 + frontend/src/i18n/tr_TR.json | 9 +++++---- frontend/src/i18n/uk_UA.json | 1 + frontend/src/i18n/zh_CN.json | 17 +++++++++-------- 16 files changed, 67 insertions(+), 38 deletions(-) diff --git a/frontend/src/components/files/ContextMenu.vue b/frontend/src/components/files/ContextMenu.vue index 9c300e68..2025200c 100644 --- a/frontend/src/components/files/ContextMenu.vue +++ b/frontend/src/components/files/ContextMenu.vue @@ -12,8 +12,15 @@

+

+ +

- +

0 && this.user.perm.delete, + edit: + this.selectedCount === 1 && + (this.req.items[this.selected].type === "text" || + this.req.items[this.selected].type === "textImmutable"), rename: this.selectedCount === 1 && this.user.perm.rename, share: this.selectedCount === 1 && this.user.perm.share, move: this.selectedCount > 0 && this.user.perm.rename, @@ -133,6 +144,9 @@ export default { close() { this.$store.commit("hideContextMenu"); }, + openFile() { + this.$router.push({ path: this.req.items[this.selected].url }); + }, download() { if (this.selectedCount === 1 && !this.req.items[this.selected[0]].isDir) { api.download(null, this.req.items[this.selected[0]].url); diff --git a/frontend/src/i18n/ar_AR.json b/frontend/src/i18n/ar_AR.json index 5b87ef55..4653a001 100644 --- a/frontend/src/i18n/ar_AR.json +++ b/frontend/src/i18n/ar_AR.json @@ -10,8 +10,9 @@ "delete": "حذف", "directorySizes": "حساب أحجام الدليل", "download": "تحميل", - "file": "File", - "folder": "Folder", + "edit": "Edit", + "file": "ملف", + "folder": "مجلّد", "hideDotfiles": "إخفاء dotfiles", "info": "معلومات", "more": "المزيد", @@ -73,7 +74,7 @@ "metadata": "بيانات تعريفية", "multipleSelectionEnabled": "التحديد المتعدد مفعل", "name": "الاسم", - "noPreview": "Preview is not available for this file.", + "noPreview": "المعاينة غير متاحة لهذا الملف.", "size": "الحجم", "sortByLastModified": "الترتيب بآخر تعديل", "sortByName": "الترتيب بالإسم", @@ -170,7 +171,7 @@ "show": "عرض", "size": "الحجم", "skipTrashMessage": "تخطى سلة المهملات واحذف فورا", - "unarchive": "حذف من الأرشيف", + "unarchive": "استخراج من الأرشيف", "unarchiveDestinationLocationMessage": "حدد الوجهة:", "unarchiveFolderNameMessage": "اختر اسم المجلد:", "unarchiveMessage": "اختر اسم المجلد الوجهة:", @@ -178,7 +179,7 @@ "unsavedChanges": "قد لا يتم حفظ التغييرات التي قمت بها. هل تريد مغادرة الصفحة؟", "upload": "تحميل", "uploadFile": "ملف", - "uploadFiles": "Uploading {files} files...", + "uploadFiles": "تحميل ملفات {files}...", "uploadFolder": "مجلّد", "uploadMessage": "حدد خيارا للتحميل.", "write": "كتابة" @@ -210,7 +211,7 @@ "commandRunnerHelp": "يمكنك هنا تعيين الأوامر التي يتم تنفيذها في الأحداث المسماة. يجب عليك كتابة واحدة فقط في كل سطر. المتغيرات البيئية {0} و {1} ستكون متاحة، حيث أن {0} متصلة بـ {1}. للمزيد من المعلومات حول هذه الميزة ومتغيرات البيئة المتاحة، يرجى قراءة {2}.", "commandsUpdated": "تم تحديث الأوامر!", "createUserDir": "إنشاء مستخدم Home Dir بصفة آلية مع إضافة مستخدم جديد", - "createUserHomeDirectory": "Create user home directory", + "createUserHomeDirectory": "إنشاء دليل المستخدم الرئيسي", "customStylesheet": "صفحة أنماط مخصصة", "defaultUserDescription": "هذه هي الإعدادات الافتراضية للمستخدمين الجدد.", "disableExternalLinks": "تعطيل الروابط الخارجية (باستثناء الوثائق)", @@ -249,7 +250,7 @@ "rules": "القواعد", "rulesHelp": "يمكنك هنا تحديد مجموعة من شروط السماح والمنع لهذا المستخدم. الملفات الممنوعة لن تظهر ضمن قائمة هذا المستخدم ولن يستطيع الوصول لها. هنا ندعم الـ regex والـ relative path لنطاق المستخدمين.", "scope": "نطاق", - "setDateFormat": "Set exact date format", + "setDateFormat": "حدد تنسيق التاريخ بدقّة", "settingsUpdated": "تم تعديل الإعدادات!", "shareDeleted": "حذف المشاركة!", "shareDuration": "مدة المشاركة", @@ -266,11 +267,11 @@ "userCreated": "تم إنشاء المستخدم", "userDefaults": "إعدادات المستخدم الافتراضية", "userDeleted": "تم حذف المستخدم", - "userHomeBasePath": "Base path for user home directories", + "userHomeBasePath": "المسار الأساسي لأدلة الصفحة الرئيسية للمستخدم", "userManagement": "إدارة المستخدمين", "username": "إسم المستخدم", "users": "المستخدمين", - "userScopeGenerationPlaceholder": "The scope will be auto generated", + "userScopeGenerationPlaceholder": "سيتم إنشاء النطاق تلقائيًا", "userUpdated": "تم تعديل المستخدم" }, "sidebar": { diff --git a/frontend/src/i18n/en_GB.json b/frontend/src/i18n/en_GB.json index f3a5d93f..9a34ca68 100644 --- a/frontend/src/i18n/en_GB.json +++ b/frontend/src/i18n/en_GB.json @@ -10,6 +10,7 @@ "delete": "Delete", "directorySizes": "Calculate directory sizes", "download": "Download", + "edit": "Edit", "file": "File", "folder": "Folder", "hideDotfiles": "Hide dotfiles", diff --git a/frontend/src/i18n/es_AR.json b/frontend/src/i18n/es_AR.json index a9772b9c..827e6cc1 100644 --- a/frontend/src/i18n/es_AR.json +++ b/frontend/src/i18n/es_AR.json @@ -10,6 +10,7 @@ "delete": "Borrar", "directorySizes": "Calcular los tamaños del directorio", "download": "Descargar", + "edit": "Edit", "file": "Archivo", "folder": "Carpeta", "hideDotfiles": "Ocultar archivos empezados por punto", diff --git a/frontend/src/i18n/es_CO.json b/frontend/src/i18n/es_CO.json index af714441..27d5bdca 100644 --- a/frontend/src/i18n/es_CO.json +++ b/frontend/src/i18n/es_CO.json @@ -10,6 +10,7 @@ "delete": "Borrar", "directorySizes": "Calcular los tamaños del directorio", "download": "Descargar", + "edit": "Edit", "file": "Archivo", "folder": "Carpeta", "hideDotfiles": "Ocultar archivos empezados por punto", diff --git a/frontend/src/i18n/es_ES.json b/frontend/src/i18n/es_ES.json index 6e60dba7..ba2867f1 100644 --- a/frontend/src/i18n/es_ES.json +++ b/frontend/src/i18n/es_ES.json @@ -10,6 +10,7 @@ "delete": "Borrar", "directorySizes": "Calcular los tamaños del directorio", "download": "Descargar", + "edit": "Edit", "file": "Archivo", "folder": "Carpeta", "hideDotfiles": "Ocultar archivos empezados por punto", diff --git a/frontend/src/i18n/es_MX.json b/frontend/src/i18n/es_MX.json index 490de743..88ba59cd 100644 --- a/frontend/src/i18n/es_MX.json +++ b/frontend/src/i18n/es_MX.json @@ -10,6 +10,7 @@ "delete": "Borrar", "directorySizes": "Calcular los tamaños del directorio", "download": "Descargar", + "edit": "Edit", "file": "Archivo", "folder": "Carpeta", "hideDotfiles": "Ocultar archivos empezados por punto", diff --git a/frontend/src/i18n/fr_FR.json b/frontend/src/i18n/fr_FR.json index 45428257..a020e94e 100644 --- a/frontend/src/i18n/fr_FR.json +++ b/frontend/src/i18n/fr_FR.json @@ -10,6 +10,7 @@ "delete": "Supprimer", "directorySizes": "Calculer la taille des dossiers", "download": "Télécharger", + "edit": "Edit", "file": "File", "folder": "Folder", "hideDotfiles": "Cacher les dotfiles", diff --git a/frontend/src/i18n/id_ID.json b/frontend/src/i18n/id_ID.json index 510184ac..76f9091b 100644 --- a/frontend/src/i18n/id_ID.json +++ b/frontend/src/i18n/id_ID.json @@ -10,6 +10,7 @@ "delete": "Hapus", "directorySizes": "Hitung ukuran direktori", "download": "Download", + "edit": "Edit", "file": "File", "folder": "Folder", "hideDotfiles": "Sembunyikan dotfile", @@ -73,7 +74,7 @@ "metadata": "Metadata", "multipleSelectionEnabled": "Beberapa pilihan diaktifkan", "name": "Nama", - "noPreview": "Preview is not available for this file.", + "noPreview": "File tidak dapat dipratinjau.", "size": "Ukuran", "sortByLastModified": "Urutkan berdasarkan terakhir kali diperbarui", "sortByName": "Urutkan berdasarkan nama", @@ -178,7 +179,7 @@ "unsavedChanges": "Perubahan yang Anda buat mungkin tidak tersimpan. Tinggalkan halaman?", "upload": "Upload", "uploadFile": "File", - "uploadFiles": "Uploading {files} files...", + "uploadFiles": "Mengupload file {files}...", "uploadFolder": "Folder", "uploadMessage": "Pilih opsi untuk diupload", "write": "Tulis" @@ -249,7 +250,7 @@ "rules": "Aturan", "rulesHelp": "Di sini Anda dapat memberikan atau membatasi aturan untuk pengguna tertentu. File yang diblokir tidak akan muncul dalam daftar dan tidak dapat diakses oleh pengguna. Kami mendukung regex dan path yang berada dalam cakupan pengguna.", "scope": "Cakupan", - "setDateFormat": "Set exact date format", + "setDateFormat": "Pilih format tanggal", "settingsUpdated": "Pengaturan diperbarui", "shareDeleted": "Akses berbagi dihapus", "shareDuration": "Durasi Berbagi", diff --git a/frontend/src/i18n/lt_LT.json b/frontend/src/i18n/lt_LT.json index 80817c3e..b0f92ae5 100644 --- a/frontend/src/i18n/lt_LT.json +++ b/frontend/src/i18n/lt_LT.json @@ -10,6 +10,7 @@ "delete": "Ištrinti", "directorySizes": "Skaičiuoti katalogų dydžius", "download": "Atsisiųsti", + "edit": "Redaguoti", "file": "Failas", "folder": "Aplankas", "hideDotfiles": "Paslėpti konfigūracijos failus", @@ -178,7 +179,7 @@ "unsavedChanges": "Atlikti pakeitimai gali būti neišsaugoti. Norite išeiti iš puslapio?", "upload": "Įkelti", "uploadFile": "Failas", - "uploadFiles": "Uploading {files} files...", + "uploadFiles": "Įkeliami {files} failai...", "uploadFolder": "Aplankas", "uploadMessage": "Pasirinkite, ką norite įkelti.", "write": "Rašyti" @@ -210,7 +211,7 @@ "commandRunnerHelp": "Čia galite nustatyti komandas, kurios bus vykdomos įvardytuose įvykiuose. Kiekvienoje eilutėje turite įrašyti po vieną komandą. Aplinkos kintamieji {0} ir {1} bus prieinami, kai {0} yra {0} atžvilgiu {1}. Daugiau informacijos apie šią funkciją ir galimus aplinkos kintamuosius rasite {2}.", "commandsUpdated": "Komandos atnaujintos!", "createUserDir": "Automatiškai susikurkite pagrindinę direktoriją, pridėjus naują naudotoją", - "createUserHomeDirectory": "Create user home directory", + "createUserHomeDirectory": "Sukurkite naudotojo pagrindinį katalogą", "customStylesheet": "Individualių stilių rinkinys", "defaultUserDescription": "Tai yra numatytieji nustatymai naujiems naudotojams.", "disableExternalLinks": "Išjungti išorines nuorodas (ošskyrus dokumentaciją)", @@ -266,11 +267,11 @@ "userCreated": "Pavyko sukurti naudotojo paskyrą!", "userDefaults": "Numatytieji paskyros nustatymai", "userDeleted": "Pavyko pašalinti naudotoją!", - "userHomeBasePath": "Base path for user home directories", + "userHomeBasePath": "Pagrindinis kelias į naudotojo pagrindinius katalogus", "userManagement": "Naudotojų valdymas", "username": "Vartotojo vardas", "users": "Naudotojai", - "userScopeGenerationPlaceholder": "The scope will be auto generated", + "userScopeGenerationPlaceholder": "Apimtis bus sugeneruota automatiškai", "userUpdated": "Naudotojo nustatymai atnaujinti!" }, "sidebar": { diff --git a/frontend/src/i18n/pt_BR.json b/frontend/src/i18n/pt_BR.json index c72519b5..b64fa496 100644 --- a/frontend/src/i18n/pt_BR.json +++ b/frontend/src/i18n/pt_BR.json @@ -10,6 +10,7 @@ "delete": "Deletar", "directorySizes": "Calcular tamanho dos diretórios", "download": "Baixar", + "edit": "Edit", "file": "Arquivo", "folder": "Pasta", "hideDotfiles": "Ocultar dotfiles", diff --git a/frontend/src/i18n/pt_PT.json b/frontend/src/i18n/pt_PT.json index dd6df025..6ad58961 100644 --- a/frontend/src/i18n/pt_PT.json +++ b/frontend/src/i18n/pt_PT.json @@ -10,8 +10,9 @@ "delete": "Eliminar", "directorySizes": "Calcular tamanho de diretório", "download": "Descarregar", - "file": "File", - "folder": "Folder", + "edit": "Edit", + "file": "Ficheiro", + "folder": "Pasta", "hideDotfiles": "Esconder dotfiles", "info": "Info", "more": "Mais", @@ -73,7 +74,7 @@ "metadata": "Metadados", "multipleSelectionEnabled": "Seleção múltipla ativada", "name": "Nome", - "noPreview": "Preview is not available for this file.", + "noPreview": "A visualização não está disponível para este ficheiro.", "size": "Tamanho", "sortByLastModified": "Ordenar pela última alteração", "sortByName": "Ordenar pelo nome", @@ -178,7 +179,7 @@ "unsavedChanges": "As alterações que fez poderão não ser guardadas. Deixar a página?", "upload": "Upload", "uploadFile": "Ficheiro", - "uploadFiles": "Uploading {files} files...", + "uploadFiles": "A fazer upload de {files} ficheiros...", "uploadFolder": "Pasta", "uploadMessage": "Selecionar uma opção para enviar.", "write": "Escrever" @@ -210,7 +211,7 @@ "commandRunnerHelp": "Aqui pode definir comandos que são executados nos eventos nomeados. Tem de escrever um por linha. As variáveis de ambiente {0} e {1} estarão disponíveis, sendo {0} relativo a {1}. Para mais informações sobre esta funcionalidade e as variáveis de ambiente, por favor verifique {2}.", "commandsUpdated": "Comandos atualizados!", "createUserDir": "Criar automaticamente a pasta de início ao adicionar um novo utilizador", - "createUserHomeDirectory": "Create user home directory", + "createUserHomeDirectory": "Criar diretório inicial do utilizador", "customStylesheet": "Folha de estilos personalizada", "defaultUserDescription": "Estas são as configurações padrão para novos utilizadores.", "disableExternalLinks": "Desativar links externos (exceto documentação)", @@ -249,7 +250,7 @@ "rules": "Regras", "rulesHelp": "Aqui pode definir um conjunto de regras para permitir ou bloquear o acesso do utilizador a determinados ficheiros ou pastas. Os ficheiros bloqueados não irão aparecer durante a navegação. Suportamos expressões regulares e os caminhos dos ficheiros devem ser relativos à base do utilizador.\n", "scope": "Base", - "setDateFormat": "Set exact date format", + "setDateFormat": "Definir formato de data exato", "settingsUpdated": "Configurações atualizadas!", "shareDeleted": "Partilha eliminada!", "shareDuration": "Partilhar duração", @@ -266,11 +267,11 @@ "userCreated": "Utilizador criado!", "userDefaults": "Configurações padrão do utilizador", "userDeleted": "Utilizador eliminado!", - "userHomeBasePath": "Base path for user home directories", + "userHomeBasePath": "Caminho base para diretórios pessoais do utilizador", "userManagement": "Gestão de utilizadores", "username": "Nome de utilizador", "users": "Utilizadores", - "userScopeGenerationPlaceholder": "The scope will be auto generated", + "userScopeGenerationPlaceholder": "O scope será gerado automaticamente", "userUpdated": "Utilizador atualizado!" }, "sidebar": { diff --git a/frontend/src/i18n/ru_RU.json b/frontend/src/i18n/ru_RU.json index 13e2c37e..04f5ae6a 100644 --- a/frontend/src/i18n/ru_RU.json +++ b/frontend/src/i18n/ru_RU.json @@ -10,6 +10,7 @@ "delete": "Удалить", "directorySizes": "Посчитать размеры каталогов", "download": "Скачать", + "edit": "Edit", "file": "File", "folder": "Folder", "hideDotfiles": "Скрыть дотфайлы", diff --git a/frontend/src/i18n/tr_TR.json b/frontend/src/i18n/tr_TR.json index babfa8d9..c616f4a3 100644 --- a/frontend/src/i18n/tr_TR.json +++ b/frontend/src/i18n/tr_TR.json @@ -10,6 +10,7 @@ "delete": "Sil", "directorySizes": "Dizin boyutlarını hesapla", "download": "İndir", + "edit": "Edit", "file": "Dosya", "folder": "Klasör", "hideDotfiles": "Nokta dosyalarını gizle", @@ -178,7 +179,7 @@ "unsavedChanges": "Yaptığınız değişiklikler kaydedilmeyecek. Çıkılsın mı?", "upload": "Yükle", "uploadFile": "Dosya", - "uploadFiles": "Uploading {files} files...", + "uploadFiles": "{files} dosyası yükleniyor...", "uploadFolder": "Klasör", "uploadMessage": "Yükleme seçeneğini belirleyin.", "write": "Yaz" @@ -210,7 +211,7 @@ "commandRunnerHelp": "Here you can set commands that are executed in the named events. You must write one per line. The environment variables {0} and {1} will be available, being {0} relative to {1}. For more information about this feature and the available environment variables, please read the {2}.", "commandsUpdated": "Komutlar güncellendi!", "createUserDir": "Yeni kullanıcı eklerken otomatik kullanıcı ana sayfa dizini oluştur", - "createUserHomeDirectory": "Create user home directory", + "createUserHomeDirectory": "Kullanıcı ana dizini oluştur", "customStylesheet": "Özel Stil Sayfası", "defaultUserDescription": "Yeni kullanıcılar için varsayılan ayarlar.", "disableExternalLinks": "Harici bağlantıları devre dışı bırak (belgeler hariç)", @@ -266,11 +267,11 @@ "userCreated": "Kullanıcı oluşturuldu!", "userDefaults": "Varsayılan kullanıcı ayarları", "userDeleted": "Kullanıcı silindi!", - "userHomeBasePath": "Base path for user home directories", + "userHomeBasePath": "Kullanıcı ana dizinleri için temel yol", "userManagement": "Kullanıcı Yönetimi", "username": "Kullanıcı Adı", "users": "Kullanıcılar", - "userScopeGenerationPlaceholder": "The scope will be auto generated", + "userScopeGenerationPlaceholder": "Kapsam otomatik oluşturulacak", "userUpdated": "Kullanıcı güncellendi!" }, "sidebar": { diff --git a/frontend/src/i18n/uk_UA.json b/frontend/src/i18n/uk_UA.json index ecb4033c..c889470e 100644 --- a/frontend/src/i18n/uk_UA.json +++ b/frontend/src/i18n/uk_UA.json @@ -10,6 +10,7 @@ "delete": "Видалити", "directorySizes": "Порахувати розміри каталогів", "download": "Скачати", + "edit": "Edit", "file": "File", "folder": "Folder", "hideDotfiles": "Сховати дотфайли", diff --git a/frontend/src/i18n/zh_CN.json b/frontend/src/i18n/zh_CN.json index b96e2291..8025a5ec 100644 --- a/frontend/src/i18n/zh_CN.json +++ b/frontend/src/i18n/zh_CN.json @@ -10,8 +10,9 @@ "delete": "删除", "directorySizes": "计算文件夹大小", "download": "下载", - "file": "File", - "folder": "Folder", + "edit": "Edit", + "file": "文件", + "folder": "文件夹", "hideDotfiles": "不显示隐藏的文件", "info": "信息", "more": "更多", @@ -73,7 +74,7 @@ "metadata": "元数据", "multipleSelectionEnabled": "多选模式已开启", "name": "名称", - "noPreview": "Preview is not available for this file.", + "noPreview": "此文件暂时不支持预览。", "size": "大小", "sortByLastModified": "按最后修改时间排序", "sortByName": "按名称排序", @@ -178,7 +179,7 @@ "unsavedChanges": "您所做的修改将不会被保存, 丢弃更改吗?", "upload": "上传", "uploadFile": "文件", - "uploadFiles": "Uploading {files} files...", + "uploadFiles": "正在上传 {files} 个文件...", "uploadFolder": "文件夹", "uploadMessage": "选择上传选项。", "write": "写入" @@ -210,7 +211,7 @@ "commandRunnerHelp": "在这里你可以设置在下面的事件中执行的命令。每行必须写一条命令。可以在命令中使用环境变量 {0} 和 {1}。关于此功能和可用环境变量的更多信息，请阅读{2}.", "commandsUpdated": "命令已更新！", "createUserDir": "在添加新用户的同时自动创建用户的个人目录", - "createUserHomeDirectory": "Create user home directory", + "createUserHomeDirectory": "创建用户主目录", "customStylesheet": "自定义样式表（CSS）", "defaultUserDescription": "这些是新用户的默认设置。", "disableExternalLinks": "禁止外部链接（帮助文档除外）", @@ -249,7 +250,7 @@ "rules": "规则", "rulesHelp": "您可以为该用户制定一组黑名单或白名单式的规则，被屏蔽的文件将不会显示在列表中，用户也无权限访问,支持相对于目录范围的路径。", "scope": "目录范围", - "setDateFormat": "Set exact date format", + "setDateFormat": "设置准确的日期格式", "settingsUpdated": "设置已更新！", "shareDeleted": "共享已删除!", "shareDuration": "分享期限", @@ -266,11 +267,11 @@ "userCreated": "用户已创建！", "userDefaults": "用户默认设置", "userDeleted": "用户已删除！", - "userHomeBasePath": "Base path for user home directories", + "userHomeBasePath": "用户主目录的基本路径", "userManagement": "用户管理", "username": "用户名", "users": "用户", - "userScopeGenerationPlaceholder": "The scope will be auto generated", + "userScopeGenerationPlaceholder": "范围将自动生成", "userUpdated": "用户已更新！" }, "sidebar": { From 5a380b79d281f5de976336f30e072e3582e3c7ed Mon Sep 17 00:00:00 2001 From: Laurynas Gadliauskas Date: Tue, 17 Jan 2023 14:46:27 +0200 Subject: [PATCH 2/3] fix: improve archive loading indicator --- frontend/src/components/prompts/Archive.vue | 21 ++++++++++++++++++++- frontend/src/css/base.css | 2 +- frontend/src/i18n/ar_AR.json | 2 +- frontend/src/i18n/en_GB.json | 4 ++-- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/prompts/Archive.vue b/frontend/src/components/prompts/Archive.vue index 69a800a8..9bea4735 100644 --- a/frontend/src/components/prompts/Archive.vue +++ b/frontend/src/components/prompts/Archive.vue @@ -12,17 +12,25 @@ type="text" @keyup.enter="submit" v-model.trim="name" + :disabled="loading" required /> @@ -48,12 +56,19 @@ export default { tarlz4: "tar.lz4", tarsz: "tar.sz", }, + loading: false, + loadingFormat: "", }; }, computed: { ...mapState(["req", "selected"]), ...mapGetters(["isFiles", "isListing"]), }, + mounted() { + if (this.selected.length > 0) { + this.name = this.req.items[this.selected[0]].name; + } + }, methods: { cancel: function () { this.$store.commit("closeHovers"); @@ -75,6 +90,8 @@ export default { uri = uri.replace("//", "/"); try { + this.loading = true; + this.loadingFormat = format; buttons.loading("archive"); await api.archive(uri, this.name, format, ...items); this.$store.commit("closeHovers"); @@ -83,6 +100,8 @@ export default { } catch (e) { this.$showError(e); } finally { + this.loading = false; + this.loadingFormat = ""; buttons.done("archive"); } }, diff --git a/frontend/src/css/base.css b/frontend/src/css/base.css index 379367fb..da8570e6 100644 --- a/frontend/src/css/base.css +++ b/frontend/src/css/base.css @@ -44,7 +44,7 @@ video { } i.spin { - animation: 1s spin linear infinite, 1s pulse linear infinite; + animation: 1s spin linear infinite; } i.pulse-spin { diff --git a/frontend/src/i18n/ar_AR.json b/frontend/src/i18n/ar_AR.json index 4653a001..40f5c905 100644 --- a/frontend/src/i18n/ar_AR.json +++ b/frontend/src/i18n/ar_AR.json @@ -10,7 +10,7 @@ "delete": "حذف", "directorySizes": "حساب أحجام الدليل", "download": "تحميل", - "edit": "Edit", + "edit": "تعديل", "file": "ملف", "folder": "مجلّد", "hideDotfiles": "إخفاء dotfiles", diff --git a/frontend/src/i18n/en_GB.json b/frontend/src/i18n/en_GB.json index 9a34ca68..f2c2addb 100644 --- a/frontend/src/i18n/en_GB.json +++ b/frontend/src/i18n/en_GB.json @@ -39,7 +39,7 @@ "submit": "Submit", "switchView": "Switch view", "toggleSidebar": "Toggle sidebar", - "unarchive": "Unarchive", + "unarchive": "Extract", "update": "Update", "upload": "Upload" }, @@ -171,7 +171,7 @@ "show": "Show", "size": "Size", "skipTrashMessage": "Skip trash bin and delete immediately", - "unarchive": "Unarchive", + "unarchive": "Extract", "unarchiveDestinationLocationMessage": "Select the destination:", "unarchiveFolderNameMessage": "Choose folder name:", "unarchiveMessage": "Choose the destination folder name:", From 9a1b39e429e777e0aec9d08c676ac5af0cc719bc Mon Sep 17 00:00:00 2001 From: Laurynas Gadliauskas Date: Tue, 17 Jan 2023 17:08:04 +0200 Subject: [PATCH 3/3] feat: remove ctrl+f override --- frontend/src/views/files/Listing.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frontend/src/views/files/Listing.vue b/frontend/src/views/files/Listing.vue index 4c777115..61bc600a 100644 --- a/frontend/src/views/files/Listing.vue +++ b/frontend/src/views/files/Listing.vue @@ -518,10 +518,6 @@ export default { let key = String.fromCharCode(event.which).toLowerCase(); switch (key) { - case "f": - event.preventDefault(); - this.$store.commit("showHover", "search"); - break; case "c": case "x": this.copyCut(event, key);