diff --git a/frontend/src/app/main/ui/dashboard/deleted.cljs b/frontend/src/app/main/ui/dashboard/deleted.cljs index c9c4d398ba..7ad6f2f374 100644 --- a/frontend/src/app/main/ui/dashboard/deleted.cljs +++ b/frontend/src/app/main/ui/dashboard/deleted.cljs @@ -61,7 +61,7 @@ [:div#dashboard-deleted-title {:class (stl/css :dashboard-title)} [:h1 (tr "dashboard.projects-title")]]]) -(mf/defc deleted-project-menu* +(mf/defc project-context-menu* {::mf/private true} [{:keys [project show on-close top left]}] (let [top (d/nilv top 0) @@ -161,7 +161,7 @@ menu-icon]] (when (:menu-open @local) - [:> deleted-project-menu* + [:> project-context-menu* {:project project :show (:menu-open @local) :left (+ 24 (:x (:menu-pos @local))) diff --git a/frontend/src/app/main/ui/dashboard/file_menu.cljs b/frontend/src/app/main/ui/dashboard/file_menu.cljs index b08a42118e..85b3dc2ac8 100644 --- a/frontend/src/app/main/ui/dashboard/file_menu.cljs +++ b/frontend/src/app/main/ui/dashboard/file_menu.cljs @@ -6,6 +6,7 @@ (ns app.main.ui.dashboard.file-menu (:require + [app.common.data :as d] [app.main.data.common :as dcm] [app.main.data.dashboard :as dd] [app.main.data.event :as-alias ev] @@ -89,12 +90,12 @@ on-duplicate (fn [_] (apply st/emit! (map dd/duplicate-file files)) - (st/emit! (ntf/success (tr "dashboard.success-duplicate-file" (i18n/c (count files)))))) + (st/emit! (ntf/success (tr "dashboard.success-duplicate-file" (i18n/c file-count))))) on-delete-accept (fn [_] (apply st/emit! (map dd/delete-file files)) - (st/emit! (ntf/success (tr "dashboard.success-delete-file" (i18n/c (count files)))) + (st/emit! (ntf/success (tr "dashboard.success-delete-file" (i18n/c file-count))) (dd/clear-selected-files))) on-delete @@ -193,7 +194,7 @@ (fn [_] (st/emit! (dd/restore-files-immediately (with-meta {:team-id (:id current-team) - :ids #{(:id file)}} + :ids (into #{} d/xf:map-id files)} {:on-success #(st/emit! (ntf/success (tr "dashboard.restore-success-notification" (:name file))) (dd/fetch-projects (:id current-team)) (dd/fetch-deleted-files (:id current-team))) @@ -201,6 +202,7 @@ on-restore-immediately (fn [] + (prn files) (st/emit! (modal/show {:type :confirm :title (tr "dashboard-restore-file-confirmation.title") @@ -213,7 +215,7 @@ (fn [] (let [accept-fn #(st/emit! (dd/delete-files-immediately {:team-id (:id current-team) - :ids #{(:id file)}}))] + :ids (into #{} d/xf:map-id files)}))] (st/emit! (modal/show {:type :confirm :title (tr "dashboard.delete-forever-confirmation.title") @@ -260,14 +262,12 @@ options (if can-restore - [(when can-restore - {:name (tr "dashboard.restore-file-button") - :id "restore-file" - :handler on-restore-immediately}) - (when can-restore - {:name (tr "dashboard.delete-file-button") - :id "delete-file" - :handler on-delete-immediately})] + [{:name (tr "dashboard.file-menu.restore-files-option" (i18n/c file-count)) + :id "restore-file" + :handler on-restore-immediately} + {:name (tr "dashboard.file-menu.delete-files-permanently-option" (i18n/c file-count)) + :id "delete-file" + :handler on-delete-immediately}] (if multi? [(when can-edit {:name (tr "dashboard.duplicate-multi" file-count) diff --git a/frontend/translations/en.po b/frontend/translations/en.po index 36a89f9adf..dc5ce76d54 100644 --- a/frontend/translations/en.po +++ b/frontend/translations/en.po @@ -8477,11 +8477,13 @@ msgstr "Restore All" msgid "dashboard.clear-trash-button" msgstr "Clear trash" -msgid "dashboard.restore-file-button" -msgstr "Restore file" +msgid "dashboard.file-menu.restore-files-option" +msgstr[0] "Restore file" +msgstr[1] "Restore files" -msgid "dashboard.delete-file-button" -msgstr "Delete file" +msgid "dashboard.file-menu.delete-files-permanently-option" +msgstr[0] "Delete file" +msgstr[1] "Delete files" msgid "dashboard.restore-project-button" msgstr "Restore project" diff --git a/frontend/translations/es.po b/frontend/translations/es.po index 31de29a72c..2d22b6dcbe 100644 --- a/frontend/translations/es.po +++ b/frontend/translations/es.po @@ -8330,11 +8330,13 @@ msgstr "Restaurar todo" msgid "dashboard.clear-trash-button" msgstr "Vaciar papelera" -msgid "dashboard.restore-file-button" -msgstr "Restaurar archivo" +msgid "dashboard.file-menu.restore-files-option" +msgstr[0] "Restaurar archivo" +msgstr[1] "Restaurar archivos" -msgid "dashboard.delete-file-button" -msgstr "Eliminar archivo" +msgid "dashboard.file-menu.delete-files-permanently-option" +msgstr[0] "Eliminar archivo" +msgstr[1] "Eliminar archivos" msgid "dashboard.restore-project-button" msgstr "Restaurar proyecto"