Merge branch 'master' into develop

packages/hydrooj/locales/zh.yaml

@@ -539,6 +539,7 @@ Permission: 权限
 Permissions: 权限
 Pick a problem randomly based on current filter: 根据当前过滤条件随机选择一道题
 pid: 题目 ID
+Pin discussions: 置顶讨论
 Plan: 计划
 Please attend contest to see the problems.: 请参加比赛来查看题目。
 Please claim the assignment to see the problems.: 认领作业后才可以查看作业内容。

packages/hydrooj/src/model/builtin.ts

@@ -123,7 +123,7 @@ export const PERMS = [
     Permission('perm_discussion', PERM.PERM_VIEW_DISCUSSION, 'View discussions'),
     Permission('perm_discussion', PERM.PERM_CREATE_DISCUSSION, 'Create discussions'),
     Permission('perm_discussion', PERM.PERM_HIGHLIGHT_DISCUSSION, 'Highlight discussions'),
-    Permission('perm_discussion', PERM.PERM_PIN_DISCUSSION, 'Highlight discussions'),
+    Permission('perm_discussion', PERM.PERM_PIN_DISCUSSION, 'Pin discussions'),
     Permission('perm_discussion', PERM.PERM_EDIT_DISCUSSION, 'Edit discussions'),
     Permission('perm_discussion', PERM.PERM_EDIT_DISCUSSION_SELF, 'Edit own discussions'),
     Permission('perm_discussion', PERM.PERM_DELETE_DISCUSSION, 'Delete discussions'),