Merge pull request #485 from pycontw/feat/code-of-conduct-2024

[feat] update code of conduct
pycontw · Feb 18, 2024 · 60cf37f · 60cf37f
2 parents 356b8d0 + f72d14c
commit 60cf37f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/i18n/about/code-of-conduct.i18n.js b/i18n/about/code-of-conduct.i18n.js
@@ -14,8 +14,8 @@ export default genI18nMessages({
                 descriptions: [
                     'PyCon Taiwan is dedicated to providing a harassment-free conference ' +
                         'experience for everyone. We do not tolerate harassment toward conference ' +
-                        'participants in any form.Remember that harassment and jokes that are sexist, ' +
-                        'racist, or exclusionary are not tolerated at PyCon Taiwan. PyCon Taiwan take ' +
+                        'participants in any form. Remember that harassment and jokes that are sexist, ' +
+                        'racist, or exclusionary are not tolerated at PyCon Taiwan. PyCon Taiwan takes ' +
                         'appropriate actions to redirect behavior violating the Code of Conduct.',
                 ],
                 list: [
@@ -40,7 +40,7 @@ export default genI18nMessages({
                                 'Users of Python are diverse in their professional roles, technical backgrounds, ' +
                                 'and application areas. They contribute to the technology in many different ways, ' +
                                 'some amazingly unimaginable. Opinions or actions that undervalue other members of ' +
-                                'the community are inappropriate and will not be tolerated. ',
+                                'the community are inappropriate and will not be tolerated.',
                         ],
                     },
                     {
@@ -77,12 +77,10 @@ export default genI18nMessages({
                     {
                         title: 'How to Report',
                         descriptions: [
-                            'In the event where there is conflict of interest, you may directly contact any of the lead incident responders:',
+                            'In the event of a conflict of interest, feel free to contact the official lead incident responders directly:',
                         ],
                         list: [
                             'Committee of Incident Response, PyCon Taiwan ([email protected])',
-                            'Winnie (Chairperson of PyCon TW 2023, [email protected])',
-                            'Pochun (Chairperson PyCon TW 2023, [email protected])',
                         ],
                     },
                     {
@@ -158,7 +156,7 @@ export default genI18nMessages({
                     'PyCon Taiwan 致力於為所有人提供無騷擾的會議體驗（包含數位場域），我們不容許以任何形式騷擾任何參與者。' +
                         '期望大家一起合作，務必遵守以下三大原則，PyCon Taiwan 籌備團隊有權調整任何違反此準則的行為。',
                 ],
-                list: ['禁止騷擾言行', '彼此欣賞', '體貼他人'],
+                list: ['禁止騷擾', '彼此欣賞', '體貼他人'],
                 subtitle: [
                     {
                         title: '禁止騷擾',
@@ -200,12 +198,10 @@ export default genI18nMessages({
                     {
                         title: '如何通報',
                         descriptions: [
-                            '如果發生衝突，可以直接聯繫任一通報應變者：',
+                            '如果發生衝突，可以直接聯繫官方通報應變者：',
                         ],
                         list: [
                             'PyCon Taiwan 事件通報應變委員會 ([email protected])',
-                            'Winnie (PyCon TW 2023 大會主席, [email protected])',
-                            'Pochun (PyCon TW 2023 大會主席, [email protected])',
                         ],
                     },
                     {
@@ -237,7 +233,7 @@ export default genI18nMessages({
                     {
                         title: '保密原則',
                         descriptions: [
-                            '所有通報內容都將保密。 當我們與被舉報人討論通報事件時，我們將盡可能匿名化通報之事件細節以保護舉報者之隱私。',
+                            '所有通報內容都將保密。當我們與被舉報人討論通報事件時，我們將盡可能匿名化通報之事件細節以保護舉報者之隱私。',
                             '然而，有些事件是發生在一對一的互動中，即便我們匿名化通報之事件細節，被檢舉者仍可能猜到是誰舉報他們。' +
                                 '如果您擔心遭遇報復或人身安全，請在通報內容中註明。' +
                                 '在某些情況下，我們會將多個匿名通報轉譯成一種行為模式，並針對該行為採取行動。',

diff --git a/pages/about/code-of-conduct.vue b/pages/about/code-of-conduct.vue
@@ -75,7 +75,16 @@
                                             "
                                         />
                                     </div>
-                                    <ol class="ml-4 list-decimal">
+                                    <ol
+                                        v-if="subtitle && subtitle.list"
+                                        class="ml-4"
+                                        :class="{
+                                            'list-decimal':
+                                                subtitle.list.length > 1,
+                                            'list-disc':
+                                                subtitle.list.length === 1,
+                                        }"
+                                    >
                                         <li
                                             v-for="(
                                                 li, liIndex