{
diff --git a/src/components/side/Ad.tsx b/src/components/side/Ad.tsx
index 4577e5fe..19d95a95 100644
--- a/src/components/side/Ad.tsx
+++ b/src/components/side/Ad.tsx
@@ -6,10 +6,14 @@ import { redirectRecord } from '@/services/home';
import { AdvertItem } from '@/types/home';
+const ImageURL =
+ 'https://img.hellogithub.com/article/HwsoJXEiYdPhjLa_1720773908.png';
+
interface Props {
data: AdvertItem;
className?: string;
t: (key: string) => string;
+ i18n_lang?: string;
}
interface AdContentProps {
@@ -34,7 +38,7 @@ const ImageAdContent = ({ data, handleClose }: ImageAdContentProps) => (
);
-export default function Ad({ data, className, t }: Props) {
+export default function Ad({ data, className, t, i18n_lang }: Props) {
const [visible, setVisible] = useState(true);
const handleClose: MouseEventHandler
- {t('info.socre_desc')}
+ {t('info.score_desc')}
{repo.score ? (
@@ -31,7 +31,7 @@ const Score = ({ t, repo }: RepositoryProps) => {
className='h-1/2 cursor-pointer py-1 text-xs text-blue-500'
onClick={jumpComment}
>
- {t('info.socre_user_desc', { count: repo.comment_total })}
+ {t('info.score_user_desc', { count: repo.comment_total })}
- 
+ 
{adverts && (
-
{t('advert.desc2')}
diff --git a/src/components/side/Side.tsx b/src/components/side/Side.tsx
index e209a0f9..e0a96bed 100644
--- a/src/components/side/Side.tsx
+++ b/src/components/side/Side.tsx
@@ -15,7 +15,7 @@ import UserStatus from './UserStatus';
import { AdvertItems } from '@/types/home';
export const Side = ({ isHome }: { isHome: boolean }) => {
- const { t } = useTranslation('common');
+ const { t, i18n } = useTranslation('common');
const [displayAdOnly, setDisplayAdOnly] = useState(false);
const containerRef = useRef(null);
const { data, isValidating } = useSWRImmutable(
@@ -46,14 +46,21 @@ export const Side = ({ isHome }: { isHome: boolean }) => {
{isHome && }
{data.map((item: AdvertItem) => (
-
);
};
-export const SideFixAd: NextPage
{data.map((item: AdvertItem) => (
-
);
diff --git a/src/components/side/TagList.tsx b/src/components/side/TagList.tsx
index 43ab21b9..dbb71710 100644
--- a/src/components/side/TagList.tsx
+++ b/src/components/side/TagList.tsx
@@ -15,9 +15,10 @@ import { TagListSkeleton } from '../loading/skeleton';
import { Tag } from '@/types/tag';
export default function TagList() {
- const { t } = useTranslation('home');
+ const { t, i18n } = useTranslation('home');
const defaultTag: Tag = {
- name: t('tag_side.all_tags_label'),
+ name: '综合',
+ name_en: 'All',
tid: '',
icon_name: 'find',
};
@@ -30,9 +31,15 @@ export default function TagList() {
const res = await getTags();
if (res.success) {
res.data.unshift(defaultTag);
+ // 判断当前语言是否为英文，如果是英文则显示英文名称
+ res.data.forEach((item) => {
+ if (i18n.language == 'en' && item.name_en !== null) {
+ item.name = item.name_en;
+ }
+ });
setTags(res.data);
}
- }, []);
+ }, [i18n.language]);
useEffect(() => {
if (!isMobile()) {
@@ -77,7 +84,7 @@ export default function TagList() {
))}
- {t('tag_side.manage')}
diff --git a/src/pages/repository/[rid]/index.tsx b/src/pages/repository/[rid]/index.tsx
index 8dc40e68..679f0b16 100644
--- a/src/pages/repository/[rid]/index.tsx
+++ b/src/pages/repository/[rid]/index.tsx
@@ -1,16 +1,16 @@
import { GetServerSideProps, NextPage } from 'next';
+import { useTranslation } from 'next-i18next';
+import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
import RepoDetailNavbar from '@/components/navbar/RepoNavbar';
import CommentContainer from '@/components/respository/CommentContainer';
import Info from '@/components/respository/Info';
import Tabs from '@/components/respository/Tabs';
import Seo from '@/components/Seo';
-import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
import { getDetail } from '@/services/repository';
import { Repository } from '@/types/repository';
-import { useTranslation } from 'next-i18next';
interface Props {
repo: Repository;
diff --git a/src/types/tag.tsx b/src/types/tag.tsx
index 88dd0d64..500ef615 100644
--- a/src/types/tag.tsx
+++ b/src/types/tag.tsx
@@ -24,6 +24,7 @@ export interface TagItems {
export interface Tag {
name: string;
+ name_en: string;
tid: string;
icon_name: string;
}
@@ -47,6 +48,7 @@ export interface TagType {
export interface PortalTag {
name: string;
+ name_en: string;
tid: string;
icon_name: string;
}