fix git conflict

kaiyuanshe · Jul 12, 2024 · 994100f · 994100f · github-actions · Jul 12, 2024
2 parents 52ca137 + 915905a
commit 994100f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/pages/polyfill.tsx b/pages/polyfill.tsx
@@ -58,7 +58,9 @@ export default class PolyfillPage extends Component {
         <header className="d-flex justify-content-around align-items-center">
           <h1>{t('Web_polyfill_CDN')}</h1>
 
-          <DropdownButton title={textJoin(t('examples'), currentUA)}>
+          <DropdownButton
+            title={textJoin(t('select_compatible_browser'), currentUA)}
+          >
             {Object.entries(UserAgent).map(([name, value]) => (
               <Dropdown.Item
                 key={name}
@@ -73,10 +75,10 @@ export default class PolyfillPage extends Component {
 
         <Accordion>
           <Accordion.Item eventKey="0">
-            <Accordion.Header>features</Accordion.Header>
+            <Accordion.Header>{t('select_features')}</Accordion.Header>
             <Accordion.Body>
               <Tree
-                filterPlaceholder="features"
+                filterPlaceholder={t('search_feature')}
                 filter
                 selectionMode="checkbox"
                 value={options}

diff --git a/translation/en-US.ts b/translation/en-US.ts
@@ -118,4 +118,9 @@ export default {
   meta: 'meta',
   content: 'content',
   copy_MarkDown: 'copy Markdown',
+
+  //Polyfill page
+  select_compatible_browser: 'select Compatible Browser',
+  select_features: 'select features',
+  search_feature: 'search Feature',
 } as const;
diff --git a/translation/zh-CN.ts b/translation/zh-CN.ts
@@ -115,4 +115,9 @@ export default {
   meta: '元数据',
   content: '内容',
   copy_MarkDown: '复制 Markdown',
+
+  //Polyfill page
+  select_compatible_browser: '选择兼容浏览器',
+  select_features: '选择特性',
+  search_feature: '搜索特性',
 } as const;
diff --git a/translation/zh-TW.ts b/translation/zh-TW.ts
@@ -115,4 +115,9 @@ export default {
   meta: '詮釋資料',
   content: '内容',
   copy_MarkDown: '複製 Markdown',
+
+  //Polyfill page
+  select_compatible_browser: '選擇相容瀏覽器',
+  select_features: '選擇特性',
+  search_feature: '搜尋特性',
 } as const;