From c4dd27fff25a94731bcf6e5792bbdfa6fefec96a Mon Sep 17 00:00:00 2001 From: Emmi Rehn Date: Thu, 19 Jan 2023 10:09:05 +0200 Subject: [PATCH 1/3] Update texts according to issues --- swift_browser_ui_frontend/src/common/lang.js | 19 ++++++++++++------- .../src/components/CObjectTable.vue | 2 +- .../src/components/ContainerTable.vue | 13 ++++++++++++- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/swift_browser_ui_frontend/src/common/lang.js b/swift_browser_ui_frontend/src/common/lang.js index 5ef6e3ca4..d0537e6e3 100644 --- a/swift_browser_ui_frontend/src/common/lang.js +++ b/swift_browser_ui_frontend/src/common/lang.js @@ -76,8 +76,8 @@ let default_translations = { sharing_to_one_project: "This folder is shared to one project.", sharing_to_many_projects: "This folder is shared to multiple projects.", shared_with_read: - "This folder is shared with you. You can view" + - " and download files in this folder (Read access).", + "This folder is shared with you. You can view files only by" + + " using SD Desktop and download files in this folder (Read access)", shared_with_read_write: "This folder is shared with you. You can view, download, upload" + " and edit tags in this folder (Read and write access).", @@ -261,9 +261,11 @@ let default_translations = { "enable them for the duration of the session.", largeDownAction: "Enable", emptyContainer: "This bucket is empty.", - emptyProject: - "The project does not contain any buckets " + - "or their use is not permitted.", + emptyProject: { + all: "There are no folders in this project.", + sharedFrom: "You haven't shared any folders.", + sharedTo: "No folders have been shared with you.", + }, emptyShared: "No buckets have been shared to the project.", emptyRequested: "No shared buckets have been requested for the " + "project.", @@ -718,8 +720,11 @@ let default_translations = { "nykyisen kirjautumisen ajaksi.", largeDownAction: "Hyväksy", emptyContainer: "Säiliö on tyhjä.", - emptyProject: - "Projektilla ei ole säiliöitä " + "tai niiden käyttöä ei ole sallittu.", + emptyProject: { + all: "Tässä projektissa ei ole kansioita.", + sharedFrom: "Et ole jakanut yhtään kansiota.", + sharedTo: "Sinulle ei ole jaettu kansioita.", + }, emptyShared: "Projektille ei ole jaettu säiliöitä.", emptyRequested: "Projektille ei ole pyydetty jakamaan säiliöitä.", sharing: "Jako - ", diff --git a/swift_browser_ui_frontend/src/components/CObjectTable.vue b/swift_browser_ui_frontend/src/components/CObjectTable.vue index d7eac0e8a..158d4a474 100644 --- a/swift_browser_ui_frontend/src/components/CObjectTable.vue +++ b/swift_browser_ui_frontend/src/components/CObjectTable.vue @@ -7,7 +7,7 @@ headers.filter(header => header.key !== 'tags'): headers" :pagination.prop="disablePagination ? null : paginationOptions" :footer-options.prop="footerOptions" - :no-data-text="$t('message.emptyProject')" + :no-data-text="$t('message.emptyContainer')" :sort-by="sortBy" :sort-direction="sortDirection" selection-property="name" diff --git a/swift_browser_ui_frontend/src/components/ContainerTable.vue b/swift_browser_ui_frontend/src/components/ContainerTable.vue index ffb377554..d1f686467 100644 --- a/swift_browser_ui_frontend/src/components/ContainerTable.vue +++ b/swift_browser_ui_frontend/src/components/ContainerTable.vue @@ -6,7 +6,7 @@ headers.filter(header => header.key !== 'tags'): headers" :pagination.prop="disablePagination ? null : paginationOptions" :footer-options.prop="footerOptions" - :no-data-text="$t('message.emptyProject')" + :no-data-text="getEmptyText()" :sort-by="sortBy" :sort-direction="sortDirection" external-data @@ -409,6 +409,17 @@ export default { ? this.paginationTextOverrides : {}; }, + getEmptyText() { + if (this.$route.name == "SharedFrom") { + return this.$t("message.emptyProject.sharedFrom"); + } + + if (this.$route.name == "SharedTo") { + return this.$t("message.emptyProject.sharedTo"); + } + + return this.$t("message.emptyProject.all"); + }, }, }; From 2b05322633b9e7c84828d6b7e84dfcac746296cf Mon Sep 17 00:00:00 2001 From: Emmi Rehn Date: Mon, 23 Jan 2023 23:50:41 +0200 Subject: [PATCH 2/3] Gitlab issue #21 --- swift_browser_ui_frontend/src/common/lang.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/swift_browser_ui_frontend/src/common/lang.js b/swift_browser_ui_frontend/src/common/lang.js index d0537e6e3..592fa3a11 100644 --- a/swift_browser_ui_frontend/src/common/lang.js +++ b/swift_browser_ui_frontend/src/common/lang.js @@ -260,7 +260,7 @@ let default_translations = { "No large (> 1GiB) downloads enabled. Click to " + "enable them for the duration of the session.", largeDownAction: "Enable", - emptyContainer: "This bucket is empty.", + emptyContainer: "This folder has no content.", emptyProject: { all: "There are no folders in this project.", sharedFrom: "You haven't shared any folders.", @@ -719,7 +719,7 @@ let default_translations = { "erikseen. Paina hyväksyäksesi suuret lataukset " + "nykyisen kirjautumisen ajaksi.", largeDownAction: "Hyväksy", - emptyContainer: "Säiliö on tyhjä.", + emptyContainer: "Tämä kansio on tyhjä.", emptyProject: { all: "Tässä projektissa ei ole kansioita.", sharedFrom: "Et ole jakanut yhtään kansiota.", From 4512cf652ac3b5c849159c3169541561573a7201 Mon Sep 17 00:00:00 2001 From: Emmi Rehn Date: Wed, 25 Jan 2023 10:21:30 +0200 Subject: [PATCH 3/3] Fixing grammar error --- .github/config/.finnishwords.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/config/.finnishwords.txt b/.github/config/.finnishwords.txt index 7ed6e803e..c6b8fa7f1 100644 --- a/.github/config/.finnishwords.txt +++ b/.github/config/.finnishwords.txt @@ -105,6 +105,7 @@ kaikkien kansio kansioille kansioina +kansioita kansion kansiossa kansiot @@ -531,6 +532,7 @@ yhdelle yhden yhteenlaskettu yhteys +yhtään yksityinen yksityisen yksityiskohtia