fix: message wrong about favourites (#669)

* fix: wrong message
* chore: update type
This commit is contained in:
JimmFly
2023-01-05 12:55:15 +08:00
committed by GitHub
parent 87451a19bb
commit 8b8665df6b
7 changed files with 26 additions and 13 deletions
@@ -57,7 +57,10 @@ type TransitionsModalProps = {
onClose: () => void; onClose: () => void;
}; };
export const ContactModal = ({ open, onClose }: TransitionsModalProps) => { export const ContactModal = ({
open,
onClose,
}: TransitionsModalProps): JSX.Element => {
const { t } = useTranslation(); const { t } = useTranslation();
const rightLinkList = [ const rightLinkList = [
{ {
@@ -37,12 +37,12 @@ const PopoverContent = () => {
onClick={() => { onClick={() => {
toggleFavoritePage(id); toggleFavoritePage(id);
toast( toast(
!favorite ? t('Removed to Favourites') : t('Added to Favourites') favorite ? t('Removed from Favourites') : t('Added to Favourites')
); );
}} }}
icon={favorite ? <FavouritedIcon /> : <FavouritesIcon />} icon={favorite ? <FavouritedIcon /> : <FavouritesIcon />}
> >
{favorite ? t('Remove to favourites') : t('Add to favourites')} {favorite ? t('Remove from favourites') : t('Add to favourites')}
</MenuItem> </MenuItem>
<MenuItem <MenuItem
icon={mode === 'page' ? <EdgelessIcon /> : <PaperIcon />} icon={mode === 'page' ? <EdgelessIcon /> : <PaperIcon />}
@@ -45,7 +45,7 @@ const FavoriteTag = ({
e.stopPropagation(); e.stopPropagation();
toggleFavoritePage(id); toggleFavoritePage(id);
toast( toast(
!favorite ? t('Removed to Favourites') : t('Added to Favourites') favorite ? t('Removed from Favourites') : t('Added to Favourites')
); );
}} }}
style={{ style={{
@@ -27,12 +27,12 @@ export const OperationCell = ({ pageMeta }: { pageMeta: PageMeta }) => {
onClick={() => { onClick={() => {
toggleFavoritePage(id); toggleFavoritePage(id);
toast( toast(
!favorite ? t('Removed to Favourites') : t('Added to Favourites') favorite ? t('Removed from Favourites') : t('Added to Favourites')
); );
}} }}
icon={favorite ? <FavouritedIcon /> : <FavouritesIcon />} icon={favorite ? <FavouritedIcon /> : <FavouritesIcon />}
> >
{favorite ? t('Remove to favourites') : t('Add to favourites')} {favorite ? t('Remove from favourites') : t('Add to favourites')}
</MenuItem> </MenuItem>
<MenuItem <MenuItem
onClick={() => { onClick={() => {
@@ -1,6 +1,13 @@
import { AllPagesIcon, FavouritesIcon, TrashIcon } from '@blocksuite/icons'; import { AllPagesIcon, FavouritesIcon, TrashIcon } from '@blocksuite/icons';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
export const useSwitchToConfig = (currentWorkspaceId: string) => {
export const useSwitchToConfig = (
currentWorkspaceId: string
): {
title: string;
href: string;
icon: React.FC<React.SVGProps<SVGSVGElement>>;
}[] => {
const { t } = useTranslation(); const { t } = useTranslation();
const List = [ const List = [
{ {
@@ -1,5 +1,8 @@
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
export const useMacKeyboardShortcuts = () => { interface ShortcutTip {
[x: string]: string;
}
export const useMacKeyboardShortcuts = (): ShortcutTip => {
const { t } = useTranslation(); const { t } = useTranslation();
return { return {
[t('Undo')]: '⌘+Z', [t('Undo')]: '⌘+Z',
@@ -23,7 +26,7 @@ export const useMacKeyboardShortcuts = () => {
}; };
}; };
export const useMacMarkdownShortcuts = () => { export const useMacMarkdownShortcuts = (): ShortcutTip => {
const { t } = useTranslation(); const { t } = useTranslation();
return { return {
[t('Bold')]: '**Text** ', [t('Bold')]: '**Text** ',
@@ -42,7 +45,7 @@ export const useMacMarkdownShortcuts = () => {
}; };
}; };
export const useWindowsKeyboardShortcuts = () => { export const useWindowsKeyboardShortcuts = (): ShortcutTip => {
const { t } = useTranslation(); const { t } = useTranslation();
return { return {
[t('Undo')]: 'Ctrl+Z', [t('Undo')]: 'Ctrl+Z',
@@ -65,7 +68,7 @@ export const useWindowsKeyboardShortcuts = () => {
[t('Reduce indent')]: 'Shift+Tab', [t('Reduce indent')]: 'Shift+Tab',
}; };
}; };
export const useWinMarkdownShortcuts = () => { export const useWinMarkdownShortcuts = (): ShortcutTip => {
const { t } = useTranslation(); const { t } = useTranslation();
return { return {
[t('Bold')]: '**Text** ', [t('Bold')]: '**Text** ',
+2 -2
View File
@@ -11,8 +11,8 @@
"Find results": "Find {{number}} results", "Find results": "Find {{number}} results",
"Collapse sidebar": "Collapse sidebar", "Collapse sidebar": "Collapse sidebar",
"Expand sidebar": "Expand sidebar", "Expand sidebar": "Expand sidebar",
"Removed to Favourites": "Removed to Favourites", "Removed from Favourites": "Removed from Favourites",
"Remove to favourites": "Remove to favourites", "Remove from favourites": "Remove from favourites",
"Added to Favourites": "Added to Favourites", "Added to Favourites": "Added to Favourites",
"Add to favourites": "Add to favourites", "Add to favourites": "Add to favourites",
"Paper": "Paper", "Paper": "Paper",