From 19e2c763a1ea9d1f9484acf37e791e9d86292efc Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Tue, 17 Jan 2023 16:16:14 +0100 Subject: [PATCH] Get rid of our useTranslations composable --- changelog/unreleased/change-update-vue | 1 + .../src/components/Spaces/SpacesList.vue | 8 ++------ packages/web-app-admin-settings/src/views/Spaces.vue | 5 +++-- .../src/components/FilesList/ResourceTiles.vue | 5 +++-- .../src/components/SideBar/Details/FileDetails.vue | 4 ++-- .../src/components/SideBar/PrivateLinkItem.vue | 5 +++-- .../components/SideBar/Shares/Links/NameAndCopy.vue | 5 +++-- .../src/components/Spaces/SpaceHeader.vue | 10 +++------- packages/web-app-files/src/helpers/resources.ts | 1 - .../web-app-files/src/views/spaces/GenericSpace.vue | 5 +++-- .../web-app-files/src/views/spaces/GenericTrash.vue | 9 +++------ packages/web-app-text-editor/src/App.vue | 5 +++-- .../src/composables/appDefaults/useAppDocumentTitle.ts | 5 +++-- packages/web-pkg/src/composables/index.ts | 1 - packages/web-pkg/src/composables/translations/index.ts | 1 - .../src/composables/translations/useTranslations.ts | 5 ----- packages/web-runtime/src/layouts/Plain.vue | 5 +++-- packages/web-runtime/src/pages/accessDenied.vue | 5 +++-- packages/web-runtime/src/pages/logout.vue | 5 +++-- packages/web-runtime/src/pages/resolvePrivateLink.vue | 4 ++-- packages/web-runtime/src/pages/resolvePublicLink.vue | 4 ++-- 21 files changed, 45 insertions(+), 53 deletions(-) delete mode 100644 packages/web-pkg/src/composables/translations/index.ts delete mode 100644 packages/web-pkg/src/composables/translations/useTranslations.ts diff --git a/changelog/unreleased/change-update-vue b/changelog/unreleased/change-update-vue index 588181a1f86..b716a99216b 100644 --- a/changelog/unreleased/change-update-vue +++ b/changelog/unreleased/change-update-vue @@ -15,3 +15,4 @@ https://github.com/owncloud/web/pull/8198 https://github.com/owncloud/web/pull/8213 https://github.com/owncloud/web/pull/8214 https://github.com/owncloud/web/pull/8221 +https://github.com/owncloud/web/pull/8257 diff --git a/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue b/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue index bf378a9ebbf..f2e5f65c45a 100644 --- a/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue +++ b/packages/web-app-admin-settings/src/components/Spaces/SpacesList.vue @@ -136,10 +136,10 @@ import { } from 'web-pkg/src/helpers' import { computed, defineComponent, nextTick, onMounted, PropType, ref, unref, watch } from 'vue' import { extractDomSelector, SpaceResource } from 'web-client/src/helpers' -import { useTranslations } from 'web-pkg/src/composables' import { spaceRoleEditor, spaceRoleManager, spaceRoleViewer } from 'web-client/src/helpers/share' import Mark from 'mark.js' import Fuse from 'fuse.js' +import { useGettext } from 'vue3-gettext' export default defineComponent({ name: 'SpacesList', @@ -159,11 +159,7 @@ export default defineComponent({ }, emits: ['toggleSelectSpace', 'toggleSelectAllSpaces', 'toggleUnSelectAllSpaces'], setup: function (props, { emit }) { - const { - $gettext, - interpolate: $gettextInterpolate, - current: currentLanguage - } = useTranslations() + const { $gettext, interpolate: $gettextInterpolate, current: currentLanguage } = useGettext() const contextMenuButton = ref(undefined) const sortBy = ref('name') const sortDir = ref('asc') diff --git a/packages/web-app-admin-settings/src/views/Spaces.vue b/packages/web-app-admin-settings/src/views/Spaces.vue index e5bd0efa237..27837255176 100644 --- a/packages/web-app-admin-settings/src/views/Spaces.vue +++ b/packages/web-app-admin-settings/src/views/Spaces.vue @@ -63,7 +63,7 @@