Skip to content

Commit

Permalink
Merge branch 'master' into production
Browse files Browse the repository at this point in the history
  • Loading branch information
Iori Ichinose committed Jan 20, 2022
2 parents b905bb5 + d5d3dba commit 0c91fc2
Show file tree
Hide file tree
Showing 6 changed files with 76 additions and 74 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "public/configs"]
path = public/configs
url = git@github.com:nju-lug/NJU-Mirror-Configs.git
url = https://git.nju.edu.cn/nju-lug/NJU-Mirror-Configs.git
2 changes: 1 addition & 1 deletion public/configs
Submodule configs updated from 16c899 to cfb69f
2 changes: 1 addition & 1 deletion src/components/Footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const { t } = useI18n();
const reports = [
{
label: 'Via Mail',
key: 'mailto:git+nju-lug-nju-mirror-frontend-2901[email protected]'
key: 'mailto:git+nju-lug-mira-3921[email protected]'
},
{
label: 'Via GitHub',
Expand Down
71 changes: 36 additions & 35 deletions src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,52 @@
"locale": "中文",
"mirror": "NJU Open Source Mirror",
"header": {
"mirrors": "Mirrors",
"downloads": "Downloads",
"help": "Help",
"about": "About",
"error": "Error"
"mirrors": "Mirrors",
"downloads": "Downloads",
"help": "Help",
"doc": "Documentation",
"about": "About",
"error": "Error"
},
"sider": {
"news": "NEWS",
"links": "LINKS",
"entries": "ENTRIES",
"searchText": "Search entries...",
"os": "OS",
"apps": "Apps",
"fonts": "Fonts"
"news": "NEWS",
"links": "LINKS",
"entries": "ENTRIES",
"searchText": "Search entries...",
"os": "OS",
"apps": "Apps",
"fonts": "Fonts"
},
"downloads": {
"title": "Distribute",
"description": "Select menu to view downloads",
"download": "Download",
"versions": "Versions"
"title": "Distribute",
"description": "Select menu to view downloads",
"download": "Download",
"versions": "Versions"
},
"help": {
"title": "RTFM",
"description": "Select menu to view help"
"title": "RTFM",
"description": "Select menu to view help"
},
"footer": {
"maintainer": "This mirror site is maintained by {name}",
"developer": "Frontend by {name}",
"special": "Special thanks to tuna for their documentations",
"bug": "Report Bugs",
"source": "Source Code",
"lug": "NJU.LUG"
"maintainer": "This mirror site is maintained by {name}",
"developer": "Frontend by {name}",
"special": "Special thanks to tuna for their documentations",
"bug": "Report Bugs",
"source": "Source Code",
"lug": "NJU.LUG"
},
"table": {
"name": "Name",
"status": "Status",
"size": "Size",
"lastUpdate": "Last Sync",
"nextUpdate": "Next Sync",
"searchText": "Search mirrors..."
"name": "Name",
"status": "Status",
"size": "Size",
"lastUpdate": "Last Sync",
"nextUpdate": "Next Sync",
"searchText": "Search mirrors..."
},
"error": {
"description": "Where...am I?",
"back": "Go Back",
"home": "Home",
"bug": "Report Bug"
"description": "Where...am I?",
"back": "Go Back",
"home": "Home",
"bug": "Report Bug"
}
}
}
71 changes: 36 additions & 35 deletions src/i18n/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,52 @@
"locale": "English",
"mirror": "南京大学开源镜像站",
"header": {
"mirrors": "镜像列表",
"downloads": "下载",
"help": "帮助",
"about": "关于",
"error": "出错了"
"mirrors": "镜像列表",
"downloads": "下载",
"help": "帮助",
"doc": "帮助文档",
"about": "关于",
"error": "出错了"
},
"sider": {
"news": "新闻",
"links": "链接",
"entries": "浏览",
"searchText": "搜索...",
"os": "操作系统",
"apps": "应用程序",
"fonts": "字体"
"news": "新闻",
"links": "链接",
"entries": "浏览",
"searchText": "搜索...",
"os": "操作系统",
"apps": "应用程序",
"fonts": "字体"
},
"downloads": {
"title": "下载",
"description": "浏览菜单即可选择下载项目",
"download": "下载",
"versions": "版本"
"title": "下载",
"description": "浏览菜单即可选择下载项目",
"download": "下载",
"versions": "版本"
},
"help": {
"title": "去读手册",
"description": "浏览菜单即可打开帮助"
"title": "去读手册",
"description": "浏览菜单即可打开帮助"
},
"footer": {
"maintainer": "本镜像站由{name}维护",
"developer": "前端由{name}构建",
"special": "特别感谢:tuna(文档参考)",
"bug": "反馈问题",
"source": "源代码",
"lug": "NJU.LUG"
"maintainer": "本镜像站由{name}维护",
"developer": "前端由{name}构建",
"special": "特别感谢:tuna(文档参考)",
"bug": "反馈问题",
"source": "源代码",
"lug": "NJU.LUG"
},
"table": {
"name": "镜像名",
"status": "状态",
"size": "大小",
"lastUpdate": "上次同步",
"nextUpdate": "下次同步",
"searchText": "搜索镜像..."
"name": "镜像名",
"status": "状态",
"size": "大小",
"lastUpdate": "上次同步",
"nextUpdate": "下次同步",
"searchText": "搜索镜像..."
},
"error": {
"description": "我...在哪儿?",
"back": "返回",
"home": "主页",
"bug": "反馈问题"
"description": "我...在哪儿?",
"back": "返回",
"home": "主页",
"bug": "反馈问题"
}
}
}
2 changes: 1 addition & 1 deletion src/views/Help.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ watchEffect(() => {
</script>

<template>
<n-h2 prefix="bar">{{ distro?.name || t('header.help') }}</n-h2>
<n-h2 prefix="bar">{{ (distro?.name || '') + ' ' + t('header.doc') }}</n-h2>
<Markdown :content="doc" v-if="distro" />
<n-result
size="huge"
Expand Down

0 comments on commit 0c91fc2

Please sign in to comment.