Skip to content

Commit e6b19d2

Browse files
author
dodo
committed
Solve Conflict
2 parents 901ff68 + 2c87644 commit e6b19d2

25 files changed

+8562
-8214
lines changed

‎index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width,initial-scale=1.0">
6-
<title>Putong Online Judge</title>
6+
<title>RATS Online Judge</title>
77
<!-- <script data-src="/static/js/vendor.dll.js"></script> -->
88
</head>
99
<body>

‎src/api.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ const instance = {}
2525
console.log(err)
2626
if (err.response && err.response.status >= 500) {
2727
Vue.prototype.$Message.error({
28-
content: `Σ(;ﾟдﾟ) 服务器崩坏，需要联系管理员维修`,
28+
content: `Σ(;ﾟдﾟ) 헉, 서버 다운...!`,
2929
duration: 6.5
3030
})
3131
} else if (err.response && err.response.status === 403) {
3232
Vue.prototype.$Message.error({
33-
content: `╮(╯_╰)╭ 你没有相关权限进行此操作`,
33+
content: `╮(╯_╰)╭ 권한이 없어요 ~`,
3434
duration: 6.5
3535
})
3636
} else if (err.response && err.response.status === 401) {
3737
Vue.prototype.$Message.error({
38-
content: `(〃∀〃) 请先登录`,
38+
content: `(〃∀〃) 로그인 먼저 해주세요 !`,
3939
duration: 6.5
4040
})
4141
} else if (err.response && err.response.status >= 400 && err.response.status < 500) {
@@ -45,7 +45,7 @@ const instance = {}
4545
})
4646
} else if (!err.response) {
4747
Vue.prototype.$Message.error({
48-
content: `_(:з」∠)_ 网络异常，检查你的网线`,
48+
content: `_(:з」∠)_ 네트워크를 다시 확인해주세요.`,
4949
duration: 6.5
5050
})
5151
} else {

‎src/components/ContestEdit.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Col :span="8">
1212
<DatePicker
1313
type="datetime"
14-
placeholder="选择日期时间"
14+
placeholder="날짜/시간 선택"
1515
@on-change="(time) => changeTime('start', time)">
1616
</DatePicker>
1717
</Col>
@@ -21,15 +21,15 @@
2121
<Col :span="8">
2222
<DatePicker
2323
type="datetime"
24-
placeholder="选择日期时间"
24+
placeholder="날짜/시간 선택"
2525
@on-change="(time) => changeTime('end', time)">
2626
</DatePicker>
2727
</Col>
2828
</Row>
2929
<Row type="flex" justify="start">
3030
<Col :span="2" class="label">Type</Col>
3131
<Col :span="4">
32-
<Select v-model="contest.encrypt" placeholder="请选择">
32+
<Select v-model="contest.encrypt" placeholder="선택">
3333
<Option
3434
v-for="item in options"
3535
:key="item.value"
@@ -181,7 +181,7 @@ export default {
181181
const user = this.targetKeys.map((item) => this.userList[+item])
182182
const res = user.join('\r\n')
183183
this.contest.argument = res
184-
this.$Message.success('保存当前用户组成功！')
184+
this.$Message.success('현재 사용자 그룹을 저장하는 데 성공했습니다!')
185185
},
186186
changeTime (name, time) {
187187
if (name === 'start') {

‎src/components/Layout.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555
</Content>
5656
<Footer class="layout-footer-center">
5757
<p>Server Time: {{ currentTime | timePretty }}</p>
58-
<strong>Putong OJ</strong> by <a href="https://github.com/acm309" target="_blank">acm309 <Icon type="social-github"></Icon>.</a>
58+
<strong>RATS OJ</strong> by <a href="https://github.com/BEMELON" target="_blank">BEMELON <Icon type="social-github"></Icon>.</a> <br>
59+
<strong>Putong OJ</strong> by <a href="https://github.com/acm309" target="_blank">acm309 <Icon type="social-github"></Icon>.</a> <br>
5960
The source code is licensed <a href="http://opensource.org/licenses/mit-license.php" target="_blank">MIT</a>.
6061
</Footer>
6162
</Layout>

‎src/components/LoginAndRegister.vue

+8-8
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,21 @@ export default {
4848
const validatePass1 = (rule, value, callback) => {
4949
// 5-50位, 数字, 字母, 字符至少包含两种, 同时不能包含中文和空格
5050
const error = !/[0-9a-zA-Z]{5,50}$/.test(value)
51-
? new Error('密码长度需5-50位，只能包含字母和数字') : null
51+
? new Error('비밀번호 길이는 5-50자리이며, 알파벳과 숫자만 포함할 수 있습니다.') : null
5252
error ? callback(error) : callback()
5353
}
5454
// 验证密码是否重复
5555
const validatePass2 = (rule, value, callback) => {
56-
const error = value !== this.form.pwd ? new Error('两次密码输入不一致') : null
56+
const error = value !== this.form.pwd ? new Error('비밀번호가 서로 일치하지 않습니다.') : null
5757
error ? callback(error) : callback()
5858
}
5959
const basicRules = {
6060
uid: [
61-
{ required: true, message: '用户名不能少', trigger: 'change' },
62-
{ min: 5, max: 50, message: '用户名在 5 到 50 位之间', trigger: 'change' }
61+
{ required: true, message: '아이디를 적어주세요.', trigger: 'change' },
62+
{ min: 5, max: 50, message: '아이디는 5에서 50글자 사이입니다.', trigger: 'change' }
6363
],
6464
pwd: [
65-
{ required: true, message: '请输入密码', trigger: 'change' }
65+
{ required: true, message: '비밀번호를 입력해 주세요.,', trigger: 'change' }
6666
]
6767
}
6868
return {
@@ -79,15 +79,15 @@ export default {
7979
required: true,
8080
type: 'string',
8181
pattern: /^\w+$/ig,
82-
message: '用户名只能包含字母和数字',
82+
message: '아이디는 알파벳과 숫자만 포함할 수 있습니다.',
8383
trigger: 'change'
8484
}),
8585
pwd: [
86-
{ required: true, message: '请输入密码', trigger: 'change' },
86+
{ required: true, message: '비밀번호를 입력해 주세요.', trigger: 'change' },
8787
{ validator: validatePass1, trigger: 'change' }
8888
],
8989
checkPwd: [
90-
{ required: true, message: '请再次输入密码', trigger: 'change' },
90+
{ required: true, message: '비밀번호를 다시 입력해주세요', trigger: 'change' },
9191
{ validator: validatePass2, trigger: 'change' }
9292
]
9393
}

‎src/components/Submit.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<Form v-model="solution">
44
<FormItem label="Language" label-position="left">
55
<Select v-model="solution.language">
6-
<Option :value="2">C++ (G++)</Option>
6+
<!-- <Option :value="2">C++ (G++)</Option> -->
77
<Option :value="1">C (GCC)</Option>
8-
<Option :value="3">Java (openJDK)</Option>
8+
<!-- <Option :value="3">Java (openJDK)</Option> -->
99
</Select>
1010
</FormItem>
1111
<FormItem>

‎src/my-theme/index.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
// Here are the variables to cover, such as:
1313
// @primary-color: #e040fb;
14-
@primary-color: #D500F9;
14+
@primary-color: #4414f5;
1515
// @primary-color: #1976D2;
1616
@link-color: @primary-color;
1717
@font-size-small: 14px;

‎src/views/Admin/ContestCreate.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<div>
33
<!-- <pre>{{ jobs }} </pre> -->
44
<!-- 这个注释故意留着，有时候偶用于调试蛮方便的 -->
5-
<h1>注意事项</h1>
5+
<h1>주의사항</h1>
66
<br>
77
<Steps :current="5" :style="{ color: 'black'}">
8-
<Step title="难度区分" content="正常情况下要有一两道几乎所有人能做出来的题目" status="process"></Step>
9-
<Step title="题目正确性" content="不要拿未测试的题目进入比赛" icon="ios-star" status="process"></Step>
8+
<Step title="난이도 구분" content="정상적인 경우에는 거의 모든 사람이 다 할 수 있는 제목이 한두 개씩 나와야 돼요." status="process"></Step>
9+
<Step title="정확성" content="테스트하지 않은 문제를 가지고 경기에 들어가지 마라." icon="ios-star" status="process"></Step>
1010
</Steps>
1111
<br>
1212
<oj-contest-edit :contest="contest"></oj-contest-edit>

‎src/views/Admin/NewsCreate.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div>
3-
<h1>新增消息</h1>
3+
<h1>새로운 소식</h1>
44
<oj-news-edit></oj-news-edit>
55
<Button type="primary" size="large" @click="submit">Submit</Button>
66
</div>

‎src/views/Admin/ProblemCreate.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div>
3-
<h1>出题的基本步骤</h1>
3+
<h1>문제 출제의 기본 단계</h1>
44
<br>
55
<Steps :current="5" :style="{ color: 'black'}">
66
<Step title="算法设计" content="思考该题希望解答者使用的算法类型" status="process"></Step>

‎src/views/Admin/UserManage/AdminEdit.vue

+9-9
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
</template>
3434
</table>
3535
<Card dis-hover>
36-
<p>Admin 为最高权限，具有所有权限。</p>
37-
<p>Teacher 具有除删除外的所有权限。</p>
38-
<p>一般，被添加的用户通过刷新网页或重新登录即可查看新权限。</p>
36+
<p>Admin 모든 권한을 가지고 있습니다.</p>
37+
<p>Teacher 삭제를 제외하고 모든 권한을 가지고 있습니다.</p>
38+
<p>일반적으로 추가된 사용자는 웹 페이지를 새로 고치거나 다시 로그인하면 새로운 권한을 볼 수 있습니다.</p>
3939
</Card>
4040
</div>
4141
</template>
@@ -71,7 +71,7 @@ export default {
7171
update (user) {
7272
const payload = only(user, 'uid privilege')
7373
this.$store.dispatch('user/update', payload).then(() => {
74-
this.$Message.success(`成功更新 ${payload.uid} 用户！`)
74+
this.$Message.success(`유저, ${payload.uid} 갱신(?) 완료！`)
7575
this.fetchAdmin()
7676
this.admin = ''
7777
})
@@ -85,7 +85,7 @@ export default {
8585
privilege: this.privilege.Teacher
8686
}
8787
this.$store.dispatch('user/update', user).then(() => {
88-
this.$Message.success(`成功设置 ${this.admin} 用户为管理员！`)
88+
this.$Message.success(`유저, ${this.admin} 관리자 수정 완료！`)
8989
this.fetchAdmin()
9090
this.admin = ''
9191
})
@@ -96,16 +96,16 @@ export default {
9696
{ privilege: this.privilege.PrimaryUser }
9797
)
9898
this.$Modal.confirm({
99-
title: '提示',
100-
content: `<p>此操作将删除${user.uid}用户的管理员权限, 是否继续?</p>`,
99+
title: '알림',
100+
content: `<p>유저, ${user.uid}用户的管理员权限, 是否继续?</p>`,
101101
onOk: () => {
102102
this.$store.dispatch('user/update', user).then(() => {
103-
this.$Message.success(`成功设置${user.uid}用户为普通用户！`)
103+
this.$Message.success(`유저, ${user.uid} 수정 완료 !`)
104104
this.fetchAdmin()
105105
})
106106
},
107107
onCancel: () => {
108-
this.$Message.info('已取消删除！')
108+
this.$Message.info('수정 취소 !')
109109
}
110110
})
111111
}

‎src/views/Admin/UserManage/GroupEdit.vue

+7-7
Original file line numberDiff line numberDiff line change
@@ -127,22 +127,22 @@ export default {
127127
this.targetKeys = []
128128
} else if (name === 'delete') {
129129
if (!this.group || !this.group.gid) {
130-
this.$Message.info('未选择要删除的Group!')
130+
this.$Message.info('삭제할 그룹을 선택해주세요!')
131131
} else {
132132
this.$Modal.confirm({
133-
title: '提示',
134-
content: `<p>此操作将永久删除Group--${this.group.title}, 是否继续?</p>`,
133+
title: '알림',
134+
content: `<p>Group--${this.group.title}, 삭제하시겠습니까?</p>`,
135135
onOk: () => {
136136
this.$Spin.showLoading()
137137
this.$store.dispatch('group/delete', { gid: this.group.gid }).then(() => {
138138
this.$Spin.hide()
139-
this.$Message.success(`成功删除 ${this.group.title}！`)
139+
this.$Message.success(`삭제 완료, ${this.group.title}！`)
140140
}).catch(() => {
141141
this.$Spin.hide()
142142
})
143143
},
144144
onCancel: () => {
145-
this.$Message.info('已取消删除！')
145+
this.$Message.info('삭제 취소 !')
146146
}
147147
})
148148
}
@@ -158,7 +158,7 @@ export default {
158158
this.$Spin.showLoading()
159159
this.$store.dispatch('group/update', group).then(() => {
160160
this.$Spin.hide()
161-
this.$Message.success('更新当前用户组成功！')
161+
this.$Message.success('수정 완료！')
162162
}).catch(() => {
163163
this.$Spin.hide()
164164
})
@@ -167,7 +167,7 @@ export default {
167167
this.$store.dispatch('group/create', group).then(() => {
168168
this.$store.dispatch('group/find')
169169
this.$Spin.hide()
170-
this.$Message.success('新建当前用户组成功！')
170+
this.$Message.success('사용자 생성 완료 !')
171171
}).catch(() => {
172172
this.$Spin.hide()
173173
})

‎src/views/Admin/UserManage/TagEdit.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div>
3-
<h1>管理标签组</h1>
3+
<h1>태그 관리</h1>
44
<Row type="flex" justify="start">
55
<Col :span="2" class="label">Tag</Col>
66
<Col :span="4">

‎src/views/Admin/UserManage/UserEdit.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div>
3-
<h1>修改用户信息</h1>
3+
<h1>사용자 정보 수정</h1>
44
<Row type="flex" justify="start">
55
<Col :span="2" class="label">Username</Col>
66
<Col :span="4">
@@ -72,10 +72,10 @@ export default {
7272
{ newPwd: this.newPwd }
7373
))
7474
this.$store.dispatch('user/update', user).then(() => {
75-
this.$Message.success('修改成功！')
75+
this.$Message.success('업데이트 완료 !')
7676
})
7777
} else {
78-
this.$Message.info('两次密码不一致，请重新输入！')
78+
this.$Message.info('비밀번호가 서로 일치하지 않습니다 ！')
7979
}
8080
}
8181
}

‎src/views/Contest/ContestEdit.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export default {
1818
methods: {
1919
submit () {
2020
this.$store.dispatch('contest/update', this.contest).then(({ data }) => {
21-
this.$Message.success('提交成功！')
21+
this.$Message.success('수정 완료 !')
2222
this.$router.push({name: 'contestOverview', params: only(data, 'cid')})
2323
})
2424
}

‎src/views/Contest/ContestRanklist.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<i-switch size="large" @on-change="change">
44
<Icon type="android-done" slot="open"></Icon>
55
<Icon type="android-close" slot="close"></Icon>
6-
</i-switch> 自动刷新 (每 10 秒一次)
6+
</i-switch> 자동 새로고침 (10초)
77
<div class="conrank-wrap">
88
<table>
99
<tr>
@@ -64,7 +64,7 @@ export default {
6464
this.timer = setInterval(() => {
6565
this.getRank()
6666
this.$Message.info({
67-
content: '刷新成功',
67+
content: '업데이트 성공 !',
6868
duration: 1
6969
})
7070
}, 10000)

‎src/views/ContestList.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -172,15 +172,15 @@ export default {
172172
},
173173
del (cid) {
174174
this.$Modal.confirm({
175-
title: '提示',
176-
content: '<p>此操作将永久删除该文件, 是否继续?</p>',
175+
title: '알림',
176+
content: '<p>대회를 삭제하겠습니까?</p>',
177177
onOk: () => {
178178
this.$store.dispatch('contest/delete', { cid }).then(() => {
179-
this.$Message.success(`成功删除 ${cid}！`)
179+
this.$Message.success(`삭제 완료, ${cid}！`)
180180
})
181181
},
182182
onCancel: () => {
183-
this.$Message.info('已取消删除！')
183+
this.$Message.info('삭제 취소！')
184184
}
185185
})
186186
}

‎src/views/Discuss/Discuss.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ export default {
9292
},
9393
del (did) {
9494
this.$Modal.confirm({
95-
title: '提示',
96-
content: '<p>此操作将永久删除该文件, 是否继续?</p>',
95+
title: '알림',
96+
content: '<p>파일을 삭제하시겠습니까?</p>',
9797
onOk: () => {
9898
this.$store.dispatch('discuss/delete', { did }).then(() => {
99-
this.$Message.success(`成功删除 ${did}！`)
99+
this.$Message.success(`삭제 완료, ${did}！`)
100100
})
101101
},
102102
onCancel: () => {
103-
this.$Message.info('已取消删除！')
103+
this.$Message.info('삭제 취소 !')
104104
}
105105
})
106106
}

0 commit comments

Comments
 (0)