From abc895c6b21990899f7b621ee8836eae56ba3f60 Mon Sep 17 00:00:00 2001 From: linonetwo Date: Tue, 10 Jan 2023 18:15:02 +0800 Subject: [PATCH] fix: merge issue --- client-app/src-OctoBase | 2 +- packages/app/src/components/create-workspace/index.tsx | 2 +- packages/app/src/components/edgeless-toolbar/index.tsx | 2 +- packages/app/src/components/file-upload/index.tsx | 2 +- .../components/header/header-right-items/TrashButtonGroup.tsx | 2 +- packages/app/src/components/workspace-modal/index.tsx | 2 +- packages/app/src/components/workspace-modal/languageMenu.tsx | 3 +-- .../WorkspaceSelector/SelectorPopperContent.tsx | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/client-app/src-OctoBase b/client-app/src-OctoBase index b941d0a8a9..456b68ec75 160000 --- a/client-app/src-OctoBase +++ b/client-app/src-OctoBase @@ -1 +1 @@ -Subproject commit b941d0a8a9ca2a5a0c14dc6fa86e868be9075700 +Subproject commit 456b68ec75cb3ac2cd361b869d9b6c59c3e2714c diff --git a/packages/app/src/components/create-workspace/index.tsx b/packages/app/src/components/create-workspace/index.tsx index 05c37f9900..1a0910a74c 100644 --- a/packages/app/src/components/create-workspace/index.tsx +++ b/packages/app/src/components/create-workspace/index.tsx @@ -5,7 +5,7 @@ import { useState } from 'react'; import Input from '@/ui/input'; import { useTemporaryHelper } from '@/providers/temporary-helper-provider'; import { KeyboardEvent } from 'react'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; interface ICloseParams { workspaceId?: string; } diff --git a/packages/app/src/components/edgeless-toolbar/index.tsx b/packages/app/src/components/edgeless-toolbar/index.tsx index c30e9a3589..33784928b9 100644 --- a/packages/app/src/components/edgeless-toolbar/index.tsx +++ b/packages/app/src/components/edgeless-toolbar/index.tsx @@ -19,7 +19,7 @@ import Slide from '@mui/material/Slide'; import useCurrentPageMeta from '@/hooks/use-current-page-meta'; import { useAppState } from '@/providers/app-state-provider'; import useHistoryUpdated from '@/hooks/use-history-update'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; const useToolbarList1 = () => { const { t } = useTranslation(); diff --git a/packages/app/src/components/file-upload/index.tsx b/packages/app/src/components/file-upload/index.tsx index 090d628b22..80b089c35f 100644 --- a/packages/app/src/components/file-upload/index.tsx +++ b/packages/app/src/components/file-upload/index.tsx @@ -1,7 +1,7 @@ import { Button } from '@/ui/button'; import { FC, useRef, ChangeEvent, ReactElement } from 'react'; import { styled } from '@/styles'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; interface Props { uploadType?: string; children?: ReactElement; diff --git a/packages/app/src/components/header/header-right-items/TrashButtonGroup.tsx b/packages/app/src/components/header/header-right-items/TrashButtonGroup.tsx index 43a51afcfc..615648e975 100644 --- a/packages/app/src/components/header/header-right-items/TrashButtonGroup.tsx +++ b/packages/app/src/components/header/header-right-items/TrashButtonGroup.tsx @@ -4,7 +4,7 @@ import { useAppState } from '@/providers/app-state-provider'; import { useConfirm } from '@/providers/ConfirmProvider'; import { useRouter } from 'next/router'; import useCurrentPageMeta from '@/hooks/use-current-page-meta'; -import { useTranslation } from 'react-i18next'; +import { useTranslation } from '@affine/i18n'; export const TrashButtonGroup = () => { const { permanentlyDeletePage } = usePageHelper(); diff --git a/packages/app/src/components/workspace-modal/index.tsx b/packages/app/src/components/workspace-modal/index.tsx index cb0605a785..69cd96c8bc 100644 --- a/packages/app/src/components/workspace-modal/index.tsx +++ b/packages/app/src/components/workspace-modal/index.tsx @@ -10,7 +10,7 @@ import { UsersIcon, AddIcon, } from '@blocksuite/icons'; -import { useConfirm } from '@/providers/confirm-provider'; +import { useConfirm } from '@/providers/ConfirmProvider'; import { toast } from '@/ui/toast'; import { WorkspaceAvatar } from '@/components/workspace-avatar'; import { useTemporaryHelper } from '@/providers/temporary-helper-provider'; diff --git a/packages/app/src/components/workspace-modal/languageMenu.tsx b/packages/app/src/components/workspace-modal/languageMenu.tsx index 557a4f8f03..e58f7edee0 100644 --- a/packages/app/src/components/workspace-modal/languageMenu.tsx +++ b/packages/app/src/components/workspace-modal/languageMenu.tsx @@ -1,10 +1,9 @@ -import { LOCALES } from '@/libs/i18n/resources/index'; import UnfoldMoreIcon from '@mui/icons-material/UnfoldMore'; import type { TooltipProps } from '@mui/material'; import { styled } from '@/styles'; import { Button, Tooltip } from '@mui/material'; import { useState } from 'react'; -import { useTranslation } from 'react-i18next'; +import { useTranslation, LOCALES } from '@affine/i18n'; export const LanguageMenu = () => { const { i18n } = useTranslation(); diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx index f8bca4787d..64d9493c78 100644 --- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx +++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx @@ -12,7 +12,7 @@ import { } from './WorkspaceItem'; import { WorkspaceSetting } from '@/components/workspace-setting'; import { useCallback, useEffect, useState } from 'react'; -import { getDataCenter, WorkspaceType } from '@affine/datacenter'; +import { WorkspaceType } from '@affine/datacenter'; import { useModal } from '@/providers/GlobalModalProvider'; export type WorkspaceDetails = Record<