Yuki Takei 2 лет назад
Родитель
Сommit
3a277d83fb

+ 3 - 3
apps/app/src/components/CreateTemplateModal.tsx

@@ -53,7 +53,7 @@ type CreateTemplateModalProps = {
 export const CreateTemplateModal: React.FC<CreateTemplateModalProps> = ({
   path, isOpen, onClose,
 }) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation(['translation', 'commons']);
 
   const { createTemplate, isCreating, isCreatable } = useCreateTemplatePage();
 
@@ -62,9 +62,9 @@ export const CreateTemplateModal: React.FC<CreateTemplateModalProps> = ({
       await createTemplate?.(label);
     }
     catch (err) {
-      toastError(err);
+      toastError(t('toaster.create_failed', { target: path }));
     }
-  }, [createTemplate]);
+  }, [createTemplate, path, t]);
 
   const parentPath = pathUtils.addTrailingSlash(path);
 

+ 3 - 3
apps/app/src/components/Navbar/PageEditorModeManager.tsx

@@ -56,7 +56,7 @@ export const PageEditorModeManager = (props: Props): JSX.Element => {
     path,
   } = props;
 
-  const { t } = useTranslation('common');
+  const { t } = useTranslation('commons');
 
   const { data: isNotFound } = useIsNotFound();
   const { mutate: mutateEditorMode } = useEditorMode();
@@ -64,14 +64,14 @@ export const PageEditorModeManager = (props: Props): JSX.Element => {
 
   const { isCreating, createAndTransit } = useCreatePageAndTransit();
 
-  const editButtonClickedHandler = useCallback(() => {
+  const editButtonClickedHandler = useCallback(async() => {
     if (isNotFound == null || isNotFound === false) {
       mutateEditorMode(EditorMode.Editor);
       return;
     }
 
     try {
-      createAndTransit(
+      await createAndTransit(
         { path },
         { shouldCheckPageExists: true },
       );

+ 5 - 2
apps/app/src/components/Sidebar/PageCreateButton/PageCreateButton.tsx

@@ -1,5 +1,6 @@
 import React, { useState, useCallback } from 'react';
 
+import { useTranslation } from 'react-i18next';
 import { Dropdown } from 'reactstrap';
 
 import { useCreateTemplatePage } from '~/client/services/create-page';
@@ -12,14 +13,16 @@ import { useCreateNewPage, useCreateTodaysMemo } from './hooks';
 
 
 const useToastrOnError = <P, R>(method?: (param?: P) => Promise<R|undefined>): (param?: P) => Promise<R|undefined> => {
+  const { t } = useTranslation('commons');
+
   return useCallback(async(param) => {
     try {
       return await method?.(param);
     }
     catch (err) {
-      toastError(err);
+      toastError(t('toaster.create_failed', { target: 'a page' }));
     }
-  }, [method]);
+  }, [method, t]);
 };