Skip to content

Bugfix/update share text #919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 26, 2023
Merged

Bugfix/update share text #919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4dd27f
Update texts according to issues
emm1R Jan 19, 2023
2b05322
Gitlab issue #21
emm1R Jan 23, 2023
4512cf6
Fixing grammar error
emm1R Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/config/.finnishwords.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ kaikkien
kansio
kansioille
kansioina
kansioita
kansion
kansiossa
kansiot
Expand Down Expand Up @@ -531,6 +532,7 @@ yhdelle
yhden
yhteenlaskettu
yhteys
yhtään
yksityinen
yksityisen
yksityiskohtia
Expand Down
23 changes: 14 additions & 9 deletions swift_browser_ui_frontend/src/common/lang.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).",
Expand Down Expand Up @@ -260,10 +260,12 @@ 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.",
emptyProject:
"The project does not contain any buckets " +
"or their use is not permitted.",
emptyContainer: "This folder has no content.",
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.",
Expand Down Expand Up @@ -717,9 +719,12 @@ let default_translations = {
"erikseen. Paina hyväksyäksesi suuret lataukset " +
"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.",
emptyContainer: "Tämä kansio on tyhjä.",
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 - ",
Expand Down
2 changes: 1 addition & 1 deletion swift_browser_ui_frontend/src/components/CObjectTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
13 changes: 12 additions & 1 deletion swift_browser_ui_frontend/src/components/ContainerTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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");
},
},
};
</script>