feat: add academe i18n (#279)

Signed-off-by: laixingyou <[email protected]>
oss-compass · Dec 10, 2023 · 281f62d · 281f62d · vercel · Dec 10, 2023
1 parent 033f67f
commit 281f62d
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 27 deletions.
diff --git a/apps/web/i18n b/apps/web/i18n
diff --git a/apps/web/src/common/components/Header/MobileHeader.tsx b/apps/web/src/common/components/Header/MobileHeader.tsx
@@ -45,7 +45,7 @@ const MobileHeader: React.FC<PropsWithChildren> = ({ children }) => {
     },
     {
       title: t('common:header.academe'),
-      href: '/academe',
+      href: '/collaboration',
       icon: null,
     },
     {

diff --git a/apps/web/src/common/components/Header/index.tsx b/apps/web/src/common/components/Header/index.tsx
@@ -46,8 +46,9 @@ const Header: React.FC<{
             >
               {t('common:header.projects')}
             </Link>
+
             <Link
-              href="/academe"
+              href="/collaboration"
               className={'mx-6 px-2.5 font-medium text-white 2xl:mx-2'}
             >
               {t('common:header.academe')}

diff --git a/apps/web/src/modules/academe/CooperationCase.tsx b/apps/web/src/modules/academe/CooperationCase.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import classnames from 'classnames';
-import { useTranslation } from 'next-i18next';
+import { useTranslation, Trans } from 'next-i18next';
 import Image from 'next/image';
 import { Progress } from 'antd';
 import Dialog, { Transition } from '@common/components/Dialog';
@@ -36,7 +36,8 @@ const CooperationCase = () => {
       title: t('academe:nju_title'),
       desc: (
         <ul className="h-full w-full">
-          <li className="ml-4 list-disc">{t('academe:nju_author')}</li>
+          <li className="ml-4 mb-2 list-disc">{t('academe:nju_author')}</li>
+          <li className="ml-4 mb-2 list-disc">{t('academe:nju_author2')}</li>
           <li className="ml-4 list-disc">
             {t('academe:nju_desc')}
             <a
@@ -62,8 +63,9 @@ const CooperationCase = () => {
       title: t('academe:pku1_title'),
       desc: (
         <ul className="h-full w-full">
-          <li className="ml-4 list-disc">{t('academe:pku1_author')}</li>
-          <li className="ml-4 list-disc">
+          <li className="ml-4  mb-2 list-disc">{t('academe:pku1_author')}</li>
+          <li className="ml-4 mb-2 list-disc">{t('academe:pku1_author2')}</li>
+          <li className="ml-4  mb-2 list-disc">
             <div className="line-clamp-6">{t('academe:pku1_desc1')}</div>
           </li>
           <li className="ml-4 list-disc">
@@ -96,8 +98,10 @@ const CooperationCase = () => {
       title: t('academe:openeuler_title'),
       desc: (
         <ul className="h-full w-full">
-          <li className="ml-4 list-disc">{t('academe:openeuler_author')}</li>
-          <li className="ml-4 list-disc">
+          <li className="ml-4 mb-2 list-disc">
+            {t('academe:openeuler_author')}
+          </li>
+          <li className="ml-4 mb-2 list-disc">
             <div className="line-clamp-6">{t('academe:openeuler_desc1')}</div>
           </li>
           <li className="ml-4 list-disc">
@@ -132,20 +136,27 @@ const CooperationCase = () => {
       title: t('academe:pku2_title'),
       desc: (
         <ul className="h-full w-full">
-          <li className="ml-4 list-disc">{t('academe:author')}</li>
-          <div className="ml-8 flex list-disc">
-            <div className="mt-0.5 mr-2">
-              <TbPoint />
-            </div>
-            {t('academe:pku2_author')}
-          </div>
-          <div className="ml-8 flex list-disc">
-            <div className="mt-0.5 mr-2">
-              <TbPoint />
-            </div>
-            {t('academe:pku2_author2')}
+          <li className="ml-4 mb-2 list-disc">{t('academe:pku2_author')}</li>
+          <li className="ml-4 mb-2 list-disc">{t('academe:pku2_author2')}</li>
+          {/* <div className="ml-8 flex list-disc">
+            <Trans
+              i18nKey="pku2_author"
+              ns="academe"
+              components={{
+                br: <br />,
+              }}
+            />
           </div>
-          <li className="ml-4 list-disc">
+          <div className="ml-8 mb-2 flex list-disc">
+            <Trans
+              i18nKey="pku2_author2"
+              ns="academe"
+              components={{
+                br: <br />,
+              }}
+            />
+          </div> */}
+          <li className="ml-4 mb-2 list-disc">
             <div className="line-clamp-6">{t('academe:pku2_desc1')}</div>
           </li>
           <li className="ml-4 list-disc">
@@ -178,11 +189,13 @@ const CooperationCase = () => {
       title: t('academe:pku3_title'),
       desc: (
         <ul className="h-full w-full">
-          <li className="ml-4 list-disc">{t('academe:pku3_author')}</li>
-          <li className="ml-4 list-disc">
+          <li className="ml-4 mb-2 list-disc">{t('academe:pku3_author')}</li>
+          <li className="ml-4 mb-2 list-disc">{t('academe:pku3_author2')}</li>
+
+          <li className="ml-4 mb-2 list-disc">
             <div className="line-clamp-6">{t('academe:pku3_desc1')}</div>
           </li>
-          <li className="ml-4 list-disc">
+          <li className="ml-4 mb-2 list-disc">
             {t('academe:pku3_desc2')}
             <a className="text-[#002fa7]" href={'https://licenserec.com'}>
               https://licenserec.com

diff --git a/apps/web/src/modules/analyze/DataView/Contributor/index.tsx b/apps/web/src/modules/analyze/DataView/Contributor/index.tsx
@@ -4,7 +4,7 @@ import ContributorDomainPersona from './ContributorDomainPersona';
 import ContributorMilestonePersona from './ContributorMilestonePersona';
 import ContributorRolePersona from './ContributorRolePersona';
 import AuthRequire from '@modules/auth/AuthRequire';
-
+import { useRouter } from 'next/router';
 import OverviewSummary from './OverviewSummary';
 import MetricDashboard from '@modules/analyze/DataView/MetricDetail/MetricDashboard';
 import TopicTitle from '@modules/analyze/components/TopicTitle';
@@ -46,8 +46,13 @@ const ContributorDataView = () => {
   );
 };
 const Contributor = () => {
+  const router = useRouter();
+
   return (
-    <AuthRequire loadingClassName="mx-auto w-[1200px] py-10 md:w-full md:px-6">
+    <AuthRequire
+      redirectTo={router.asPath}
+      loadingClassName="mx-auto w-[1200px] py-10 md:w-full md:px-6"
+    >
       <ContributorDataView />
     </AuthRequire>
   );