Merge remote-tracking branch 'github/feat/1.1.2/ui' into feat/1.1.2/user-center

i18n/en_US.yaml

@@ -955,6 +955,10 @@ ui:
     skip: Skip
     discard_draft: Discard draft
     pinned: Pinned
+    all: All
+    question: Question
+    answer: Answer
+    comment: Comment
   search:
     title: Search Results
     keywords: Keywords
@@ -1233,6 +1237,7 @@ ui:
       pending: Pending
       completed: Completed
       flagged: Flagged
+      flagged_type: Flagged {{ type }}
       created: Created
       action: Action
       review: Review

i18n/zh_CN.yaml

@@ -895,6 +895,10 @@ ui:
     skip: 略过
     discard_draft: 丢弃草稿
     pinned: 已置顶
+    all: 所有
+    question: 问题
+    answer: 回答
+    comment: 评论
   search:
     title: 搜索结果
     keywords: 关键词
@@ -1164,6 +1168,7 @@ ui:
       pending: 等待处理
       completed: 已完成
       flagged: 被举报内容
+      flagged_type: 被举报的{{ type }}
       created: 创建于
       action: 操作
       review: 审查

ui/src/components/Header/index.scss

@@ -5,7 +5,7 @@
   background: linear-gradient(180deg, rgb(var(--bs-primary-rgb)) 0%, rgba(var(--bs-primary-rgb), 0.95) 100%);
   box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15), 0 0.125rem 0.25rem rgb(0 0 0 / 8%);
   .logo {
-    max-height: 1.75rem;
+    max-height: 2rem;
   }
 
   .nav-link {

ui/src/components/Header/index.tsx

@@ -123,7 +123,7 @@ const Header: FC = () => {
         />
 
         <div className="d-flex justify-content-between align-items-center nav-grow flex-nowrap">
-          <Navbar.Brand to="/" as={Link} className="lh-1 me-0 me-sm-3">
+          <Navbar.Brand to="/" as={Link} className="lh-1 me-0 me-sm-3 p-0">
             {brandingInfo.logo ? (
               <>
                 <img

ui/src/pages/Admin/Flags/index.tsx

@@ -73,7 +73,7 @@ const Flags: FC = () => {
           {flagTypeKeys.map((li) => {
             return (
               <option value={li} key={li}>
-                {li}
+                {t(li, { keyPrefix: 'btns' })}
               </option>
             );
           })}
@@ -96,7 +96,9 @@ const Flags: FC = () => {
                 <td>
                   <Stack>
                     <small className="text-secondary">
-                      Flagged {li.object_type}
+                      {t('flagged_type', {
+                        type: t(li.object_type, { keyPrefix: 'btns' }),
+                      })}
                     </small>
                     <BaseUserCard
                       data={li.reported_user}