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

+ 1 - 1
packages/app/src/components/Admin/App/AppSettingsPageContents.tsx

@@ -92,7 +92,7 @@ const AppSettingsPageContents = (props: Props) => {
 
 
       <div className="row mt-5">
       <div className="row mt-5">
         <div className="col-lg-12">
         <div className="col-lg-12">
-          <h2 className="admin-setting-header" id="mail-settings">{t('admin:app_setting.mail_settings')}</h2>
+          <h2 className="admin-setting-header" id="mail-settings">{t('app_setting.mail_settings')}</h2>
           <MailSetting />
           <MailSetting />
         </div>
         </div>
       </div>
       </div>

+ 8 - 8
packages/app/src/components/Admin/Notification/NotificationSetting.jsx

@@ -28,11 +28,11 @@ let retrieveErrors = null;
 
 
 // eslint-disable-next-line react/prop-types
 // eslint-disable-next-line react/prop-types
 const Badge = ({ isEnabled }) => {
 const Badge = ({ isEnabled }) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('admin');
 
 
   return isEnabled
   return isEnabled
-    ? <span className="badge badge-success">{t('admin:external_notification.enabled')}</span>
-    : <span className="badge badge-secondary">{t('admin:external_notification.disabled')}</span>;
+    ? <span className="badge badge-success">{t('external_notification.enabled')}</span>
+    : <span className="badge badge-secondary">{t('external_notification.disabled')}</span>;
 };
 };
 
 
 const SkeltonListItem = () => (
 const SkeltonListItem = () => (
@@ -54,12 +54,12 @@ const SlackIntegrationListItem = ({ isEnabled, currentBotType }) => {
     <li data-testid="slack-integration-list-item" className="list-group-item">
     <li data-testid="slack-integration-list-item" className="list-group-item">
       <h4>
       <h4>
         <Badge isEnabled={isEnabled} />
         <Badge isEnabled={isEnabled} />
-        <a href="/admin/slack-integration" className="ml-2">{t('admin:slack_integration.slack_integration')}</a>
+        <a href="/admin/slack-integration" className="ml-2">{t('slack_integration.slack_integration')}</a>
       </h4>
       </h4>
       { isCautionVisible && (
       { isCautionVisible && (
         <ul className="mt-2 pl-4">
         <ul className="mt-2 pl-4">
           {/* eslint-disable-next-line react/no-danger */}
           {/* eslint-disable-next-line react/no-danger */}
-          <li dangerouslySetInnerHTML={{ __html: t('admin:external_notification.caution_enabled') }} />
+          <li dangerouslySetInnerHTML={{ __html: t('external_notification.caution_enabled') }} />
         </ul>
         </ul>
       ) }
       ) }
     </li>
     </li>
@@ -80,7 +80,7 @@ const LegacySlackIntegrationListItem = ({ isEnabled }) => {
         <ul className="mt-2 pl-4">
         <ul className="mt-2 pl-4">
           <li>
           <li>
             {/* eslint-disable-next-line react/no-danger */}
             {/* eslint-disable-next-line react/no-danger */}
-            <span className="text-danger" dangerouslySetInnerHTML={{ __html: t('admin:slack_integration_legacy.alert_deplicated') }}></span>
+            <span className="text-danger" dangerouslySetInnerHTML={{ __html: t('slack_integration_legacy.alert_deplicated') }}></span>
           </li>
           </li>
         </ul>
         </ul>
       ) }
       ) }
@@ -142,7 +142,7 @@ function NotificationSetting(props) {
 
 
   return (
   return (
     <div data-testid="admin-notification">
     <div data-testid="admin-notification">
-      <h2 className="admin-setting-header">{t('admin:external_notification.header_status')}</h2>
+      <h2 className="admin-setting-header">{t('external_notification.header_status')}</h2>
       <ul className="list-group">
       <ul className="list-group">
         { !isMounted && <SkeltonListItem />}
         { !isMounted && <SkeltonListItem />}
         { isMounted && (
         { isMounted && (
@@ -155,7 +155,7 @@ function NotificationSetting(props) {
       </ul>
       </ul>
 
 
 
 
-      <h2 className="admin-setting-header mt-5">{t('admin:notification_settings.notification_settings')}</h2>
+      <h2 className="admin-setting-header mt-5">{t('notification_settings.notification_settings')}</h2>
 
 
       <CustomNavTab activeTab={activeTab} navTabMapping={navTabMapping} onNavSelected={switchActiveTab} hideBorderBottom />
       <CustomNavTab activeTab={activeTab} navTabMapping={navTabMapping} onNavSelected={switchActiveTab} hideBorderBottom />
 
 

+ 6 - 6
packages/app/src/components/Admin/Security/BasicSecuritySettingContents.jsx

@@ -24,7 +24,7 @@ class BasicSecurityManagementContents extends React.Component {
     try {
     try {
       await adminBasicSecurityContainer.updateBasicSetting();
       await adminBasicSecurityContainer.updateBasicSetting();
       await adminGeneralSecurityContainer.retrieveSetupStratedies();
       await adminGeneralSecurityContainer.retrieveSetupStratedies();
-      toastSuccess(t('admin:security_settings.Basic.updated_basic'));
+      toastSuccess(t('security_settings.Basic.updated_basic'));
     }
     }
     catch (err) {
     catch (err) {
       toastError(err);
       toastError(err);
@@ -39,7 +39,7 @@ class BasicSecurityManagementContents extends React.Component {
       <React.Fragment>
       <React.Fragment>
 
 
         <h2 className="alert-anchor border-bottom">
         <h2 className="alert-anchor border-bottom">
-          { t('admin:security_settings.Basic.name') }
+          { t('security_settings.Basic.name') }
         </h2>
         </h2>
 
 
         {adminBasicSecurityContainer.state.retrieveError != null && (
         {adminBasicSecurityContainer.state.retrieveError != null && (
@@ -59,17 +59,17 @@ class BasicSecurityManagementContents extends React.Component {
                 onChange={() => { adminGeneralSecurityContainer.switchIsBasicEnabled() }}
                 onChange={() => { adminGeneralSecurityContainer.switchIsBasicEnabled() }}
               />
               />
               <label className="custom-control-label" htmlFor="isBasicEnabled">
               <label className="custom-control-label" htmlFor="isBasicEnabled">
-                { t('admin:security_settings.Basic.enable_basic') }
+                { t('security_settings.Basic.enable_basic') }
               </label>
               </label>
             </div>
             </div>
             <p className="form-text text-muted">
             <p className="form-text text-muted">
               <small>
               <small>
                 <span dangerouslySetInnerHTML={{ __html: t('security_settings.Basic.desc_1') }} /><br />
                 <span dangerouslySetInnerHTML={{ __html: t('security_settings.Basic.desc_1') }} /><br />
-                { t('admin:security_settings.Basic.desc_2')}
+                { t('security_settings.Basic.desc_2')}
               </small>
               </small>
             </p>
             </p>
             {(!adminGeneralSecurityContainer.state.setupStrategies.includes('basic') && isBasicEnabled)
             {(!adminGeneralSecurityContainer.state.setupStrategies.includes('basic') && isBasicEnabled)
-            && <div className="badge badge-warning">{t('admin:security_settings.setup_is_not_yet_complete')}</div>}
+            && <div className="badge badge-warning">{t('security_settings.setup_is_not_yet_complete')}</div>}
           </div>
           </div>
         </div>
         </div>
 
 
@@ -126,7 +126,7 @@ BasicSecurityManagementContents.propTypes = {
 };
 };
 
 
 const BasicSecurityManagementContentsWrapperFC = (props) => {
 const BasicSecurityManagementContentsWrapperFC = (props) => {
-  const { t } = useTranslation();
+  const { t } = useTranslation('admin');
 
 
   return <BasicSecurityManagementContents t={t} {...props} />;
   return <BasicSecurityManagementContents t={t} {...props} />;
 };
 };

+ 1 - 1
packages/app/src/components/Admin/Security/GitHubSecuritySettingContents.jsx

@@ -28,7 +28,7 @@ class GitHubSecurityManagementContents extends React.Component {
     try {
     try {
       await adminGitHubSecurityContainer.updateGitHubSetting();
       await adminGitHubSecurityContainer.updateGitHubSetting();
       await adminGeneralSecurityContainer.retrieveSetupStratedies();
       await adminGeneralSecurityContainer.retrieveSetupStratedies();
-      toastSuccess(t('admin:security_settings.OAuth.GitHub.updated_github'));
+      toastSuccess(t('security_settings.OAuth.GitHub.updated_github'));
     }
     }
     catch (err) {
     catch (err) {
       toastError(err);
       toastError(err);

+ 1 - 1
packages/app/src/components/Admin/Security/LocalSecuritySettingContents.jsx

@@ -213,7 +213,7 @@ class LocalSecuritySettingContents extends React.Component {
                 {!isMailerSetup && (
                 {!isMailerSetup && (
                   <div className="alert alert-warning p-1 my-1 small d-inline-block">
                   <div className="alert alert-warning p-1 my-1 small d-inline-block">
                     <span>{t('security_settings.Local.please_enable_mailer')}</span>
                     <span>{t('security_settings.Local.please_enable_mailer')}</span>
-                    <a href="/admin/app#mail-settings"> <i className="fa fa-link"></i> {t('admin:app_setting.mail_settings')}</a>
+                    <a href="/admin/app#mail-settings"> <i className="fa fa-link"></i> {t('app_setting.mail_settings')}</a>
                   </div>
                   </div>
                 )}
                 )}
                 <p className="form-text text-muted small">
                 <p className="form-text text-muted small">