kaori 3 лет назад
Родитель
Сommit
80f49d3700

+ 1 - 1
packages/app/src/pages/admin/app.page.tsx

@@ -17,7 +17,7 @@ const AppSettingsPageContents = dynamic(() => import('~/components/Admin/App/App
 
 
 const AdminAppPage: NextPage<CommonProps> = (props) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('admin');
   useIsMaintenanceMode(props.isMaintenanceMode);
 
   const title = t('commons:headers.app_settings');

+ 1 - 1
packages/app/src/pages/admin/audit-log.page.tsx

@@ -23,7 +23,7 @@ type Props = CommonProps & {
 
 
 const AdminAuditLogPage: NextPage<Props> = (props) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('admin');
   useAuditLogEnabled(props.auditLogEnabled);
   useAuditLogAvailableActions(props.auditLogAvailableActions);
 

+ 3 - 4
packages/app/src/pages/admin/customize.page.tsx

@@ -14,8 +14,7 @@ import { useCustomizeTitle } from '~/stores/context';
 import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
 const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
-
-const AppSettingsPageContents = dynamic(() => import('~/components/Admin/App/AppSettingsPageContents'), { ssr: false });
+const CustomizeSettingContents = dynamic(() => import('~/components/Admin//Customize/Customize'), { ssr: false });
 
 
 type Props = CommonProps & {
@@ -24,7 +23,7 @@ type Props = CommonProps & {
 
 
 const AdminCustomizeSettingsPage: NextPage<Props> = (props) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('admin');
   useCustomizeTitle(props.customizeTitle);
 
   const title = t('customize_settings.customize_settings');
@@ -40,7 +39,7 @@ const AdminCustomizeSettingsPage: NextPage<Props> = (props) => {
   return (
     <Provider inject={[...injectableContainers]}>
       <AdminLayout title={useCustomTitle(props, title)} componentTitle={title} >
-        <AppSettingsPageContents />
+        <CustomizeSettingContents />
       </AdminLayout>
     </Provider>
   );

+ 1 - 1
packages/app/src/pages/admin/export.page.tsx

@@ -16,7 +16,7 @@ const ExportArchiveDataPage = dynamic(() => import('~/components/Admin/ExportArc
 
 
 const AdminExportDataArchivePage: NextPage<CommonProps> = (props) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('admin');
 
   const title = t('export_archive_data');
   const injectableContainers: Container<any>[] = [];

+ 1 - 1
packages/app/src/pages/admin/importer.page.tsx

@@ -16,7 +16,7 @@ const DataImportPageContents = dynamic(() => import('~/components/Admin/ImportDa
 
 
 const AdminDataImportPage: NextPage<CommonProps> = (props) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('admin');
 
   const title = t('importer_management.import_data');
   const injectableContainers: Container<any>[] = [];

+ 1 - 1
packages/app/src/pages/admin/index.page.tsx

@@ -26,7 +26,7 @@ type Props = CommonProps & {
 
 
 const AdminHomePage: NextPage<Props> = (props) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('admin');
 
   const title = t('wiki_management_home_page');
   const injectableContainers: Container<any>[] = [];

+ 1 - 1
packages/app/src/pages/admin/markdown.page.tsx

@@ -16,7 +16,7 @@ const MarkDownSettingContents = dynamic(() => import('~/components/Admin/Markdow
 
 
 const AdminMarkdownPage: NextPage<CommonProps> = (props) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('admin');
 
   const title = t('markdown_settings.markdown_settings');
   const injectableContainers: Container<any>[] = [];

+ 1 - 1
packages/app/src/pages/admin/notification.page.tsx

@@ -16,7 +16,7 @@ const NotificationSetting = dynamic(() => import('~/components/Admin/Notificatio
 
 
 const AdminExternalNotificationPage: NextPage<CommonProps> = (props) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('admin');
 
   const title = t('external_notification.external_notification');
   const injectableContainers: Container<any>[] = [];

+ 1 - 1
packages/app/src/pages/admin/search.page.tsx

@@ -22,7 +22,7 @@ type Props = CommonProps & {
 
 
 const AdminFullTextSearchManagementPage: NextPage<Props> = (props) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('admin');
   useIsSearchServiceReachable(props.isSearchServiceReachable);
 
   const title = t('full_text_search_management.full_text_search_management');

+ 1 - 1
packages/app/src/pages/admin/security.page.tsx

@@ -33,7 +33,7 @@ type Props = CommonProps & {
 
 
 const AdminSecuritySettingsPage: NextPage<Props> = (props) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('admin');
   useSiteUrl(props.siteUrl);
   useIsMailerSetup(props.isMailerSetup);
 

+ 1 - 1
packages/app/src/pages/admin/slack-integration-legacy.page.tsx

@@ -16,7 +16,7 @@ const LegacySlackIntegration = dynamic(() => import('~/components/Admin/LegacySl
 
 
 const AdminLegacySlackIntegrationPage: NextPage<CommonProps> = (props) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('admin');
 
   const title = t('slack_integration_legacy.slack_integration_legacy');
   const injectableContainers: Container<any>[] = [];

+ 1 - 1
packages/app/src/pages/admin/slack-integration.page.tsx

@@ -21,7 +21,7 @@ type Props = CommonProps & {
 
 
 const AdminSlackIntegrationPage: NextPage<Props> = (props) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('admin');
   useSiteUrl(props.siteUrl);
 
   const title = t('slack_integration.slack_integration');

+ 1 - 1
packages/app/src/pages/admin/user-groups.page.tsx

@@ -20,7 +20,7 @@ type Props = CommonProps & {
 
 
 const AdminUserGroupPage: NextPage<Props> = (props) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('admin');
   useIsAclEnabled(props.isAclEnabled);
 
   const title = t('user_group_management.user_group_management');

+ 1 - 1
packages/app/src/pages/admin/users/external-accounts.page.tsx

@@ -16,7 +16,7 @@ const ManageExternalAccount = dynamic(() => import('~/components/Admin/ManageExt
 
 
 const AdminUserManagementPage: NextPage<CommonProps> = (props) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('admin');
 
   const title = t('user_management.external_account');
   const injectableContainers: Container<any>[] = [];

+ 1 - 1
packages/app/src/pages/admin/users/index.page.tsx

@@ -25,7 +25,7 @@ type Props = CommonProps & {
 
 
 const AdminUserManagementPage: NextPage<Props> = (props) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('admin');
   useCurrentUser(props.currentUser != null ? JSON.parse(props.currentUser) : null);
   useIsMailerSetup(props.isMailerSetup);
 

+ 1 - 3
packages/app/src/utils/admin-page-util.ts

@@ -1,6 +1,4 @@
-import {
-  GetServerSideProps, GetServerSidePropsContext,
-} from 'next';
+import { GetServerSidePropsContext } from 'next';
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
 
 import {