+
From 7dd09755904823e1611e99c9cdf7b3e0fe62f470 Mon Sep 17 00:00:00 2001
From: SkyBird233 <52884766+SkyBird233@users.noreply.github.com>
Date: Mon, 4 Aug 2025 23:52:06 +0800
Subject: [PATCH 13/26] feat: replace events page with md file
---
content/en/events.md | 67 ++++++++++++
content/zh/events.md | 67 ++++++++++++
locales/en-US.js | 2 -
locales/en-us/json/page/events.json | 137 ------------------------
locales/zh-CN.js | 2 -
locales/zh-cn/json/page/events.json | 156 ----------------------------
pages/events/index.vue | 118 +--------------------
7 files changed, 135 insertions(+), 414 deletions(-)
create mode 100644 content/en/events.md
create mode 100644 content/zh/events.md
delete mode 100644 locales/en-us/json/page/events.json
delete mode 100644 locales/zh-cn/json/page/events.json
diff --git a/content/en/events.md b/content/en/events.md
new file mode 100644
index 00000000..7344d275
--- /dev/null
+++ b/content/en/events.md
@@ -0,0 +1,67 @@
+---
+title: '社区活动'
+---
+
+除日常开发活动外,我社还定期组织形式多样的线上及线下活动,以期活跃社区氛围、分享社区资源。作为主要活跃于互联网的开源社区,这些活动亦有拉近人际关系、让社区贡献及参与的概念具象化的作用。社区自 2015 年起每年暑期均会举办名为 AOSCC 的年度聚会,邀请包括社区贡献者、成员、校园社团、企业和个人参与,在向外界宣传社区工作的同时,为爱好者和行业代表提供了分享技术技巧和行业知识及动向的平台。自 2024 年起,我们还组织了春节“烙饼会”,与社区好友们共享节日气氛,谋划来年的工作目标。
+
+此外,社区还积极组织与高校社团协办“安同校园行”活动,也参与了许多由其他社区、社团等组织的交流活动,以期增进社区与各地社团、社群与行业内组织的联系,为消除知识壁垒和信息差作出积极努力。
+
+[AOSCC:社区年度聚会](/events#aoscc) | [安同校园行](/events#campus) | [春节烙饼会](/events#springcon) | [其他活动](/events#others)
+
+::h2{id="aoscc"}
+AOSCC:社区年度聚会
+::
+
+AOSCC 是我社每年一度的线下聚会,公开邀请社区好友参与。活动期间,社区邀请社区贡献者、高校社团成员和行业代表等分享、交流工作,并组织抽奖、代号投票等趣味活动。近年来,AOSCC 均由中国高校社团协办,每年吸引超过 100 名与会者参与。以下是自 2015 年的 AOSCC 活动地点、日期和会议信息记录:
+
+- **2025 年**:[上海交通大学(2025 年 7 月 26 - 27 日)](/aoscc/2025)
+- **2024 年**:[吉林大学(2024 年 7 月 13 - 14 日)](/aoscc/2024)
+- **2023 年**:[上海科技大学(2023 年 7 月 15 - 16 日)](/aoscc/2023)
+- **2022 年**:[由于新冠肺炎疫情,于线上举办(2022 年 9 月 17 日)](/aoscc/2022)
+- **2021 年**:[由于新冠肺炎疫情,于线上举办(2021 年 9 月 19 - 20 日)](/aoscc/2021)
+- **2020 年**:[由于新冠肺炎疫情,于线上举办(2020 年 9 月 25 - 26 日)](/aoscc/2020)
+- **2019 年**:[中国科学技术大学(2019 年 7 月 12 - 14 日)](/aoscc/2019)
+- **2018 年**:[于线上举办(2018 年 7 月 21 日)](/aoscc/2018)
+- **2017 年**:[广东工业大学(2017 年 7 月 14 - 16 日)](/aoscc/2017)
+- **2016 年**:上海科技大学(2016 年 7 月)
+- **2015 年**:深圳长虹科技大厦(2015 年 7 月)
+
+::h2{id="campus"}
+安同校园行
+::
+
+安同开源社区从校园诞生,助力校园及草根开源社区和组织的发展也是社区建立时的初心之一。如今,高校社团亦是我社关注和扶持的对象。自 2024 年起,我们与众多高校社团协作,组织“安同校园行”活动,邀请社区贡献者、行业代表等走进校园,分享社区和专业工作经验,让更多学生接触、了解和融入开源社区乃至行业前沿。
+
+如下是我社“安同校园行”的足迹:
+
+- **2025 年 4 月 19 日**:[北京站(北京大学、北京航空航天大学与中国人民大学合办)](https://www.bilibili.com/video/BV1PPLczeEvm/)
+- **2025 年 3 月 15 日**:[河海大学](https://www.bilibili.com/video/BV1uQQtYYEpY/)
+- **2024 年 12 月 15 日**:[西安电子科技大学](https://www.bilibili.com/video/BV14MBTYNEi8/)
+- **2024 年 12 月 7 日**:[山东大学(青岛)](https://www.bilibili.com/video/BV1caiyY4E3p/)
+- **2024 年 11 月 10 日**:[兰州大学](https://www.bilibili.com/video/BV1yUm6YEEWK/)
+- **2024 年 10 月 27 日**:[澳门科技大学](https://www.bilibili.com/video/BV1Vc1eYgEpm/)
+- **2024 年 10 月 20 日**:[宁夏理工学院](https://www.bilibili.com/video/BV1BYyzYfEd5/)
+- **2024 年 3 月 20 日**:[曲阜师范大学(“社团开放活动:计算进化”)](https://www.bilibili.com/video/BV1wr42187aT/)
+
+
+
+::h2{id="springcon"}
+春节烙饼会
+::
+
+自 2023 年始,为更及时地展示和沟通社区工作进展和规划,我们开始在春节假期组织线上“烙饼会”(取画饼之意),邀请贡献者和社区好友一道交流成果、计划与期望。如下是往期“烙饼会”的直播录像:
+
+- **2025 年**:[乙巳烙饼会(2025 年 2 月 1 日)](https://www.bilibili.com/video/BV1CNcFeYEBQ/)
+- **2024 年**:[甲辰烙饼会(2024 年 2 月 15 日)](https://www.bilibili.com/video/BV1Fj421X7gX)
+
+::h2{id="others"}
+其他活动
+::
+
+作为社区、校园乃至企业交流的一环,社区贡献者积极参与各公开会议、聚会活动。如下是我们的参与记录及录像:
+
+- **2024 年**:[开源之夏 2024 校园行:吉林大学(白铭骢:一个草根社区的自白——安同开源社区、开源产业与全民信创)](https://www.bilibili.com/video/BV1K142127oB)
+- **2024 年**:[北京大学 Linux 俱乐部与清华大学 TUNA 协会协办:Towards Modern Distro(白铭骢:从 AOSC OS 浅谈发行版社区的日常、雄心和无奈)](https://www.bilibili.com/video/BV1K142127oB)
+- **2022 年**:[FOSDEM 2022(白铭骢:AOSC OS/Retro - Our Ongoing Quest for the Possibility of Modern Linux on Vintage Hardware)](https://repo.aosc.io/aosc-documentation/fosdem/2022/20210113-slides.odp)
+- **2018 年**:[学生开源年会 (SOSCON18)(白铭骢、黎民雍:从宣传队到大社团——安同开源社区的历史、项目和文化综述)](https://repo.aosc.io/aosc-documentation/campus/2018/soscon/slide.pdf)
+- **2014 年**:[香港开源人年会 (HKOSC 2014)(叶晓星:安同開源社區——開源青春,開源中國)](https://repo.aosc.io/aosc-documentation/others/hkosc-2014/HK_Presentation.pdf)
diff --git a/content/zh/events.md b/content/zh/events.md
new file mode 100644
index 00000000..7344d275
--- /dev/null
+++ b/content/zh/events.md
@@ -0,0 +1,67 @@
+---
+title: '社区活动'
+---
+
+除日常开发活动外,我社还定期组织形式多样的线上及线下活动,以期活跃社区氛围、分享社区资源。作为主要活跃于互联网的开源社区,这些活动亦有拉近人际关系、让社区贡献及参与的概念具象化的作用。社区自 2015 年起每年暑期均会举办名为 AOSCC 的年度聚会,邀请包括社区贡献者、成员、校园社团、企业和个人参与,在向外界宣传社区工作的同时,为爱好者和行业代表提供了分享技术技巧和行业知识及动向的平台。自 2024 年起,我们还组织了春节“烙饼会”,与社区好友们共享节日气氛,谋划来年的工作目标。
+
+此外,社区还积极组织与高校社团协办“安同校园行”活动,也参与了许多由其他社区、社团等组织的交流活动,以期增进社区与各地社团、社群与行业内组织的联系,为消除知识壁垒和信息差作出积极努力。
+
+[AOSCC:社区年度聚会](/events#aoscc) | [安同校园行](/events#campus) | [春节烙饼会](/events#springcon) | [其他活动](/events#others)
+
+::h2{id="aoscc"}
+AOSCC:社区年度聚会
+::
+
+AOSCC 是我社每年一度的线下聚会,公开邀请社区好友参与。活动期间,社区邀请社区贡献者、高校社团成员和行业代表等分享、交流工作,并组织抽奖、代号投票等趣味活动。近年来,AOSCC 均由中国高校社团协办,每年吸引超过 100 名与会者参与。以下是自 2015 年的 AOSCC 活动地点、日期和会议信息记录:
+
+- **2025 年**:[上海交通大学(2025 年 7 月 26 - 27 日)](/aoscc/2025)
+- **2024 年**:[吉林大学(2024 年 7 月 13 - 14 日)](/aoscc/2024)
+- **2023 年**:[上海科技大学(2023 年 7 月 15 - 16 日)](/aoscc/2023)
+- **2022 年**:[由于新冠肺炎疫情,于线上举办(2022 年 9 月 17 日)](/aoscc/2022)
+- **2021 年**:[由于新冠肺炎疫情,于线上举办(2021 年 9 月 19 - 20 日)](/aoscc/2021)
+- **2020 年**:[由于新冠肺炎疫情,于线上举办(2020 年 9 月 25 - 26 日)](/aoscc/2020)
+- **2019 年**:[中国科学技术大学(2019 年 7 月 12 - 14 日)](/aoscc/2019)
+- **2018 年**:[于线上举办(2018 年 7 月 21 日)](/aoscc/2018)
+- **2017 年**:[广东工业大学(2017 年 7 月 14 - 16 日)](/aoscc/2017)
+- **2016 年**:上海科技大学(2016 年 7 月)
+- **2015 年**:深圳长虹科技大厦(2015 年 7 月)
+
+::h2{id="campus"}
+安同校园行
+::
+
+安同开源社区从校园诞生,助力校园及草根开源社区和组织的发展也是社区建立时的初心之一。如今,高校社团亦是我社关注和扶持的对象。自 2024 年起,我们与众多高校社团协作,组织“安同校园行”活动,邀请社区贡献者、行业代表等走进校园,分享社区和专业工作经验,让更多学生接触、了解和融入开源社区乃至行业前沿。
+
+如下是我社“安同校园行”的足迹:
+
+- **2025 年 4 月 19 日**:[北京站(北京大学、北京航空航天大学与中国人民大学合办)](https://www.bilibili.com/video/BV1PPLczeEvm/)
+- **2025 年 3 月 15 日**:[河海大学](https://www.bilibili.com/video/BV1uQQtYYEpY/)
+- **2024 年 12 月 15 日**:[西安电子科技大学](https://www.bilibili.com/video/BV14MBTYNEi8/)
+- **2024 年 12 月 7 日**:[山东大学(青岛)](https://www.bilibili.com/video/BV1caiyY4E3p/)
+- **2024 年 11 月 10 日**:[兰州大学](https://www.bilibili.com/video/BV1yUm6YEEWK/)
+- **2024 年 10 月 27 日**:[澳门科技大学](https://www.bilibili.com/video/BV1Vc1eYgEpm/)
+- **2024 年 10 月 20 日**:[宁夏理工学院](https://www.bilibili.com/video/BV1BYyzYfEd5/)
+- **2024 年 3 月 20 日**:[曲阜师范大学(“社团开放活动:计算进化”)](https://www.bilibili.com/video/BV1wr42187aT/)
+
+
+
+::h2{id="springcon"}
+春节烙饼会
+::
+
+自 2023 年始,为更及时地展示和沟通社区工作进展和规划,我们开始在春节假期组织线上“烙饼会”(取画饼之意),邀请贡献者和社区好友一道交流成果、计划与期望。如下是往期“烙饼会”的直播录像:
+
+- **2025 年**:[乙巳烙饼会(2025 年 2 月 1 日)](https://www.bilibili.com/video/BV1CNcFeYEBQ/)
+- **2024 年**:[甲辰烙饼会(2024 年 2 月 15 日)](https://www.bilibili.com/video/BV1Fj421X7gX)
+
+::h2{id="others"}
+其他活动
+::
+
+作为社区、校园乃至企业交流的一环,社区贡献者积极参与各公开会议、聚会活动。如下是我们的参与记录及录像:
+
+- **2024 年**:[开源之夏 2024 校园行:吉林大学(白铭骢:一个草根社区的自白——安同开源社区、开源产业与全民信创)](https://www.bilibili.com/video/BV1K142127oB)
+- **2024 年**:[北京大学 Linux 俱乐部与清华大学 TUNA 协会协办:Towards Modern Distro(白铭骢:从 AOSC OS 浅谈发行版社区的日常、雄心和无奈)](https://www.bilibili.com/video/BV1K142127oB)
+- **2022 年**:[FOSDEM 2022(白铭骢:AOSC OS/Retro - Our Ongoing Quest for the Possibility of Modern Linux on Vintage Hardware)](https://repo.aosc.io/aosc-documentation/fosdem/2022/20210113-slides.odp)
+- **2018 年**:[学生开源年会 (SOSCON18)(白铭骢、黎民雍:从宣传队到大社团——安同开源社区的历史、项目和文化综述)](https://repo.aosc.io/aosc-documentation/campus/2018/soscon/slide.pdf)
+- **2014 年**:[香港开源人年会 (HKOSC 2014)(叶晓星:安同開源社區——開源青春,開源中國)](https://repo.aosc.io/aosc-documentation/others/hkosc-2014/HK_Presentation.pdf)
diff --git a/locales/en-US.js b/locales/en-US.js
index ebe4b858..fe69e0a5 100644
--- a/locales/en-US.js
+++ b/locales/en-US.js
@@ -1,4 +1,3 @@
-import events from './en-us/json/page/events.json';
import gallery from './en-us/json/page/gallery.json';
import guidelines from './en-us/json/page/guidelines.json';
import allUniversalLink from './en-us/json/allUniversalLink.json';
@@ -50,7 +49,6 @@ export default {
index,
crowdsourcing,
download,
- events,
gallery,
guidelines,
internship,
diff --git a/locales/en-us/json/page/events.json b/locales/en-us/json/page/events.json
deleted file mode 100644
index d7b43fd5..00000000
--- a/locales/en-us/json/page/events.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
- "index": {
- "p1": "In addition to daily development activities, our company also regularly organizes various online and offline activities in order to activate the community atmosphere and share community resources. As an open source community that is mainly active on the Internet, these activities also have the effect of bringing closer interpersonal relationships and making the concepts of community contribution and participation concrete. The community has held an annual gathering called AOSCC every summer since 2015, inviting community contributors, members, campus clubs, businesses and individuals to participate. While promoting the work of the community to the outside world, it also provides opportunities for enthusiasts and industry representatives A platform to share technical skills and industry knowledge and trends. Starting in 2024, we have also organized a Spring Festival “Pancake Party” to share the festive atmosphere with community friends and plan work goals for the coming year.",
- "p2": "In addition, the community actively organizes the \"Antong Campus Tour\" activity in collaboration with university clubs, and also participates in many exchange activities organized by other communities, clubs, etc., in order to enhance the connection between the community and local clubs, communities and industry organizations, and make positive efforts to eliminate knowledge barriers and information gaps.",
- "p3": "AOSCC is our company’s annual offline gathering, and we openly invite community friends to participate. During the event, the community invites community contributors, university club members and industry representatives to share and exchange work, and organizes fun activities such as lottery draws and code voting. In recent years, AOSCC has been co-organized by Chinese university societies, attracting more than 100 attendees every year. The following is a record of AOSCC event locations, dates and meeting information since 2015:",
- "p4": "Antong Open Source Community was born on campus. The development of campus and grassroots open source communities and organizations was also one of the original intentions when the community was established. Nowadays, university societies are also the objects of our society’s attention and support. Since 2024, we have collaborated with many university societies to organize the \"Antong Campus Tour\" event, inviting community contributors, industry representatives, etc. to the campus to share community and professional work experience, so that more students can contact, understand and integrate open source community and even the forefront of the industry.",
- "p5": "The following is the footprint of our agency’s “Antong Campus Tour”:",
- "p6": "The following are the destinations for the “Antong Campus Tour” planned in the near future:",
- "p7": "Starting in 2023, in order to display and communicate community work progress and plans in a more timely manner, we began to organize online \"pancake parties\" (meaning to take picture cakes) during the Spring Festival holiday, inviting contributors and community friends to exchange results, plans and expectations . The following is the live video of past \"Pancake Party\":",
- "p8": "As part of the communication between the community, campus and even enterprises, community contributors actively participate in various public meetings and gatherings. The following is our participation record and video:",
- "title1": "community activities",
- "title2": "AOSCC: Annual gathering of the community",
- "title3": "Antong Campus Tour",
- "title4": "Spring Festival Pancake Party",
- "title5": "Other activities",
- "ul1": {
- "b": [
- "2024:",
- "2023:",
- "2022:",
- "2021:",
- "2020:",
- "2019:",
- "2018:",
- "2017:",
- "2016:",
- "2015:"
- ],
- "link": [
- ["Jilin University (July 13-14, 2024)", 2024],
- ["ShanghaiTech University (July 15-16, 2023)", 2023],
- ["Held online due to the COVID-19 pandemic (September 17, 2022)", 2022],
- [
- "Due to the COVID-19 epidemic, held online (September 19-20, 2021)",
- 2021
- ],
- [
- "Due to the COVID-19 epidemic, held online (September 25-26, 2020)",
- 2020
- ],
- [
- "University of Science and Technology of China (July 12-14, 2019)",
- 2019
- ],
- "Party canceled",
- ["Guangdong University of Technology (July 14-16, 2017)", 2017],
- "ShanghaiTech University (July 2016)",
- "Shenzhen Changhong Technology Building (July 2015)"
- ]
- },
- "ul2": {
- "li": [
- {
- "b": "October 27, 2024:",
- "link": {
- "title": "Macau University of Science and Technology",
- "url": "BV1Vc1eYgEpm"
- }
- },
- {
- "b": "October 20, 2024:",
- "link": {
- "title": "Ningxia Institute of Technology",
- "url": "BV1BYyzYfEd5"
- }
- },
- {
- "b": "March 2024:",
- "link": {
- "title": "Qufu Normal University (\"Open Club Activities: Computational Evolution\")",
- "url": "BV1wr42187aT"
- }
- }
- ]
- },
- "ul3": {
- "li": [
- ["November 10, 2024:", "Lanzhou University"],
- ["December 8, 2024:", "Shandong University (Qingdao)"],
- [
- "December 2024:",
- "Xi'an University of Electronic Science and Technology"
- ]
- ]
- },
- "ul4": {
- "li": [
- {
- "b": "2024:",
- "link": {
- "title": "Jiachen Pancake Party (February 15, 2024)",
- "url": "BV1Fj421X7gX"
- }
- }
- ]
- },
- "ul5": {
- "li": [
- {
- "b": "2024:",
- "link": {
- "title": "Summer of Open Source 2024 Campus Tour: Jilin University (Bai Mingcong: Confessions of a Grassroots Community - Antong Open Source Community, Open Source Industry and National Innovation)",
- "url": "BV1K142127oB"
- }
- },
- {
- "b": "2024:",
- "link": {
- "title": "Co-organized by Peking University Linux Club and Tsinghua University TUNA Association: Towards Modern Distro (Bai Mingcong: Talking about the daily life, ambition and helplessness of the distribution community from AOSC OS)",
- "url": "BV1K142127oB"
- }
- },
- {
- "b": "2022:",
- "link": {
- "title": "FOSDEM 2022 (Bai Mingcong: AOSC OS/Retro - Our Ongoing Quest for the Possibility of Modern Linux on Vintage Hardware)",
- "url": "fosdem-2022/20210113-slides.odp"
- }
- },
- {
- "b": "2018:",
- "link": {
- "title": "Student Open Source Annual Conference (SOSCON18) (Bai Mingcong, Li Minyong: From publicity team to large society-A review of the history, projects and culture of the Antong Open Source Community)",
- "url": "soscon-2018/slide.pdf"
- }
- },
- {
- "b": "2014:",
- "link": {
- "title": "Hong Kong Open Source People Annual Conference (HKOSC 2014) (Ye Xiaoxing: Antong Open Source Community - Open Source Youth, Open Source China)",
- "url": "hkosc-2014/HK_Presentation.pdf"
- }
- }
- ]
- }
- }
-}
diff --git a/locales/zh-CN.js b/locales/zh-CN.js
index 06d50ade..33408687 100644
--- a/locales/zh-CN.js
+++ b/locales/zh-CN.js
@@ -1,4 +1,3 @@
-import events from './zh-cn/json/page/events.json';
import gallery from './zh-cn/json/page/gallery.json';
import guidelines from './zh-cn/json/page/guidelines.json';
import allUniversalLink from './zh-cn/json/allUniversalLink.json';
@@ -50,7 +49,6 @@ export default {
index,
crowdsourcing,
download,
- events,
gallery,
guidelines,
internship,
diff --git a/locales/zh-cn/json/page/events.json b/locales/zh-cn/json/page/events.json
deleted file mode 100644
index 9e519e14..00000000
--- a/locales/zh-cn/json/page/events.json
+++ /dev/null
@@ -1,156 +0,0 @@
-{
- "index": {
- "p1": "除日常开发活动外,我社还定期组织形式多样的线上及线下活动,以期活跃社区氛围、分享社区资源。作为主要活跃于互联网的开源社区,这些活动亦有拉近人际关系、让社区贡献及参与的概念具象化的作用。社区自 2015 年起每年暑期均会举办名为 AOSCC 的年度聚会,邀请包括社区贡献者、成员、校园社团、企业和个人参与,在向外界宣传社区工作的同时,为爱好者和行业代表提供了分享技术技巧和行业知识及动向的平台。自 2024 年起,我们还组织了春节“烙饼会”,与社区好友们共享节日气氛,谋划来年的工作目标。",
- "p2": "此外,社区还积极组织与高校社团协办“安同校园行”活动,也参与了许多由其他社区、社团等组织的交流活动,以期增进社区与各地社团、社群与行业内组织的联系,为消除知识壁垒和信息差作出积极努力。",
- "p3": "AOSCC 是我社每年一度的线下聚会,公开邀请社区好友参与。活动期间,社区邀请社区贡献者、高校社团成员和行业代表等分享、交流工作,并组织抽奖、代号投票等趣味活动。近年来,AOSCC 均由中国高校社团协办,每年吸引超过 100 来自与会者参与。以下是自 2015 年的 AOSCC 活动地点、日期和会议信息记录:",
- "p4": "安同开源社区从校园诞生,校园及草根开源社区和组织的发展也是社区建立时的初心之一。如今,高校社团亦是我社关注和扶持的对象。自 2024 年起,我们与众多高校社团协作,组织“安同校园行”活动,邀请社区贡献者、行业代表等走进校园,分享社区和专业工作经验,让更多学生接触、了解和融入开源社区乃至行业前沿。",
- "p5": "如下是我社“安同校园行”的足迹:",
- "p6": "如下是近期规划内的“安同校园行”目的地:",
- "p7": "自 2023 年始,为更及时地展示和沟通社区工作进展和规划,我们开始在春节假期组织线上“烙饼会”(取画饼之意),邀请贡献者和社区好友一道交流成果、计划与期望。如下是往期“烙饼会”的直播录像:",
- "p8": "作为社区、校园乃至企业交流的一环,社区贡献者积极参与各公开会议、聚会活动。如下是我们的参与记录及录像:",
- "title1": "社区活动",
- "title2": "AOSCC:社区年度聚会",
- "title3": "安同校园行",
- "title4": "春节烙饼会",
- "title5": "其他活动",
- "ul2": {
- "li": [
- {
- "b": "2024 年 10 月 27 日:",
- "link": {
- "title": "澳门科技大学",
- "url": "BV1Vc1eYgEpm"
- }
- },
- {
- "b": "2024 年 10 月 20 日:",
- "link": {
- "title": "宁夏理工学院",
- "url": "BV1BYyzYfEd5"
- }
- },
- {
- "b": "2024 年 3 月:",
- "link": {
- "title": "曲阜师范大学(“社团开放活动:计算进化”)",
- "url": "BV1wr42187aT"
- }
- }
- ]
- },
- "ul3": {
- "li": [
- ["2024 年 11 月 10 日:", "兰州大学"],
- ["2024 年 12 月 8 日:", "山东大学(青岛)"],
- ["2024 年 12 月:", "西安电子科技大学"]
- ]
- },
- "ul4": {
- "li": [
- {
- "b": "2024 年:",
- "link": {
- "title": "甲辰烙饼会(2024 年 2 月 15 日)",
- "url": "BV1Fj421X7gX"
- }
- }
- ]
- },
- "ul5": {
- "li": [
- {
- "b": "2024 年:",
- "link": {
- "title": "开源之夏 2024 校园行:吉林大学(白铭骢:一个草根社区的自白 —— 安同开源社区、开源产业与全民信创)",
- "url": "BV1K142127oB"
- }
- },
- {
- "b": "2024 年:",
- "link": {
- "title": "北京大学 Linux 俱乐部与清华大学 TUNA 协会协办:Towards Modern Distro(白铭骢:从 AOSC OS 浅谈发行版社区的日常、雄心和无奈)",
- "url": "BV1K142127oB"
- }
- },
- {
- "b": "2022 年:",
- "link": {
- "title": "FOSDEM 2022(白铭骢:AOSC OS/Retro - Our Ongoing Quest for the Possibility of Modern Linux on Vintage Hardware)",
- "url": "fosdem-2022/20210113-slides.odp"
- }
- },
- {
- "b": "2018 年:",
- "link": {
- "title": "学生开源年会 (SOSCON18)(白铭骢、黎民雍:从宣传队到大社团 —— 安同开源社区的历史、项目和文化综述)",
- "url": "soscon-2018/slide.pdf"
- }
- },
- {
- "b": "2014 年:",
- "link": {
- "title": "香港开源人年会 (HKOSC 2014)(叶晓星:安同開源社區 —— 開源青春,開源中國)",
- "url": "hkosc-2014/HK_Presentation.pdf"
- }
- }
- ]
- },
- "aosccList": [
- {
- "year": 2025,
- "title": "上海交通大学(2025 年 7 月 26 - 27 日)",
- "hasLink": true
- },
- {
- "year": 2024,
- "title": "吉林大学(2024 年 7 月 13 - 14 日)",
- "hasLink": true
- },
- {
- "year": 2023,
- "title": "上海科技大学(2023 年 7 月 15 - 16 日)",
- "hasLink": true
- },
- {
- "year": 2022,
- "title": "由于新冠肺炎疫情,于线上举办(2022 年 9 月 17 日)",
- "hasLink": true
- },
- {
- "year": 2021,
- "title": "由于新冠肺炎疫情,于线上举办(2021 年 9 月 19 - 20 日)",
- "hasLink": true
- },
- {
- "year": 2020,
- "title": "由于新冠肺炎疫情,于线上举办(2020 年 9 月 25 - 26 日)",
- "hasLink": true
- },
- {
- "year": 2019,
- "title": "中国科学技术大学(2019 年 7 月 12 - 14 日)",
- "hasLink": true
- },
- {
- "year": 2018,
- "title": "于线上举办(2018 年 7 月 21 日)",
- "hasLink": true
- },
- {
- "year": 2017,
- "title": "广东工业大学(2017 年 7 月 14 - 16 日)",
- "hasLink": true
- },
- {
- "year": 2016,
- "title": "上海科技大学(2016 年 7 月)",
- "hasLink": false
- },
- {
- "year": 2015,
- "title": "深圳长虹科技大厦(2015 年 7 月)",
- "hasLink": false
- }
- ]
- }
-}
diff --git a/pages/events/index.vue b/pages/events/index.vue
index a29d42b4..fff410fb 100644
--- a/pages/events/index.vue
+++ b/pages/events/index.vue
@@ -1,119 +1,3 @@
-
-
-
-
-
-
{{ textValue.p1 }}
-
{{ textValue.p2 }}
-
-
-
-
-
-
-
-
{{ textValue.p3 }}
-
-
- -
- {{ year }} 年:
- {{ title }}
- {{ title }}
-
-
-
-
-
-
-
-
{{ textValue.p4 }}
-
{{ textValue.p5 }}
-
-
{{ textValue.p6 }}
-
-
- {{ item[0] }}
- {{ item[1] }}
-
-
-
-
-
-
-
-
-
-
+
-
-
From 643d1366d681c2f12cb6d48541c2698689209178 Mon Sep 17 00:00:00 2001
From: SkyBird233 <52884766+SkyBird233@users.noreply.github.com>
Date: Tue, 5 Aug 2025 00:36:39 +0800
Subject: [PATCH 14/26] feat: replace guidelines page with md file
---
content/en/guidelines.md | 125 ++++++++++++
content/zh/guidelines.md | 125 ++++++++++++
locales/en-US.js | 2 -
locales/en-us/json/page/guidelines.json | 162 ---------------
locales/zh-CN.js | 2 -
locales/zh-cn/json/page/guidelines.json | 150 --------------
pages/guidelines/index.vue | 253 +-----------------------
7 files changed, 251 insertions(+), 568 deletions(-)
create mode 100644 content/en/guidelines.md
create mode 100644 content/zh/guidelines.md
delete mode 100644 locales/en-us/json/page/guidelines.json
delete mode 100644 locales/zh-cn/json/page/guidelines.json
diff --git a/content/en/guidelines.md b/content/en/guidelines.md
new file mode 100644
index 00000000..2a37caca
--- /dev/null
+++ b/content/en/guidelines.md
@@ -0,0 +1,125 @@
+---
+title: 人际关系准则
+---
+
+欢迎来到创立于 2011 年的安同开源社区 (AOSC) !
+
+> *“All the people who live in a particular area, or a group of people who are considered as a unit because of their shared interests or background.”*
+>
— Community (n.), definition from the Cambridge English Dictionary
+
+
+作为安同开源社区的一分子,我们共同的爱好就是探索计算机技术,特别是开源软件的发展和本地化。数年来,安同开源社区将大部分的精力放在了 AOSC OS 这一发行版及多个社区成员们的兴趣项目。例如在 2019 年我们创建了 AOSC 古董计算机兴趣小组 (AOSC Retro Computing Group),为古董电脑爱好者提供了一个购买、折腾、把玩古董电脑的交流平台,我们甚至为这些电脑移植和适配了 AOSC OS。
+
+## 我们为什么需要社区准则
+
+没有多年的交流与碰撞,是不会有安同开源社区的 —— 这些交流和碰撞直接影响到了我们的社群意识。有鉴于此,有必要对我们社区的价值观作出集中解释。在我们列出所有具体的指导方针之前,特此说明:这个准则列出的是社区成员公认的,适用于所有社区成员的准则。 **但总的来说,我们目的并不是限制或处罚不符合这些价值观的行为**。
+
+## 基本原则
+
+本章节列出的是在我们社区中**不容置疑**的几项基本原则:
+
+- 安同开源社区永远是一个**独立的,为爱好者和发烧友而存在的社区**。
+- 安同开源社区**不会**为贡献者提供金钱和物质上的回报。
+- 安同开源社区**决不会**容忍任何形式的剽窃行为。
+
+## 准则条例
+
+鉴于我们社区大部分的活动和交流在 Telegram 频道/群组(及相应的 Discord 及 IRC 频道/群组)上开展,以下条例将分为“适用于全社区”和“适用于特定场景”两大类。**我们不会也无权约束或限制社区成员在社区(包含所有安同开源社区 Telegram 频道/群组(及相应的 Discord 及 IRC 频道/群组)、[AOSC 维基](https://wiki.aosc.io/)、[GitHub 组织](https://github.com/AOSC-Dev/)和[社区门户](/))外的任何行为。**
+
+对于两个大类,我们又将这些条例进一步分为“硬性规定”和“软性规定”:
+
+- 硬性规定包含了社区所有成员必须遵守的规定,不遵守将受到处罚(在每一类别下都有具体规定)。
+- 不遵守规定的管理员将被立即撤职,同时也会受到同样严厉的处罚。
+- 软性规定只是我们为了保持文明、高效且有趣的对话而提出的一些**建议**。不遵守这些规定只会使您越来越不受欢迎,更会影响社区内的交流和工作气氛,所以也请您记住这这些规定。
+- 下述各条例最终解释权归社区群组管理员所有。
+
+## 条例细则
+
+### 适用于全社区
+
+下面的规定适用于所有安同开源社区 Telegram 频道/群组(及相应的 Discord 及 IRC 频道/群组)、[AOSC 维基](https://wiki.aosc.io/)、[GitHub 组织](https://github.com/AOSC-Dev/)和[社区门户](/)。
+
+### 硬性规定
+
+1. 禁止在 [AOSC 托腮群及招待点](https://t.me/joinchat/BMnG9zvfjCgZUTIAoycKkg)(即水群)外进行**任何形式**关于政治、宗教和性相关话题的讨论。
+ - 管理员将制止并警告违规者(包括所有参与该主题的人)。多次违规者会被移出群聊(您可以立即重新加入,但必须停止您的违规行为)。
+2. 禁止在社区**任何场合**讨论或教唆对自身或他人的物理伤害。
+ - 违规者(包括所有参与该主题的人)将立即被移出群聊(您可以立即重新加入,但必须停止您的违规行为)。
+3. 禁止在社区**任何场合**对社区成员和与之相关人进行谩骂和侮辱。
+ - 这不包括偶尔的、明显带有开玩笑语气的的粗言秽语,但如果因此导致任何人产生不满情绪,请立刻停止您的行为。
+ - 管理员将制止并警告违规者(包括所有参与该主题的人)。多次违规者会被移出群聊(您可以立即重新加入,但必须停止您的违规行为)。
+4. 禁止在社区**任何场合**羞辱与歧视任何人、宗教、意识形态或者地域。
+ - 管理员将制止并警告违规者(包括所有参与该主题的人)。多次违规者会被移出群聊(您可以立即重新加入,但必须停止您的违规行为)。
+5. 禁止在社区**任何场合**发布过长的消息,您应该使用 [AOSC Pastebin](/paste) 或其他工具。
+ - 管理员将制止并警告违规者(包括所有参与该主题的人)。多次违规者会被移出群聊(您可以立即重新加入,但必须停止您的违规行为)。
+6. 禁止在社区**任何场合**发布垃圾信息。
+ - 违规者(包括所有参与该主题的人)将**立即**被移出群聊(您可以立即重新加入,但必须停止您的违规行为)。
+
+### 软性规定
+
+1. 尊重他人的言论自由。
+ - 争执时常发生,不要总是指望管理员出手,还请尝试发挥自己的聪明才智来化解难题。只有相互尊重才能杜绝人身攻击。
+ - 用花名称呼他人时,要考虑被提及者的感受以避免其产生不满情绪或感到困惑。
+ - 观点分歧时有发生,攻击性言论并不能助人信服及认同您的观点。
+ - 在使用脏话前请考虑清楚其作用:说脏话对表达您的观点是否有利?请注意,脏话用多了真的很他妈烦。
+ - 您可以使用您喜欢的任何语言,但要顾及到他人的语言能力。大多数成员会用中文和英文,在必要时请考虑使用翻译工具。
+2. 保持幽默。
+ - 我们的 [AOSCC 贴纸包](https://github.com/AOSC-Dev/aoscc/tree/master/2019/stickers)就是根据社区里日常对话中产生的梗设计制作的。
+3. 您的独特性不等同于特殊性。
+ - 人们之所以愿意倾听您的发言是因为他们有兴趣,但他们没有义务时刻听从您的发号施令。
+4. 避免同时讨论多个话题。
+ - 在讨论频道中同时进行多个讨论必然会造成混乱。
+ - 控制每个话题占用的时间,麦霸行为不礼貌,也会遭人嫌弃
+5. 请勿随意脱离主题。
+ - 请不要在 AOSC 的古董计算机兴趣小组里讨论您的全新 MacBook。
+
+### 主群组和工作群组
+
+- AOSC バカ(AOSC OS 开发及打包工作组)
+- AOSC infra-wg(AOSC 网络设施维护工作组)
+
+在这些场合,在遵守上面提到的所有社区规则同时,还请留意以下几条附加规则:
+
+### 硬性规定
+
+1. 禁止使用 Telegram 贴纸或是 GIF 动图。
+ - 您可以使用 Emoji 或颜文字作为替代。
+ - 允许发布与技术或工作主题相关的图片和视频。
+ - 管理员将制止并警告违规者(包括所有参与该主题的人)。多次违规者会被移出群聊(您可以立即重新加入,但必须停止您的违规行为)。
+
+### 软性规定
+
+1. 少灌水 —— 学会张弛有度,不要给点雨水就泛滥。
+
+### 托腮群
+
+即“安同开源社区托腮群及招待点”。在该频道请注意遵守上面提到的所有社区规则及针对该群的特许话题。
+
+### 兴趣小组
+
+安同开源社区的兴趣小组包括:
+
+- AOSC Memes (AOSC 梗)
+- AOSC Moe-ification(AOSC 萌化工作组)
+- AOSC Retro Computing(AOSC 古董计算机兴趣小组)
+- AOSCC Sticker Squad(AOSCC 贴纸设计小组)
+
+请注意:上面提到的所有“适用于全社区”的规则同样适用于兴趣小组。
+
+## 为何不引入《贡献者公约》?
+
+我们的社区是在我们独有的社群意识基础之上建立的,通过成员对计算机技术的兴趣得以成形,并根据成员的意愿进行维护和管理。尽管[《贡献者公约》](https://www.contributor-covenant.org/zh-cn/version/1/4/code-of-conduct/)的出发点良好,但《公约》里的条文不适用于我们社区。
+
+我们相信我们社区的成员都应该在持续的实践中不断成长,并通过他们对技术的理解和他们独特的性格特点找到了自己的位置。贡献者公约中并没有重视这一点,而且在试图将他们视作一样的。
+
+这是公约中“我们的义务”一章的原话:
+
+> 项目维护者有权利和义务去删除、编辑、拒绝违背本行为标准的评论(comments)、提交(commits)、代码、Wiki 编辑、问题(issues)等贡献;项目维护者可暂时或永久地封禁任何他们认为行为不当、威胁、冒犯、有害的参与者。
+
+长久以来,我们社区的各种基础设施均用作开发工具。基于这一点,任何和开发无关的活动都应禁止,而且社区成员们也会谴责任何形式的不检点行为。《贡献者公约》用了四个过于模糊(且多有重合)的形容词来描述所谓的“不当、威胁、冒犯、有害”行为,并没有给予被误判的人充分辩解的机会。我们认为,确立基础设施的专用性,是杜绝在我们的开发工作中出现所谓不可接受行为(及无端谴责或指控)的有效方法。
+
+除此之外,贡献者公约提及的一些执行流程和我们社区的性质有原则性冲突:
+
+> 未切实遵守或执行本行为标准的项目维护人员,经项目负责人或其他成员决议,可能被暂时或永久地剥夺参与本项目的资格。
+
+我们社区是由贡献者维护及管理的。虽然我们社区有所谓“创始人”(或事实上的“领导者”),但他(白铭骢)认识到其权力是与众多贡献者们共有且共同行使的。在我们社区,创始人和贡献者、维护者等其它角色事实上没有明显的上下级关系。因此,上面的约束对我们社区是无效的。 总的来说,《贡献者公约》不承认无等级社区的事实存在,并基于此作了许多假设。更令人担忧的是,《贡献者公约》过多地注重并猜忌文字中的种种意思。综上所述,我们认为在社区中引入并执行《贡献者公约》是不合适,无效,甚至是危险的。
diff --git a/content/zh/guidelines.md b/content/zh/guidelines.md
new file mode 100644
index 00000000..2a37caca
--- /dev/null
+++ b/content/zh/guidelines.md
@@ -0,0 +1,125 @@
+---
+title: 人际关系准则
+---
+
+欢迎来到创立于 2011 年的安同开源社区 (AOSC) !
+
+> *“All the people who live in a particular area, or a group of people who are considered as a unit because of their shared interests or background.”*
+>
— Community (n.), definition from the Cambridge English Dictionary
+
+
+作为安同开源社区的一分子,我们共同的爱好就是探索计算机技术,特别是开源软件的发展和本地化。数年来,安同开源社区将大部分的精力放在了 AOSC OS 这一发行版及多个社区成员们的兴趣项目。例如在 2019 年我们创建了 AOSC 古董计算机兴趣小组 (AOSC Retro Computing Group),为古董电脑爱好者提供了一个购买、折腾、把玩古董电脑的交流平台,我们甚至为这些电脑移植和适配了 AOSC OS。
+
+## 我们为什么需要社区准则
+
+没有多年的交流与碰撞,是不会有安同开源社区的 —— 这些交流和碰撞直接影响到了我们的社群意识。有鉴于此,有必要对我们社区的价值观作出集中解释。在我们列出所有具体的指导方针之前,特此说明:这个准则列出的是社区成员公认的,适用于所有社区成员的准则。 **但总的来说,我们目的并不是限制或处罚不符合这些价值观的行为**。
+
+## 基本原则
+
+本章节列出的是在我们社区中**不容置疑**的几项基本原则:
+
+- 安同开源社区永远是一个**独立的,为爱好者和发烧友而存在的社区**。
+- 安同开源社区**不会**为贡献者提供金钱和物质上的回报。
+- 安同开源社区**决不会**容忍任何形式的剽窃行为。
+
+## 准则条例
+
+鉴于我们社区大部分的活动和交流在 Telegram 频道/群组(及相应的 Discord 及 IRC 频道/群组)上开展,以下条例将分为“适用于全社区”和“适用于特定场景”两大类。**我们不会也无权约束或限制社区成员在社区(包含所有安同开源社区 Telegram 频道/群组(及相应的 Discord 及 IRC 频道/群组)、[AOSC 维基](https://wiki.aosc.io/)、[GitHub 组织](https://github.com/AOSC-Dev/)和[社区门户](/))外的任何行为。**
+
+对于两个大类,我们又将这些条例进一步分为“硬性规定”和“软性规定”:
+
+- 硬性规定包含了社区所有成员必须遵守的规定,不遵守将受到处罚(在每一类别下都有具体规定)。
+- 不遵守规定的管理员将被立即撤职,同时也会受到同样严厉的处罚。
+- 软性规定只是我们为了保持文明、高效且有趣的对话而提出的一些**建议**。不遵守这些规定只会使您越来越不受欢迎,更会影响社区内的交流和工作气氛,所以也请您记住这这些规定。
+- 下述各条例最终解释权归社区群组管理员所有。
+
+## 条例细则
+
+### 适用于全社区
+
+下面的规定适用于所有安同开源社区 Telegram 频道/群组(及相应的 Discord 及 IRC 频道/群组)、[AOSC 维基](https://wiki.aosc.io/)、[GitHub 组织](https://github.com/AOSC-Dev/)和[社区门户](/)。
+
+### 硬性规定
+
+1. 禁止在 [AOSC 托腮群及招待点](https://t.me/joinchat/BMnG9zvfjCgZUTIAoycKkg)(即水群)外进行**任何形式**关于政治、宗教和性相关话题的讨论。
+ - 管理员将制止并警告违规者(包括所有参与该主题的人)。多次违规者会被移出群聊(您可以立即重新加入,但必须停止您的违规行为)。
+2. 禁止在社区**任何场合**讨论或教唆对自身或他人的物理伤害。
+ - 违规者(包括所有参与该主题的人)将立即被移出群聊(您可以立即重新加入,但必须停止您的违规行为)。
+3. 禁止在社区**任何场合**对社区成员和与之相关人进行谩骂和侮辱。
+ - 这不包括偶尔的、明显带有开玩笑语气的的粗言秽语,但如果因此导致任何人产生不满情绪,请立刻停止您的行为。
+ - 管理员将制止并警告违规者(包括所有参与该主题的人)。多次违规者会被移出群聊(您可以立即重新加入,但必须停止您的违规行为)。
+4. 禁止在社区**任何场合**羞辱与歧视任何人、宗教、意识形态或者地域。
+ - 管理员将制止并警告违规者(包括所有参与该主题的人)。多次违规者会被移出群聊(您可以立即重新加入,但必须停止您的违规行为)。
+5. 禁止在社区**任何场合**发布过长的消息,您应该使用 [AOSC Pastebin](/paste) 或其他工具。
+ - 管理员将制止并警告违规者(包括所有参与该主题的人)。多次违规者会被移出群聊(您可以立即重新加入,但必须停止您的违规行为)。
+6. 禁止在社区**任何场合**发布垃圾信息。
+ - 违规者(包括所有参与该主题的人)将**立即**被移出群聊(您可以立即重新加入,但必须停止您的违规行为)。
+
+### 软性规定
+
+1. 尊重他人的言论自由。
+ - 争执时常发生,不要总是指望管理员出手,还请尝试发挥自己的聪明才智来化解难题。只有相互尊重才能杜绝人身攻击。
+ - 用花名称呼他人时,要考虑被提及者的感受以避免其产生不满情绪或感到困惑。
+ - 观点分歧时有发生,攻击性言论并不能助人信服及认同您的观点。
+ - 在使用脏话前请考虑清楚其作用:说脏话对表达您的观点是否有利?请注意,脏话用多了真的很他妈烦。
+ - 您可以使用您喜欢的任何语言,但要顾及到他人的语言能力。大多数成员会用中文和英文,在必要时请考虑使用翻译工具。
+2. 保持幽默。
+ - 我们的 [AOSCC 贴纸包](https://github.com/AOSC-Dev/aoscc/tree/master/2019/stickers)就是根据社区里日常对话中产生的梗设计制作的。
+3. 您的独特性不等同于特殊性。
+ - 人们之所以愿意倾听您的发言是因为他们有兴趣,但他们没有义务时刻听从您的发号施令。
+4. 避免同时讨论多个话题。
+ - 在讨论频道中同时进行多个讨论必然会造成混乱。
+ - 控制每个话题占用的时间,麦霸行为不礼貌,也会遭人嫌弃
+5. 请勿随意脱离主题。
+ - 请不要在 AOSC 的古董计算机兴趣小组里讨论您的全新 MacBook。
+
+### 主群组和工作群组
+
+- AOSC バカ(AOSC OS 开发及打包工作组)
+- AOSC infra-wg(AOSC 网络设施维护工作组)
+
+在这些场合,在遵守上面提到的所有社区规则同时,还请留意以下几条附加规则:
+
+### 硬性规定
+
+1. 禁止使用 Telegram 贴纸或是 GIF 动图。
+ - 您可以使用 Emoji 或颜文字作为替代。
+ - 允许发布与技术或工作主题相关的图片和视频。
+ - 管理员将制止并警告违规者(包括所有参与该主题的人)。多次违规者会被移出群聊(您可以立即重新加入,但必须停止您的违规行为)。
+
+### 软性规定
+
+1. 少灌水 —— 学会张弛有度,不要给点雨水就泛滥。
+
+### 托腮群
+
+即“安同开源社区托腮群及招待点”。在该频道请注意遵守上面提到的所有社区规则及针对该群的特许话题。
+
+### 兴趣小组
+
+安同开源社区的兴趣小组包括:
+
+- AOSC Memes (AOSC 梗)
+- AOSC Moe-ification(AOSC 萌化工作组)
+- AOSC Retro Computing(AOSC 古董计算机兴趣小组)
+- AOSCC Sticker Squad(AOSCC 贴纸设计小组)
+
+请注意:上面提到的所有“适用于全社区”的规则同样适用于兴趣小组。
+
+## 为何不引入《贡献者公约》?
+
+我们的社区是在我们独有的社群意识基础之上建立的,通过成员对计算机技术的兴趣得以成形,并根据成员的意愿进行维护和管理。尽管[《贡献者公约》](https://www.contributor-covenant.org/zh-cn/version/1/4/code-of-conduct/)的出发点良好,但《公约》里的条文不适用于我们社区。
+
+我们相信我们社区的成员都应该在持续的实践中不断成长,并通过他们对技术的理解和他们独特的性格特点找到了自己的位置。贡献者公约中并没有重视这一点,而且在试图将他们视作一样的。
+
+这是公约中“我们的义务”一章的原话:
+
+> 项目维护者有权利和义务去删除、编辑、拒绝违背本行为标准的评论(comments)、提交(commits)、代码、Wiki 编辑、问题(issues)等贡献;项目维护者可暂时或永久地封禁任何他们认为行为不当、威胁、冒犯、有害的参与者。
+
+长久以来,我们社区的各种基础设施均用作开发工具。基于这一点,任何和开发无关的活动都应禁止,而且社区成员们也会谴责任何形式的不检点行为。《贡献者公约》用了四个过于模糊(且多有重合)的形容词来描述所谓的“不当、威胁、冒犯、有害”行为,并没有给予被误判的人充分辩解的机会。我们认为,确立基础设施的专用性,是杜绝在我们的开发工作中出现所谓不可接受行为(及无端谴责或指控)的有效方法。
+
+除此之外,贡献者公约提及的一些执行流程和我们社区的性质有原则性冲突:
+
+> 未切实遵守或执行本行为标准的项目维护人员,经项目负责人或其他成员决议,可能被暂时或永久地剥夺参与本项目的资格。
+
+我们社区是由贡献者维护及管理的。虽然我们社区有所谓“创始人”(或事实上的“领导者”),但他(白铭骢)认识到其权力是与众多贡献者们共有且共同行使的。在我们社区,创始人和贡献者、维护者等其它角色事实上没有明显的上下级关系。因此,上面的约束对我们社区是无效的。 总的来说,《贡献者公约》不承认无等级社区的事实存在,并基于此作了许多假设。更令人担忧的是,《贡献者公约》过多地注重并猜忌文字中的种种意思。综上所述,我们认为在社区中引入并执行《贡献者公约》是不合适,无效,甚至是危险的。
diff --git a/locales/en-US.js b/locales/en-US.js
index fe69e0a5..f324098b 100644
--- a/locales/en-US.js
+++ b/locales/en-US.js
@@ -1,5 +1,4 @@
import gallery from './en-us/json/page/gallery.json';
-import guidelines from './en-us/json/page/guidelines.json';
import allUniversalLink from './en-us/json/allUniversalLink.json';
import internship from './en-us/json/page/internship.json';
import l10n from './en-us/json/page/l10n.json';
@@ -50,7 +49,6 @@ export default {
crowdsourcing,
download,
gallery,
- guidelines,
internship,
l10n,
liblol,
diff --git a/locales/en-us/json/page/guidelines.json b/locales/en-us/json/page/guidelines.json
deleted file mode 100644
index b861d075..00000000
--- a/locales/en-us/json/page/guidelines.json
+++ /dev/null
@@ -1,162 +0,0 @@
-{
- "index": {
- "b1": "But in general, our goal is not to restrict or penalize behavior that is inconsistent with these values.",
- "b2": "no doubt",
- "b3": "We will not and have no right to restrict or restrict community members’ access to the community (including all Antong Open Source Community Telegram channels/groups (and corresponding Discord and IRC channels/groups),",
- "b4": "any form",
- "b5": "\"Project maintainers have the right and obligation to delete, edit, and reject comments, commits, code, Wiki edits, issues, and other contributions that violate this standard of conduct; project maintainers can ban them temporarily or permanently Any participant they deem to be behaving inappropriately, threatening, offensive, harmful.",
- "b6": "\"Project maintenance personnel who fail to effectively abide by or implement this standard of conduct may be temporarily or permanently deprived of the qualification to participate in this project upon resolution by the project leader or other members.\"",
- "p1": "Welcome to the Antong Open Source Community (AOSC) founded in 2011!",
- "p2": "— Community (n.), definition from the",
- "p3": "As a member of the Antong open source community, our common hobby is to explore computer technology, especially the development and localization of open source software. Over the past few years, the Antong open source community has focused most of its energy on the AOSC OS distribution and the interest projects of multiple community members. For example, in 2019, we created the AOSC Retro Computing Group to provide a communication platform for antique computer enthusiasts to buy, play with, and play with antique computers. We even transplanted and adapted the AOSC OS to these computers. .",
- "p4": "Without years of exchanges and collisions, there would be no Antong open source community - these exchanges and collisions have directly affected our sense of community. In light of this, a focused explanation of our community's values is necessary. Before we list all the specific guidelines, a quick note: These guidelines list guidelines that are generally accepted by community members and apply to all community members.",
- "p5": "Listed in this section are those in our community",
- "p6": "Several basic principles:",
- "p7": "Given that most of the activities and communications in our community are carried out on Telegram channels/groups (and corresponding Discord and IRC channels/groups), the following regulations will be divided into two categories: \"applicable to the entire community\" and \"applicable to specific scenarios\" kind.",
- "p8": "、",
- "p9": "and",
- "p10": ").",
- "p11": "For two broad categories, we further divide these regulations into \"hard regulations\" and \"soft regulations\":",
- "p12": "The following regulations apply to all Antong Open Source Community Telegram channels/groups (and corresponding Discord and IRC channels/groups),",
- "p14": "prohibited from",
- "p15": "(i.e. water group) outside",
- "p16": "Discussions on topics related to politics, religion, and sex.",
- "p17": "Banned from the community",
- "p18": "any occasion",
- "p19": "Discuss or encourage physical harm to self or others.",
- "p20": "Abuse and insult towards members of the community and those associated with them.",
- "p21": "This does not include the occasional, obviously joking, profanity, but if this offends anyone, please stop immediately.",
- "p22": "Humiliate and discriminate against any person, religion, ideology or geography.",
- "p23": "To post a message that is too long, you should use",
- "p24": "or other tools.",
- "p25": "Post spam.",
- "p26": "On these occasions, while adhering to all of the community rules mentioned above, please be aware of the following additional rules:",
- "p27": "That is, \"Antong Kaiyuan Community Support Group and Reception Point\". Please be sure to abide by all community rules mentioned above and the privileged topics for this group on this channel.",
- "p28": "Interest groups in the Antong open source community include:",
- "p29": "Please note: All of the \"community-wide\" rules mentioned above also apply to interest groups.",
- "p30": "Our community is built on our unique sense of community, shaped by members' interest in computing technology, and is maintained and managed according to their wishes. although",
- "p31": "The starting point is good, but the provisions of the Convention do not apply to our community.",
- "p32": "We believe that members of our community have grown through ongoing practice and found their niche through their understanding of technology and their unique character traits. The Contributor Covenant doesn't take this seriously and tries to treat them as the same.",
- "p33": "These are the original words of the chapter \"Our Obligations\" in the Convention:",
- "p34": "Various infrastructures in our community have long been used as development tools. For this reason, any non-development related activities are prohibited and community members will condemn any form of indiscretion. The Contributor Covenant uses four overly vague (and often overlapping) adjectives to describe the so-called \"inappropriate, threatening, offensive, harmful\" behavior, and does not give those who have been misjudged a full opportunity to defend themselves. We believe that establishing dedicated infrastructure is an effective way to eliminate so-called unacceptable behavior (and unwarranted accusations or accusations) in our development work.",
- "p35": "In addition, some implementation processes mentioned in the Contributor Covenant have principle conflicts with the nature of our community:",
- "p36": "Our community is maintained and managed by contributors. Although our community has a so-called \"founder\" (or de facto \"leader\"), he (Bai Mingcong) recognizes that his power is shared and exercised by many contributors. In our community, there is actually no obvious superior-subordinate relationship between founders and other roles such as contributors and maintainers. Therefore, the above constraints are invalid for our community. Overall, the Contributors Covenant does not acknowledge the factual existence of hierarchical communities and makes many assumptions based on them. What is even more worrying is that the Contributor Covenant pays too much attention to and doubts the meaning of the words. In summary, we believe that introducing and enforcing the Contributor Covenant in the community is inappropriate, ineffective, and even dangerous.",
- "warning": "Moderators will stop and warn offenders (including everyone involved in the topic). Repeat offenders will be removed from the group chat (you can rejoin immediately, but must stop your offending behavior).",
- "clean": "Violators (including everyone who participates in the topic) will be removed from the group chat immediately (you can rejoin immediately, but must stop your offending behavior).",
- "i1": "“All the people who live in a particular area, or a group of people who are considered as a unit because of their shared interests or background.”",
- "title1": "principles of human relations",
- "title2": "Why we need Community Guidelines",
- "title3": "basic principles",
- "title4": "Code Ordinance",
- "title5": "Regulations",
- "title6": "Why not introduce a Contributor Covenant?",
- "subheading1": "Applies to the entire community",
- "subheading2": "Hard rules",
- "subheading3": "soft rules",
- "subheading4": "Main group and work group",
- "subheading5": "Cheek support group",
- "subheading6": "interest group",
- "ul1": {
- "li": [
- [
- "Antong open source community will always be a",
- "An independent community for enthusiasts and enthusiasts.",
- ""
- ],
- [
- "Antong open source community",
- "Won't",
- "Provide monetary and material rewards to contributors."
- ],
- [
- "Antong open source community",
- "Never",
- "Plagiarism of any kind will be tolerated."
- ]
- ]
- },
- "ul2": {
- "li": [
- "Hard rules contain rules that all members of the community must abide by, with penalties for noncompliance (specific rules exist under each category).",
- "Administrators who fail to comply will be immediately removed from their posts and will be subject to equally severe penalties.",
- [
- "Soft rules are just some of the things we do to keep the conversation civil, productive, and interesting",
- "suggestion",
- ". Failure to comply with these rules will only make you less and less popular, and will also affect the communication and working atmosphere in the community, so please remember these rules."
- ],
- "The final interpretation rights of the following regulations belong to the community group administrator."
- ]
- },
- "ul4": {
- "li": [
- "Respect the freedom of speech of others.",
- "Keep it humorous.",
- "Your uniqueness is not the same as specialness.",
- "Avoid discussing multiple topics at once.",
- "Please do not stray off topic."
- ],
- "ul1": {
- "li": [
- "Disputes often occur. Don't always expect the administrator to take action. Please try to use your own intelligence to resolve problems. Only mutual respect can prevent personal attacks.",
- "When calling someone by a fancy name, consider the feelings of the person being addressed to avoid resentment or confusion.",
- "Differences of opinion happen, and offensive comments will not help others convince and agree with your point of view.",
- "Consider the purpose of swearing before you use it: Does swearing help get your point across? Mind you, swearing is really annoying when used too much.",
- "You can use any language you like, but be considerate of the language abilities of others. Most members speak Chinese and English, please consider using translation tools if necessary."
- ]
- },
- "ul2": {
- "li": [
- [
- "our",
- "It is designed and produced based on memes generated from daily conversations in the community."
- ]
- ]
- },
- "ul3": {
- "li": [
- "People listen to you because they are interested, but they are not obligated to follow your orders all the time."
- ]
- },
- "ul4": {
- "li": [
- "Having multiple discussions running simultaneously in a discussion channel is bound to cause confusion.",
- "Control the time occupied by each topic. If Mai Ba behaves impolitely, he will be disliked by others."
- ]
- },
- "ul5": {
- "li": [
- "Please don't discuss your new MacBook in AOSC's Antique Computers Interest Group."
- ]
- }
- },
- "ul5": {
- "li": [
- "AOSC バカ (AOSC OS development and packaging working group)",
- "AOSC infra-wg (AOSC Network Facilities Maintenance Working Group)"
- ]
- },
- "ul6": {
- "li": ["No Telegram stickers or GIFs allowed."],
- "ul1": {
- "li": [
- "You can use Emoji or kaomoji instead.",
- "Images and videos related to technical or work topics are allowed.",
- "Moderators will stop and warn offenders (including everyone involved in the topic). Repeat offenders will be removed from the group chat (you can rejoin immediately, but must stop your offending behavior)."
- ]
- }
- },
- "ul7": {
- "li": [
- "Irrigate less - learn to be relaxed and moderate, and don't flood with a little rain."
- ]
- },
- "ul8": {
- "li": [
- "AOSC Memes (AOSC memes)",
- "AOSC Moe-ification (AOSC Moe-ification Working Group)",
- "AOSC Retro Computing (AOSC Antique Computer Interest Group)",
- "AOSCC Sticker Squad (AOSCC sticker design team)"
- ]
- }
- }
-}
diff --git a/locales/zh-CN.js b/locales/zh-CN.js
index 33408687..2dedcb14 100644
--- a/locales/zh-CN.js
+++ b/locales/zh-CN.js
@@ -1,5 +1,4 @@
import gallery from './zh-cn/json/page/gallery.json';
-import guidelines from './zh-cn/json/page/guidelines.json';
import allUniversalLink from './zh-cn/json/allUniversalLink.json';
import internship from './zh-cn/json/page/internship.json';
import l10n from './zh-cn/json/page/l10n.json';
@@ -50,7 +49,6 @@ export default {
crowdsourcing,
download,
gallery,
- guidelines,
internship,
l10n,
liblol,
diff --git a/locales/zh-cn/json/page/guidelines.json b/locales/zh-cn/json/page/guidelines.json
deleted file mode 100644
index f1296b4e..00000000
--- a/locales/zh-cn/json/page/guidelines.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
- "index": {
- "b1": "但总的来说,我们目的并不是限制或处罚不符合这些价值观的行为。",
- "b2": "不容置疑",
- "b3": "我们不会也无权约束或限制社区成员在社区(包含所有安同开源社区 Telegram 频道 / 群组(及相应的 Discord 及 IRC 频道 / 群组)、",
- "b4": "任何形式",
- "b5": "“项目维护者有权利和义务去删除、编辑、拒绝违背本行为标准的评论(comments)、提交(commits)、代码、Wiki 编辑、问题(issues)等贡献;项目维护者可暂时或永久地封禁任何他们认为行为不当、威胁、冒犯、有害的参与者。",
- "b6": "“未切实遵守或执行本行为标准的项目维护人员,经项目负责人或其他成员决议,可能被暂时或永久地剥夺参与本项目的资格。”",
- "p1": "欢迎来到创立于 2011 年的安同开源社区 (AOSC) !",
- "p2": "— Community (n.), definition from the",
- "p3": "作为安同开源社区的一分子,我们共同的爱好就是探索计算机技术,特别是开源软件的发展和本地化。数年来,安同开源社区将大部分的精力放在了 AOSC OS 这一发行版及多个社区成员们的兴趣项目。例如在 2019 年我们创建了 AOSC 古董计算机兴趣小组 (AOSC Retro Computing Group),为古董电脑爱好者提供了一个购买、折腾、把玩古董电脑的交流平台,我们甚至为这些电脑移植和适配了 AOSC OS。",
- "p4": "没有多年的交流与碰撞,是不会有安同开源社区的 —— 这些交流和碰撞直接影响到了我们的社群意识。有鉴于此,有必要对我们社区的价值观作出集中解释。在我们列出所有具体的指导方针之前,特此说明:这个准则列出的是社区成员公认的,适用于所有社区成员的准则。",
- "p5": "本章节列出的是在我们社区中",
- "p6": "的几项基本原则:",
- "p7": "鉴于我们社区大部分的活动和交流在 Telegram 频道 / 群组(及相应的 Discord 及 IRC 频道 / 群组)上开展,以下条例将分为“适用于全社区”和“适用于特定场景”两大类。",
- "p8": "、",
- "p9": "和",
- "p10": ")外的任何行为。",
- "p11": "对于两个大类,我们又将这些条例进一步分为“硬性规定”和“软性规定”:",
- "p12": "下面的规定适用于所有安同开源社区 Telegram 频道 / 群组(及相应的 Discord 及 IRC 频道 / 群组)、",
- "p13": "。",
- "p14": "禁止在",
- "p15": "(即水群)外进行",
- "p16": "关于政治、宗教和性相关话题的讨论。",
- "p17": "禁止在社区",
- "p18": "任何场合",
- "p19": "讨论或教唆对自身或他人的物理伤害。",
- "p20": "对社区成员和与之相关人进行谩骂和侮辱。",
- "p21": "这不包括偶尔的、明显带有开玩笑语气的的粗言秽语,但如果因此导致任何人产生不满情绪,请立刻停止您的行为。",
- "p22": "羞辱与歧视任何人、宗教、意识形态或者地域。",
- "p23": "发布过长的消息,您应该使用",
- "p24": "或其他工具。",
- "p25": "发布垃圾信息。",
- "p26": "在这些场合,在遵守上面提到的所有社区规则同时,还请留意以下几条附加规则:",
- "p27": "即“安同开源社区托腮群及招待点”。在该频道请注意遵守上面提到的所有社区规则及针对该群的特许话题。",
- "p28": "安同开源社区的兴趣小组包括:",
- "p29": "请注意:上面提到的所有“适用于全社区”的规则同样适用于兴趣小组。",
- "p30": "我们的社区是在我们独有的社群意识基础之上建立的,通过成员对计算机技术的兴趣得以成形,并根据成员的意愿进行维护和管理。尽管",
- "p31": "的出发点良好,但《公约》里的条文不适用于我们社区。",
- "p32": "我们相信我们社区的成员都应该在持续的实践中不断成长,并通过他们对技术的理解和他们独特的性格特点找到了自己的位置。贡献者公约中并没有重视这一点,而且在试图将他们视作一样的。",
- "p33": "这是公约中“我们的义务”一章的原话:",
- "p34": "长久以来,我们社区的各种基础设施均用作开发工具。基于这一点,任何和开发无关的活动都应禁止,而且社区成员们也会谴责任何形式的不检点行为。《贡献者公约》用了四个过于模糊(且多有重合)的形容词来描述所谓的“不当、威胁、冒犯、有害”行为,并没有给予被误判的人充分辩解的机会。我们认为,确立基础设施的专用性,是杜绝在我们的开发工作中出现所谓不可接受行为(及无端谴责或指控)的有效方法。",
- "p35": "除此之外,贡献者公约提及的一些执行流程和我们社区的性质有原则性冲突:",
- "p36": "我们社区是由贡献者维护及管理的。虽然我们社区有所谓“创始人”(或事实上的“领导者”),但他(白铭骢)认识到其权力是与众多贡献者们共有且共同行使的。在我们社区,创始人和贡献者、维护者等其它角色事实上没有明显的上下级关系。因此,上面的约束对我们社区是无效的。总的来说,《贡献者公约》不承认无等级社区的事实存在,并基于此作了许多假设。更令人担忧的是,《贡献者公约》过多地注重并猜忌文字中的种种意思。综上所述,我们认为在社区中引入并执行《贡献者公约》是不合适,无效,甚至是危险的。",
- "p37": "立即",
- "warning": "管理员将制止并警告违规者(包括所有参与该主题的人)。多次违规者会被移出群聊(您可以立即重新加入,但必须停止您的违规行为)。",
- "clean": [
- "违规者(包括所有参与该主题的人)将",
- "被移出群聊(您可以立即重新加入,但必须停止您的违规行为)。"
- ],
- "i1": "“All the people who live in a particular area, or a group of people who are considered as a unit because of their shared interests or background.”",
- "title1": "人际关系准则",
- "title2": "我们为什么需要社区准则",
- "title3": "基本原则",
- "title4": "准则条例",
- "title5": "条例细则",
- "title6": "为何不引入《贡献者公约》?",
- "subheading1": "适用于全社区",
- "subheading2": "硬性规定",
- "subheading3": "软性规定",
- "subheading4": "主群组和工作群组",
- "subheading5": "托腮群",
- "subheading6": "兴趣小组",
- "ul1": {
- "li": [
- [
- "安同开源社区永远是一个",
- "独立的,为爱好者和发烧友而存在的社区。",
- ""
- ],
- ["安同开源社区", "不会", "为贡献者提供金钱和物质上的回报。"],
- ["安同开源社区", "决不会", "容忍任何形式的剽窃行为。"]
- ]
- },
- "ul2": {
- "li": [
- "硬性规定包含了社区所有成员必须遵守的规定,不遵守将受到处罚(在每一类别下都有具体规定)。",
- "不遵守规定的管理员将被立即撤职,同时也会受到同样严厉的处罚。",
- [
- "软性规定只是我们为了保持文明、高效且有趣的对话而提出的一些",
- "建议",
- "。不遵守这些规定只会使您越来越不受欢迎,更会影响社区内的交流和工作气氛,所以也请您记住这这些规定。"
- ],
- "下述各条例最终解释权归社区群组管理员所有。"
- ]
- },
- "ul4": {
- "li": [
- "尊重他人的言论自由。",
- "保持幽默。",
- "您的独特性不等同于特殊性。",
- "避免同时讨论多个话题。",
- "请勿随意脱离主题。"
- ],
- "ul1": {
- "li": [
- "争执时常发生,不要总是指望管理员出手,还请尝试发挥自己的聪明才智来化解难题。只有相互尊重才能杜绝人身攻击。",
- "用花名称呼他人时,要考虑被提及者的感受以避免其产生不满情绪或感到困惑。",
- "观点分歧时有发生,攻击性言论并不能助人信服及认同您的观点。",
- "在使用脏话前请考虑清楚其作用:说脏话对表达您的观点是否有利?请注意,脏话用多了真的很他妈烦。",
- "您可以使用您喜欢的任何语言,但要顾及到他人的语言能力。大多数成员会用中文和英文,在必要时请考虑使用翻译工具。"
- ]
- },
- "ul2": {
- "li": [["我们的", "就是根据社区里日常对话中产生的梗设计制作的。"]]
- },
- "ul3": {
- "li": [
- "人们之所以愿意倾听您的发言是因为他们有兴趣,但他们没有义务时刻听从您的发号施令。"
- ]
- },
- "ul4": {
- "li": [
- "在讨论频道中同时进行多个讨论必然会造成混乱。",
- "控制每个话题占用的时间,麦霸行为不礼貌,也会遭人嫌弃。"
- ]
- },
- "ul5": {
- "li": ["请不要在 AOSC 的古董计算机兴趣小组里讨论您的全新 MacBook。"]
- }
- },
- "ul5": {
- "li": [
- "AOSC バカ(AOSC OS 开发及打包工作组)",
- "AOSC infra-wg(AOSC 网络设施维护工作组)"
- ]
- },
- "ul6": {
- "li": ["禁止使用 Telegram 贴纸或是 GIF 动图。"],
- "ul1": {
- "li": [
- "您可以使用 Emoji 或颜文字作为替代。",
- "允许发布与技术或工作主题相关的图片和视频。",
- "管理员将制止并警告违规者(包括所有参与该主题的人)。多次违规者会被移出群聊(您可以立即重新加入,但必须停止您的违规行为)。"
- ]
- }
- },
- "ul7": {
- "li": ["少灌水 —— 学会张弛有度,不要给点雨水就泛滥。"]
- },
- "ul8": {
- "li": [
- "AOSC Memes (AOSC 梗)",
- "AOSC Moe-ification(AOSC 萌化工作组)",
- "AOSC Retro Computing(AOSC 古董计算机兴趣小组)",
- "AOSCC Sticker Squad(AOSCC 贴纸设计小组)"
- ]
- }
- }
-}
diff --git a/pages/guidelines/index.vue b/pages/guidelines/index.vue
index a9bb3083..fff410fb 100644
--- a/pages/guidelines/index.vue
+++ b/pages/guidelines/index.vue
@@ -1,254 +1,3 @@
-
-
-
-
-
-
{{ textValue.p1 }}
-
{{ textValue.i1 }}
-
- {{ textValue.p2 }}
-
-
-
{{ textValue.p3 }}
-
-
-
-
-
- {{ textValue.p4 }}
- {{ textValue.b1 }}
-
-
-
-
-
-
- {{ textValue.p5 }}
- {{ textValue.b2 }}
- {{ textValue.p6 }}
-
-
- -
- {{ item[0] }}
- {{ item[1] }}
- {{ item[2] }}
-
-
-
-
-
-
-
- {{ textValue.p7 }}
-
- {{ textValue.b3 }}
-
- {{ textValue.p8 }}
-
- {{ textValue.p9 }}
-
- {{ textValue.p10 }}
-
-
-
-
{{ textValue.p11 }}
-
- -
-
- {{ item[0] }}
- {{ item[1] }}
- {{ item[2] }}
-
- {{ item }}
-
-
-
-
-
-
-
{{ textValue.subheading1 }}
-
- {{ textValue.p12 }}
-
- {{ textValue.p8 }}
-
- {{ textValue.p9 }}
-
- {{ linkValue.aPeriod }}
-
-
-
{{ textValue.subheading2 }}
-
- -
- {{ textValue.p14 }}
-
- {{ textValue.p15 }}
- {{ textValue.b4 }}
- {{ textValue.p16 }}
-
-
- - {{ textValue.warning }}
-
- -
- {{ textValue.p17 }}
- {{ textValue.p18 }}
- {{ textValue.p19 }}
-
-
- -
- {{ textValue.clean[0] }}
- {{ textValue.p37 }}
- {{ textValue.clean[1] }}
-
-
- -
- {{ textValue.p17 }}
- {{ textValue.p18 }}
- {{ textValue.p20 }}
-
-
- - {{ textValue.p21 }}
- - {{ textValue.warning }}
-
- -
- {{ textValue.p17 }}
- {{ textValue.p18 }}
- {{ textValue.p22 }}
-
-
- - {{ textValue.warning }}
-
- -
- {{ textValue.p17 }}
- {{ textValue.p18 }}
- {{ textValue.p23 }}
-
- {{ textValue.p24 }}
-
-
- - {{ textValue.warning }}
-
- -
- {{ textValue.p17 }}
- {{ textValue.p18 }}
- {{ textValue.p25 }}
-
-
- -
- {{ textValue.clean[0] }}
- {{ textValue.p37 }}
- {{ textValue.clean[1] }}
-
-
-
-
-
{{ textValue.subheading3 }}
-
-
- - {{ item }}
-
-
-
-
-
- -
- {{ textValue.ul4[`ul${index + 1}`].li[0][0] }}
-
- {{ textValue.ul4[`ul${index + 1}`].li[0][1] }}
-
-
-
-
-
-
-
{{ textValue.subheading4 }}
-
-
{{ textValue.p26 }}
-
-
{{ textValue.subheading2 }}
-
-
-
{{ textValue.subheading3 }}
-
-
-
{{ textValue.subheading5 }}
-
{{ textValue.p27 }}
-
-
{{ textValue.subheading6 }}
-
{{ textValue.p28 }}
-
-
{{ textValue.p29 }}
-
-
-
-
-
- {{ textValue.p30 }}
-
- {{ textValue.p31 }}
-
-
{{ textValue.p32 }}
-
{{ textValue.p33 }}
-
- {{ textValue.b5 }}
-
-
{{ textValue.p34 }}
-
{{ textValue.p35 }}
-
- {{ textValue.b6 }}
-
-
{{ textValue.p36 }}
-
-
+
-
-
-./components/Header.vue
From 5b930b0d7bc2daf6aaf4fb3b95d6e7b45b63716f Mon Sep 17 00:00:00 2001
From: SkyBird233 <52884766+SkyBird233@users.noreply.github.com>
Date: Tue, 5 Aug 2025 00:51:03 +0800
Subject: [PATCH 15/26] feat: replace internship page with md file
---
content/en/internship.md | 49 ++++++++
content/zh/internship.md | 49 ++++++++
locales/en-US.js | 2 -
locales/en-us/json/page/internship.json | 143 ------------------------
locales/zh-CN.js | 2 -
locales/zh-cn/json/page/internship.json | 128 ---------------------
pages/internship/index.vue | 82 +-------------
7 files changed, 99 insertions(+), 356 deletions(-)
create mode 100644 content/en/internship.md
create mode 100644 content/zh/internship.md
delete mode 100644 locales/en-us/json/page/internship.json
delete mode 100644 locales/zh-cn/json/page/internship.json
diff --git a/content/en/internship.md b/content/en/internship.md
new file mode 100644
index 00000000..45825a6e
--- /dev/null
+++ b/content/en/internship.md
@@ -0,0 +1,49 @@
+---
+title: '实习资源'
+---
+
+我社重视围绕开源软件生态协作共进及技能共享:近年来,我社每年还以导师身份安排贡献者参与国内外的开源项目推进活动,如中国科学院软件研究所(下略:中科院软件所)的“开源之夏”活动,带领国内外高校学生锻炼应用和研发能力、积累专业经验。
+
+除上述活动外,我社众多项目均由贡献者志愿参与维护与管理。社区许多项目不仅与其他社区乃至上游项目有直接及密切的联系,在行业内亦有一定知名度。过去数年中,许多贡献者通过参与社区项目和管理锻炼了技术能力、积累了个人经验,在就业时亦充分证明了这些经验的积极意义。
+
+本页面介绍社区历史上参与的实习项目,并对当前人力紧迫和待办的项目进行简要介绍,供各位社区好友参考。
+
+[英雄帖:待办项目](#todo) | [实习项目:开源之夏](#ospp)
+
+::h2{id="todo"}
+英雄帖:待办项目
+::
+
+我社项目繁多但人员稀少,天马行空的大坑也好,细处着手的小事也罢,常常因为人力问题难以得到实施。如下是眼下有待完成的项目,欢迎您通过[各聊天群组](/contact)与我们联系,从英雄帖拿下属于您的立功机会:
+
+- **安同 OS**:改善 RISC-V 架构支持情况并制作安装介质
+- **安同 OS**:制作并发布虚拟机(及云服务)镜像
+- **星霞 OS**:编写维护指南并进行特性规划
+- **社区门户**:实现“支持中心”栏目(框架搭建、内容编写及索引功能等)
+- **社区外宣**:为 Bilibili 及 YouTube 平台制作指南与用户支持视频
+
+::h2{id="ospp"}
+实习项目:开源之夏
+::
+
+自 2020 年起,我社贡献者以导师的角色积极参与中科院软件所的“开源之夏”活动,成功指导多名学生完成实习项目,直接参与到社区的贡献中来。如下是我们过去参与指导的项目列表:
+
+- **开源之夏2024**:[自由及开源软件简中本地化工作(导师:白铭骢)](https://summer-ospp.ac.cn/org/prodetail/24f3e0160)
+- **开源之夏2024**:[设计编写安同 OS 用户手册及编写规范(导师:温柔)](https://summer-ospp.ac.cn/org/prodetail/24f3e0161)
+- **开源之夏2024**:[为 RISC-V 开发板提供安同 OS 系统镜像(导师:Icenowy Zheng)](https://summer-ospp.ac.cn/org/prodetail/24f3e0162)
+- **开源之夏2023**:[为 实现 DeployKit 图形界面(导师:刘子兴)](https://summer-ospp.ac.cn/2023/org/prodetail/23f3e0031)
+- **开源之夏2023**:[自由及开源软件简中本地化工作(导师:刘子兴,学生:刘万涛)](https://summer-ospp.ac.cn/2023/org/prodetail/23f3e0032)
+- **开源之夏2023**:[Autobuild 3 自动化打包测试框架(导师:黄烜宁,学生:李泽睿)](https://summer-ospp.ac.cn/2023/org/prodetail/23f3e0033)
+- **开源之夏2022**:[全志 RISC-V 芯片主线化开发工作(导师:Icenowy Zheng,学生:Moteen Shah)](https://summer-ospp.ac.cn/2022/#/org/prodetail/22f3e0079)
+- **开源之夏2022**:[AOSC 的软件包信息站重实现(导师:刘子兴,学生:桂民强)](https://summer-ospp.ac.cn/2022/#/org/prodetail/22f3e0080)
+- **开源之夏2021**:[全志 RISC-V 芯片主线化开发工作(导师:Icenowy Zheng)](https://summer-ospp.ac.cn/2021/#/org/prodetail/210080041)
+- **开源之夏2021**:[半自动软件包退休、封存与整理系统(导师:张顺然,学生:李宗汶)](https://summer-ospp.ac.cn/2021/#/org/prodetail/210080042)
+- **开源之夏2021**:[自由及开源软件简中本地化工作(导师:白铭骢,学生:龚健威)](https://summer-ospp.ac.cn/2021/#/org/prodetail/210080099)
+- **开源之夏2021**:[安装程序 DeployKit 的实现(导师:刘子兴)](https://summer-ospp.ac.cn/2021/#/org/prodetail/210080100)
+- **开源之夏2021**:[AOSC OS 的 LoongArch 移植(导师:白铭骢,学生:许彦骐)](https://summer-ospp.ac.cn/2021/#/org/prodetail/210080299)
+- **开源之夏2020**:[半自动软件包退休、封存与整理系统(导师:张顺然,学生:穆信东)](https://summer-ospp.ac.cn/2020/#/organisations/aosc)
+- **开源之夏2020**:[自由及开源软件简中本地化工作(导师:白铭骢,学生:徐玮毅)](https://summer-ospp.ac.cn/2020/#/organisations/aosc)
+- **开源之夏2020**:[发行版构建自动化:打包调度器(导师:Dingyuan Wang)](https://summer-ospp.ac.cn/2020/#/organisations/aosc)
+- **开源之夏2020**:[发行版构建自动化:自动化测试框架(导师:Dingyuan Wang)](https://summer-ospp.ac.cn/2020/#/organisations/aosc)
+- **开源之夏2020**:[安装程序 DeployKit 的实现(导师:黎民雍)](https://summer-ospp.ac.cn/2020/#/organisations/aosc)
+- **开源之夏2020**:[为 libinput 框架实现“划圈滚动 (Circular Srolling)”(导师:白铭骢)](https://summer-ospp.ac.cn/2020/#/organisations/aosc)
diff --git a/content/zh/internship.md b/content/zh/internship.md
new file mode 100644
index 00000000..45825a6e
--- /dev/null
+++ b/content/zh/internship.md
@@ -0,0 +1,49 @@
+---
+title: '实习资源'
+---
+
+我社重视围绕开源软件生态协作共进及技能共享:近年来,我社每年还以导师身份安排贡献者参与国内外的开源项目推进活动,如中国科学院软件研究所(下略:中科院软件所)的“开源之夏”活动,带领国内外高校学生锻炼应用和研发能力、积累专业经验。
+
+除上述活动外,我社众多项目均由贡献者志愿参与维护与管理。社区许多项目不仅与其他社区乃至上游项目有直接及密切的联系,在行业内亦有一定知名度。过去数年中,许多贡献者通过参与社区项目和管理锻炼了技术能力、积累了个人经验,在就业时亦充分证明了这些经验的积极意义。
+
+本页面介绍社区历史上参与的实习项目,并对当前人力紧迫和待办的项目进行简要介绍,供各位社区好友参考。
+
+[英雄帖:待办项目](#todo) | [实习项目:开源之夏](#ospp)
+
+::h2{id="todo"}
+英雄帖:待办项目
+::
+
+我社项目繁多但人员稀少,天马行空的大坑也好,细处着手的小事也罢,常常因为人力问题难以得到实施。如下是眼下有待完成的项目,欢迎您通过[各聊天群组](/contact)与我们联系,从英雄帖拿下属于您的立功机会:
+
+- **安同 OS**:改善 RISC-V 架构支持情况并制作安装介质
+- **安同 OS**:制作并发布虚拟机(及云服务)镜像
+- **星霞 OS**:编写维护指南并进行特性规划
+- **社区门户**:实现“支持中心”栏目(框架搭建、内容编写及索引功能等)
+- **社区外宣**:为 Bilibili 及 YouTube 平台制作指南与用户支持视频
+
+::h2{id="ospp"}
+实习项目:开源之夏
+::
+
+自 2020 年起,我社贡献者以导师的角色积极参与中科院软件所的“开源之夏”活动,成功指导多名学生完成实习项目,直接参与到社区的贡献中来。如下是我们过去参与指导的项目列表:
+
+- **开源之夏2024**:[自由及开源软件简中本地化工作(导师:白铭骢)](https://summer-ospp.ac.cn/org/prodetail/24f3e0160)
+- **开源之夏2024**:[设计编写安同 OS 用户手册及编写规范(导师:温柔)](https://summer-ospp.ac.cn/org/prodetail/24f3e0161)
+- **开源之夏2024**:[为 RISC-V 开发板提供安同 OS 系统镜像(导师:Icenowy Zheng)](https://summer-ospp.ac.cn/org/prodetail/24f3e0162)
+- **开源之夏2023**:[为 实现 DeployKit 图形界面(导师:刘子兴)](https://summer-ospp.ac.cn/2023/org/prodetail/23f3e0031)
+- **开源之夏2023**:[自由及开源软件简中本地化工作(导师:刘子兴,学生:刘万涛)](https://summer-ospp.ac.cn/2023/org/prodetail/23f3e0032)
+- **开源之夏2023**:[Autobuild 3 自动化打包测试框架(导师:黄烜宁,学生:李泽睿)](https://summer-ospp.ac.cn/2023/org/prodetail/23f3e0033)
+- **开源之夏2022**:[全志 RISC-V 芯片主线化开发工作(导师:Icenowy Zheng,学生:Moteen Shah)](https://summer-ospp.ac.cn/2022/#/org/prodetail/22f3e0079)
+- **开源之夏2022**:[AOSC 的软件包信息站重实现(导师:刘子兴,学生:桂民强)](https://summer-ospp.ac.cn/2022/#/org/prodetail/22f3e0080)
+- **开源之夏2021**:[全志 RISC-V 芯片主线化开发工作(导师:Icenowy Zheng)](https://summer-ospp.ac.cn/2021/#/org/prodetail/210080041)
+- **开源之夏2021**:[半自动软件包退休、封存与整理系统(导师:张顺然,学生:李宗汶)](https://summer-ospp.ac.cn/2021/#/org/prodetail/210080042)
+- **开源之夏2021**:[自由及开源软件简中本地化工作(导师:白铭骢,学生:龚健威)](https://summer-ospp.ac.cn/2021/#/org/prodetail/210080099)
+- **开源之夏2021**:[安装程序 DeployKit 的实现(导师:刘子兴)](https://summer-ospp.ac.cn/2021/#/org/prodetail/210080100)
+- **开源之夏2021**:[AOSC OS 的 LoongArch 移植(导师:白铭骢,学生:许彦骐)](https://summer-ospp.ac.cn/2021/#/org/prodetail/210080299)
+- **开源之夏2020**:[半自动软件包退休、封存与整理系统(导师:张顺然,学生:穆信东)](https://summer-ospp.ac.cn/2020/#/organisations/aosc)
+- **开源之夏2020**:[自由及开源软件简中本地化工作(导师:白铭骢,学生:徐玮毅)](https://summer-ospp.ac.cn/2020/#/organisations/aosc)
+- **开源之夏2020**:[发行版构建自动化:打包调度器(导师:Dingyuan Wang)](https://summer-ospp.ac.cn/2020/#/organisations/aosc)
+- **开源之夏2020**:[发行版构建自动化:自动化测试框架(导师:Dingyuan Wang)](https://summer-ospp.ac.cn/2020/#/organisations/aosc)
+- **开源之夏2020**:[安装程序 DeployKit 的实现(导师:黎民雍)](https://summer-ospp.ac.cn/2020/#/organisations/aosc)
+- **开源之夏2020**:[为 libinput 框架实现“划圈滚动 (Circular Srolling)”(导师:白铭骢)](https://summer-ospp.ac.cn/2020/#/organisations/aosc)
diff --git a/locales/en-US.js b/locales/en-US.js
index f324098b..c66967ea 100644
--- a/locales/en-US.js
+++ b/locales/en-US.js
@@ -1,6 +1,5 @@
import gallery from './en-us/json/page/gallery.json';
import allUniversalLink from './en-us/json/allUniversalLink.json';
-import internship from './en-us/json/page/internship.json';
import l10n from './en-us/json/page/l10n.json';
import liblol from './en-us/json/page/liblol.json';
import AppSupport from './en-us/json/components/AppSupport.json';
@@ -49,7 +48,6 @@ export default {
crowdsourcing,
download,
gallery,
- internship,
l10n,
liblol,
paste,
diff --git a/locales/en-us/json/page/internship.json b/locales/en-us/json/page/internship.json
deleted file mode 100644
index a844b719..00000000
--- a/locales/en-us/json/page/internship.json
+++ /dev/null
@@ -1,143 +0,0 @@
-{
- "index": {
- "navigationTextList": [
- "Hero Post: To-Do Projects",
- "Internship Project: Summer of Open Source"
- ],
- "title1": "Internship Resources",
- "ps1": [
- "Our company attaches great importance to ecological collaboration and skill sharing around open source software: in recent years, our company has also arranged contributors to participate in open source project promotion activities at home and abroad as mentors every year, such as the Institute of Software, Chinese Academy of Sciences (hereinafter omitted: Institute of Software, Chinese Academy of Sciences) The \"Open Source Summer\" activity leads domestic and foreign college students to exercise application and research and development capabilities and accumulate professional experience.",
- "In addition to the above activities, many of our projects are maintained and managed by contributors on a voluntary basis. Many projects in the community not only have direct and close connections with other communities and even upstream projects, but also have a certain reputation in the industry. Over the past few years, many contributors have honed their technical skills and accumulated personal experience by participating in community projects and management, and have fully demonstrated the positive significance of these experiences when employed.",
- "This page introduces the internship projects that the community has participated in in history, and briefly introduces the current manpower shortage and pending projects for the reference of community friends."
- ],
- "p1": "Our company has many projects but few staff. Whether it is a big project or a small project, it is often difficult to implement it due to manpower problems. The following are the projects that are currently to be completed. You are welcome to pass",
- "p2": "Contact us and get your own contribution opportunities from the hero post:",
- "p3": "Since 2020, our contributors have actively participated in the \"Open Source Summer\" activities of the Institute of Software, Chinese Academy of Sciences in the role of mentors, successfully guided many students to complete internship projects, and directly participated in community contributions. The following is a list of projects we have participated in guiding in the past:",
- "ul1": {
- "li": [
- [
- "Antong OS:",
- "Improve RISC-V architecture support and create installation media"
- ],
- [
- "Antong OS:",
- "Create and publish virtual machine (and cloud service) images"
- ],
- [
- "Xingxia OS:",
- "Write maintenance guides and conduct feature planning"
- ],
- [
- "Community Portal:",
- "Implement the \"Support Center\" column (framework construction, content writing and indexing functions, etc.)"
- ],
- [
- "Community Outreach:",
- "Produce guides and user support videos for Bilibili and YouTube platforms"
- ]
- ]
- },
- "ul2": {
- "header": "Summer of Open Source",
- "li": [
- "2024",
- "2024",
- "2024",
- "2023",
- "2023",
- "2023",
- "2022",
- "2022",
- "2021",
- "2021",
- "2021",
- "2021",
- "2021",
- "2020",
- "2020",
- "2020",
- "2020",
- "2020",
- "2020"
- ]
- },
- "summerOfOpenSource": [
- {
- "title": "Free and open source software localization work in Simplified Chinese (mentor: Bai Mingcong)",
- "url": "org/prodetail/24f3e0160"
- },
- {
- "title": "Design and write Antong OS user manual and writing specifications (instructor: Wen Rou)",
- "url": "org/prodetail/24f3e0161"
- },
- {
- "title": "Provide Antong OS system image for RISC-V development board (Instructor: Icenowy Zheng)",
- "url": "org/prodetail/24f3e0162"
- },
- {
- "title": "To implement the DeployKit graphical interface (mentor: Liu Zixing)",
- "url": "2023/org/prodetail/23f3e0031"
- },
- {
- "title": "Free and open source software localization work in Simplified Chinese (mentor: Liu Zixing, student: Liu Wantao)",
- "url": "2023/org/prodetail/23f3e0032"
- },
- {
- "title": "Autobuild 3 automated packaging testing framework (instructor: Huang Xuanning, student: Li Zerui)",
- "url": "2023/org/prodetail/23f3e0033"
- },
- {
- "title": "Allwinner RISC-V chip mainline development work (mentor: Icenowy Zheng, student: Moteen Shah)",
- "url": "2022/#/org/prodetail/22f3e0079"
- },
- {
- "title": "Re-implementation of AOSC’s software package information website (mentor: Liu Zixing, student: Gui Minqiang)",
- "url": "2022/#/org/prodetail/22f3e0080"
- },
- {
- "title": "Quanzhi RISC-V chip mainline development work (mentor: Icenowy Zheng)",
- "url": "2021/#/org/prodetail/210080041"
- },
- {
- "title": "Semi-automatic software package retirement, archiving and organization system (Instructor: Zhang Shunran, student: Li Zongwen)",
- "url": "2021/#/org/prodetail/210080042"
- },
- {
- "title": "Free and open source software localization work in Simplified Chinese (Instructor: Bai Mingcong, student: Gong Jianwei)",
- "url": "2021/#/org/prodetail/210080099"
- },
- {
- "title": "Implementation of the installer DeployKit (Instructor: Liu Zixing)",
- "url": "2021/#/org/prodetail/210080100"
- },
- {
- "title": "LoongArch transplantation of AOSC OS (Instructor: Bai Mingcong, student: Xu Yanqi)",
- "url": "2021/#/org/prodetail/210080299"
- },
- {
- "title": "Semi-automatic software package retirement, archiving and organization system (Instructor: Zhang Shunran, student: Mu Xindong)",
- "url": "2020/#/organisations/aosc"
- },
- {
- "title": "Free and open source software localization work in Simplified Chinese (Instructor: Bai Mingcong, student: Xu Weiyi)",
- "url": "2020/#/organisations/aosc"
- },
- {
- "title": "Release build automation: packaging scheduler (Instructor: Dingyuan Wang)",
- "url": "2020/#/organisations/aosc"
- },
- {
- "title": "Release build automation: automated testing framework (Instructor: Dingyuan Wang)",
- "url": "2020/#/organisations/aosc"
- },
- {
- "title": "Implementation of the installer DeployKit (Instructor: Li Minyong)",
- "url": "2020/#/organisations/aosc"
- },
- {
- "title": "Implement \"Circular Srolling\" for the libinput framework (Instructor: Bai Mingcong)",
- "url": "2020/#/organisations/aosc"
- }
- ]
- }
-}
diff --git a/locales/zh-CN.js b/locales/zh-CN.js
index 2dedcb14..402b41df 100644
--- a/locales/zh-CN.js
+++ b/locales/zh-CN.js
@@ -1,6 +1,5 @@
import gallery from './zh-cn/json/page/gallery.json';
import allUniversalLink from './zh-cn/json/allUniversalLink.json';
-import internship from './zh-cn/json/page/internship.json';
import l10n from './zh-cn/json/page/l10n.json';
import liblol from './zh-cn/json/page/liblol.json';
import AppSupport from './zh-cn/json/components/AppSupport.json';
@@ -49,7 +48,6 @@ export default {
crowdsourcing,
download,
gallery,
- internship,
l10n,
liblol,
paste,
diff --git a/locales/zh-cn/json/page/internship.json b/locales/zh-cn/json/page/internship.json
deleted file mode 100644
index 614ac663..00000000
--- a/locales/zh-cn/json/page/internship.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
- "index": {
- "navigationTextList": ["英雄帖:待办项目", "实习项目:开源之夏"],
- "title1": "实习资源",
- "ps1": [
- "我社重视围绕开源软件生态协作共进及技能共享:近年来,我社每年还以导师身份安排贡献者参与国内外的开源项目推进活动,如中国科学院软件研究所(下略:中科院软件所)的“开源之夏”活动,带领国内外高校学生锻炼应用和研发能力、积累专业经验。",
- "除上述活动外,我社众多项目均由贡献者志愿参与维护与管理。社区许多项目不仅与其他社区乃至上游项目有直接及密切的联系,在行业内亦有一定知名度。过去数年中,许多贡献者通过参与社区项目和管理锻炼了技术能力、积累了个人经验,在就业时亦充分证明了这些经验的积极意义。",
- "本页面介绍社区历史上参与的实习项目,并对当前人力紧迫和待办的项目进行简要介绍,供各位社区好友参考。"
- ],
- "p1": "我社项目繁多但人员稀少,天马行空的大坑也好,细处着手的小事也罢,常常因为人力问题难以得到实施。如下是眼下有待完成的项目,欢迎您通过",
- "p2": "与我们联系,从英雄帖拿下属于您的立功机会:",
- "p3": "自 2020 年起,我社贡献者以导师的角色积极参与中科院软件所的“开源之夏”活动,成功指导多名学生完成实习项目,直接参与到社区的贡献中来。如下是我们过去参与指导的项目列表:",
- "ul1": {
- "li": [
- ["安同 OS:", "改善 RISC-V 架构支持情况并制作安装介质"],
- ["安同 OS:", "制作并发布虚拟机(及云服务)镜像"],
- ["星霞 OS:", "编写维护指南并进行特性规划"],
- [
- "社区门户:",
- "实现“支持中心”栏目(框架搭建、内容编写及索引功能等)"
- ],
- ["社区外宣:", "为 Bilibili 及 YouTube 平台制作指南与用户支持视频"]
- ]
- },
- "ul2": {
- "header": "开源之夏",
- "li": [
- "2024",
- "2024",
- "2024",
- "2023",
- "2023",
- "2023",
- "2022",
- "2022",
- "2021",
- "2021",
- "2021",
- "2021",
- "2021",
- "2020",
- "2020",
- "2020",
- "2020",
- "2020",
- "2020"
- ]
- },
- "summerOfOpenSource": [
- {
- "title": "自由及开源软件简中本地化工作(导师:白铭骢)",
- "url": "org/prodetail/24f3e0160"
- },
- {
- "title": "设计编写安同 OS 用户手册及编写规范(导师:温柔)",
- "url": "org/prodetail/24f3e0161"
- },
- {
- "title": "为 RISC-V 开发板提供安同 OS 系统镜像(导师:Icenowy Zheng)",
- "url": "org/prodetail/24f3e0162"
- },
- {
- "title": "为 实现 DeployKit 图形界面(导师:刘子兴)",
- "url": "2023/org/prodetail/23f3e0031"
- },
- {
- "title": "自由及开源软件简中本地化工作(导师:刘子兴,学生:刘万涛)",
- "url": "2023/org/prodetail/23f3e0032"
- },
- {
- "title": "Autobuild 3 自动化打包测试框架(导师:黄烜宁,学生:李泽睿)",
- "url": "2023/org/prodetail/23f3e0033"
- },
- {
- "title": "全志 RISC-V 芯片主线化开发工作(导师:Icenowy Zheng,学生:Moteen Shah)",
- "url": "2022/#/org/prodetail/22f3e0079"
- },
- {
- "title": "AOSC 的软件包信息站重实现(导师:刘子兴,学生:桂民强)",
- "url": "2022/#/org/prodetail/22f3e0080"
- },
- {
- "title": "全志 RISC-V 芯片主线化开发工作(导师:Icenowy Zheng)",
- "url": "2021/#/org/prodetail/210080041"
- },
- {
- "title": "半自动软件包退休、封存与整理系统(导师:张顺然,学生:李宗汶)",
- "url": "2021/#/org/prodetail/210080042"
- },
- {
- "title": "自由及开源软件简中本地化工作(导师:白铭骢,学生:龚健威)",
- "url": "2021/#/org/prodetail/210080099"
- },
- {
- "title": "安装程序 DeployKit 的实现(导师:刘子兴)",
- "url": "2021/#/org/prodetail/210080100"
- },
- {
- "title": "AOSC OS 的 LoongArch 移植(导师:白铭骢,学生:许彦骐)",
- "url": "2021/#/org/prodetail/210080299"
- },
- {
- "title": "半自动软件包退休、封存与整理系统(导师:张顺然,学生:穆信东)",
- "url": "2020/#/organisations/aosc"
- },
- {
- "title": "自由及开源软件简中本地化工作(导师:白铭骢,学生:徐玮毅)",
- "url": "2020/#/organisations/aosc"
- },
- {
- "title": "发行版构建自动化:打包调度器(导师:Dingyuan Wang)",
- "url": "2020/#/organisations/aosc"
- },
- {
- "title": "发行版构建自动化:自动化测试框架(导师:Dingyuan Wang)",
- "url": "2020/#/organisations/aosc"
- },
- {
- "title": "安装程序 DeployKit 的实现(导师:黎民雍)",
- "url": "2020/#/organisations/aosc"
- },
- {
- "title": "为 libinput 框架实现“划圈滚动 (Circular Srolling)”(导师:白铭骢)",
- "url": "2020/#/organisations/aosc"
- }
- ]
- }
-}
diff --git a/pages/internship/index.vue b/pages/internship/index.vue
index 052f5e57..fff410fb 100644
--- a/pages/internship/index.vue
+++ b/pages/internship/index.vue
@@ -1,83 +1,3 @@
-
-
-
-
-
-
-
-
-
- {{ textValue.p1 }}
-
- {{ textValue.p2 }}
-
-
-
- -
- {{ item[0] }}
- {{ item[1] }}
-
-
-
-
-
-
-
-
{{ textValue.p3 }}
-
-
- -
- {{ textValue.ul2.header + item + ':' }}
-
-
-
-
-
-
+
-
-
From 58149e49a2665d5c17722aa4dec226f77269be41 Mon Sep 17 00:00:00 2001
From: SkyBird233 <52884766+SkyBird233@users.noreply.github.com>
Date: Tue, 5 Aug 2025 00:57:33 +0800
Subject: [PATCH 16/26] feat: replace l10n page with md file
---
content/en/l10n.md | 15 +++++++++++++++
content/zh/l10n.md | 15 +++++++++++++++
locales/en-US.js | 2 --
locales/en-us/json/page/l10n.json | 7 -------
locales/zh-CN.js | 2 --
locales/zh-cn/json/page/l10n.json | 7 -------
pages/l10n/index.vue | 25 +------------------------
7 files changed, 31 insertions(+), 42 deletions(-)
create mode 100644 content/en/l10n.md
create mode 100644 content/zh/l10n.md
delete mode 100644 locales/en-us/json/page/l10n.json
delete mode 100644 locales/zh-cn/json/page/l10n.json
diff --git a/content/en/l10n.md b/content/en/l10n.md
new file mode 100644
index 00000000..45502de9
--- /dev/null
+++ b/content/en/l10n.md
@@ -0,0 +1,15 @@
+---
+title: 软件本地化
+---
+
+作为一个主要由中文母语用户组成的社区,我们非常重视软件界面和使用习惯的本地化 (L10n) 工作。社区成立多年以来,我社在重视项目界面及文书本地化的同时,长期投身于如 GNOME、KDE、CUPS 和 Wine 等上游项目的本地化工作,改善各类软件面向简体中文的使用体验。
+
+在推动这些工作的同时,我们还肩负起了《大陆简中自由软件本地化工作指南》这一本地化工作规范文档的编辑维护工作,指引各路同仁正确、高效地推进本地化工作。此外,自 2020 年开始,我们还通过中科院软件所“开源之夏”发布本地化工作的实习项目,吸引各路新人参与到我社的本地化工作中。
+
+[支持文档](#support) | [社区 Weblate 平台](https://weblate.aosc.io/)
+
+::h2{id="support"}
+支持文档
+::
+
+- [《大陆简中自由软件本地化工作指南》1.5.4 版](https://repo.aosc.io/aosc-l10n/zh_CN_l10n_1.5.4.pdf)
diff --git a/content/zh/l10n.md b/content/zh/l10n.md
new file mode 100644
index 00000000..45502de9
--- /dev/null
+++ b/content/zh/l10n.md
@@ -0,0 +1,15 @@
+---
+title: 软件本地化
+---
+
+作为一个主要由中文母语用户组成的社区,我们非常重视软件界面和使用习惯的本地化 (L10n) 工作。社区成立多年以来,我社在重视项目界面及文书本地化的同时,长期投身于如 GNOME、KDE、CUPS 和 Wine 等上游项目的本地化工作,改善各类软件面向简体中文的使用体验。
+
+在推动这些工作的同时,我们还肩负起了《大陆简中自由软件本地化工作指南》这一本地化工作规范文档的编辑维护工作,指引各路同仁正确、高效地推进本地化工作。此外,自 2020 年开始,我们还通过中科院软件所“开源之夏”发布本地化工作的实习项目,吸引各路新人参与到我社的本地化工作中。
+
+[支持文档](#support) | [社区 Weblate 平台](https://weblate.aosc.io/)
+
+::h2{id="support"}
+支持文档
+::
+
+- [《大陆简中自由软件本地化工作指南》1.5.4 版](https://repo.aosc.io/aosc-l10n/zh_CN_l10n_1.5.4.pdf)
diff --git a/locales/en-US.js b/locales/en-US.js
index c66967ea..6a5c74c8 100644
--- a/locales/en-US.js
+++ b/locales/en-US.js
@@ -1,6 +1,5 @@
import gallery from './en-us/json/page/gallery.json';
import allUniversalLink from './en-us/json/allUniversalLink.json';
-import l10n from './en-us/json/page/l10n.json';
import liblol from './en-us/json/page/liblol.json';
import AppSupport from './en-us/json/components/AppSupport.json';
import mascot from './en-us/json/page/mascot.json';
@@ -48,7 +47,6 @@ export default {
crowdsourcing,
download,
gallery,
- l10n,
liblol,
paste,
seo
diff --git a/locales/en-us/json/page/l10n.json b/locales/en-us/json/page/l10n.json
deleted file mode 100644
index 43416b16..00000000
--- a/locales/en-us/json/page/l10n.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "index": {
- "p1": "As a community mainly composed of native Chinese users, we attach great importance to the localization (L10n) of the software interface and usage habits. Since the establishment of the community many years ago, our community has attached great importance to the localization of project interfaces and documents. At the same time, it has long been engaged in the localization work of upstream projects such as GNOME, KDE, CUPS, and Wine to improve the use experience of various software for Simplified Chinese.",
- "p2": "While promoting these tasks, we are also responsible for editing and maintaining the localization work specification document \"Mainland Simplified Chinese Free Software Localization Work Guide\" to guide colleagues from all walks of life to promote localization work correctly and efficiently. In addition, starting in 2020, we have also released internship projects for localization work through the \"Open Source Summer\" of the Institute of Software of the Chinese Academy of Sciences, attracting new people from all walks of life to participate in our company's localization work.",
- "title1": "Software localization"
- }
-}
diff --git a/locales/zh-CN.js b/locales/zh-CN.js
index 402b41df..0aaca2da 100644
--- a/locales/zh-CN.js
+++ b/locales/zh-CN.js
@@ -1,6 +1,5 @@
import gallery from './zh-cn/json/page/gallery.json';
import allUniversalLink from './zh-cn/json/allUniversalLink.json';
-import l10n from './zh-cn/json/page/l10n.json';
import liblol from './zh-cn/json/page/liblol.json';
import AppSupport from './zh-cn/json/components/AppSupport.json';
import mascot from './zh-cn/json/page/mascot.json';
@@ -48,7 +47,6 @@ export default {
crowdsourcing,
download,
gallery,
- l10n,
liblol,
paste,
seo
diff --git a/locales/zh-cn/json/page/l10n.json b/locales/zh-cn/json/page/l10n.json
deleted file mode 100644
index cbebac8d..00000000
--- a/locales/zh-cn/json/page/l10n.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "index": {
- "p1": "作为一个主要由中文母语用户组成的社区,我们非常重视软件界面和使用习惯的本地化 (L10n) 工作。社区成立多年以来,我社在重视项目界面及文书本地化的同时,长期投身于如 GNOME、KDE、CUPS 和 Wine 等上游项目的本地化工作,改善各类软件面向简体中文的使用体验。",
- "p2": "在推动这些工作的同时,我们还肩负起了《大陆简中自由软件本地化工作指南》这一本地化工作规范文档的编辑维护工作,指引各路同仁正确、高效地推进本地化工作。此外,自 2020 年开始,我们还通过中科院软件所“开源之夏”发布本地化工作的实习项目,吸引各路新人参与到我社的本地化工作中。",
- "title1": "软件本地化"
- }
-}
diff --git a/pages/l10n/index.vue b/pages/l10n/index.vue
index 7acb909f..fff410fb 100644
--- a/pages/l10n/index.vue
+++ b/pages/l10n/index.vue
@@ -1,26 +1,3 @@
-
-
-
-
-
-
{{ textValue.p1 }}
-
{{ textValue.p2 }}
-
-
-
-
-
+
-
-
From d03360ff2dc15dfd8999eb3cca507ab007463cf1 Mon Sep 17 00:00:00 2001
From: SkyBird233 <52884766+SkyBird233@users.noreply.github.com>
Date: Tue, 5 Aug 2025 01:02:24 +0800
Subject: [PATCH 17/26] feat: replace liblol page with md file
---
content/en/liblol.md | 22 +++++++++++++++
content/zh/liblol.md | 22 +++++++++++++++
locales/en-US.js | 2 --
locales/en-us/json/page/liblol.json | 7 -----
locales/zh-CN.js | 2 --
locales/zh-cn/json/page/liblol.json | 7 -----
pages/liblol/index.vue | 43 +----------------------------
7 files changed, 45 insertions(+), 60 deletions(-)
create mode 100644 content/en/liblol.md
create mode 100644 content/zh/liblol.md
delete mode 100644 locales/en-us/json/page/liblol.json
delete mode 100644 locales/zh-cn/json/page/liblol.json
diff --git a/content/en/liblol.md b/content/en/liblol.md
new file mode 100644
index 00000000..5c78ed8d
--- /dev/null
+++ b/content/en/liblol.md
@@ -0,0 +1,22 @@
+---
+title: libLoL 兼容层
+---
+
+libLoL (LoongArch on LoongArch) 是一款用于提供旧世界 ABI 兼容性的运行时。旧世界 ABI 常用于为龙芯提供的 Loongnix 参考发行版和统信 UOS 设计的商业软件,如腾讯 QQ Linux 版、金山 WPS for Linux 和龙芯浏览器等。由于这些应用程序尚未移植到新世界 ABI 上,本运行时旨在为新世界发行版用户提供运行上述应用程序的便利。
+
+安装 libLoL 后,您可以直接安装运行旧世界 ABI 应用程序。
+
+[项目主页](https://liblol.aosc.io/) | [安装指南](https://liblol.aosc.io/docs/usage/) | [兼容性数据库](https://liblol.aosc.io/docs/apps/) | [支持文档](#support)
+
+
+
+::h2{id="support"}
+支持文档
+::
+
+- [关于“新世界”与“旧世界”](https://areweloongyet.com/docs/old-and-new-worlds/)
+- [应用程序兼容性数据库](https://liblol.aosc.io/docs/apps/)
+- [常见问题解答](https://liblol.aosc.io/docs/faq/)
+- [更新日志](https://liblol.aosc.io/docs/dev/changelog/)
+- [打包注意事项](https://liblol.aosc.io/docs/dev/packaging/)
+- [实现原理](https://liblol.aosc.io/docs/dev/design/)
diff --git a/content/zh/liblol.md b/content/zh/liblol.md
new file mode 100644
index 00000000..5c78ed8d
--- /dev/null
+++ b/content/zh/liblol.md
@@ -0,0 +1,22 @@
+---
+title: libLoL 兼容层
+---
+
+libLoL (LoongArch on LoongArch) 是一款用于提供旧世界 ABI 兼容性的运行时。旧世界 ABI 常用于为龙芯提供的 Loongnix 参考发行版和统信 UOS 设计的商业软件,如腾讯 QQ Linux 版、金山 WPS for Linux 和龙芯浏览器等。由于这些应用程序尚未移植到新世界 ABI 上,本运行时旨在为新世界发行版用户提供运行上述应用程序的便利。
+
+安装 libLoL 后,您可以直接安装运行旧世界 ABI 应用程序。
+
+[项目主页](https://liblol.aosc.io/) | [安装指南](https://liblol.aosc.io/docs/usage/) | [兼容性数据库](https://liblol.aosc.io/docs/apps/) | [支持文档](#support)
+
+
+
+::h2{id="support"}
+支持文档
+::
+
+- [关于“新世界”与“旧世界”](https://areweloongyet.com/docs/old-and-new-worlds/)
+- [应用程序兼容性数据库](https://liblol.aosc.io/docs/apps/)
+- [常见问题解答](https://liblol.aosc.io/docs/faq/)
+- [更新日志](https://liblol.aosc.io/docs/dev/changelog/)
+- [打包注意事项](https://liblol.aosc.io/docs/dev/packaging/)
+- [实现原理](https://liblol.aosc.io/docs/dev/design/)
diff --git a/locales/en-US.js b/locales/en-US.js
index 6a5c74c8..9d442969 100644
--- a/locales/en-US.js
+++ b/locales/en-US.js
@@ -1,6 +1,5 @@
import gallery from './en-us/json/page/gallery.json';
import allUniversalLink from './en-us/json/allUniversalLink.json';
-import liblol from './en-us/json/page/liblol.json';
import AppSupport from './en-us/json/components/AppSupport.json';
import mascot from './en-us/json/page/mascot.json';
import news from './en-us/json/page/news.json';
@@ -47,7 +46,6 @@ export default {
crowdsourcing,
download,
gallery,
- liblol,
paste,
seo
};
diff --git a/locales/en-us/json/page/liblol.json b/locales/en-us/json/page/liblol.json
deleted file mode 100644
index 447dbe13..00000000
--- a/locales/en-us/json/page/liblol.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "index": {
- "p1": "libLoL (LoongArch on LoongArch) is a runtime designed to provide old world ABI compatibility. The old world ABI is often used in commercial software designed for the Loongnix reference distribution provided by Loongson and Unison UOS, such as Tencent QQ Linux version, Kingsoft WPS for Linux and Loongson browser. Since these applications have not yet been ported to the New World ABI, this runtime is intended to provide users of the New World distribution with the convenience of running the above applications.",
- "p2": "After installing libLoL, you can install and run old-world ABI applications directly.",
- "title1": "libLoL compatibility layer"
- }
-}
diff --git a/locales/zh-CN.js b/locales/zh-CN.js
index 0aaca2da..b0df3164 100644
--- a/locales/zh-CN.js
+++ b/locales/zh-CN.js
@@ -1,6 +1,5 @@
import gallery from './zh-cn/json/page/gallery.json';
import allUniversalLink from './zh-cn/json/allUniversalLink.json';
-import liblol from './zh-cn/json/page/liblol.json';
import AppSupport from './zh-cn/json/components/AppSupport.json';
import mascot from './zh-cn/json/page/mascot.json';
import news from './zh-cn/json/page/news.json';
@@ -47,7 +46,6 @@ export default {
crowdsourcing,
download,
gallery,
- liblol,
paste,
seo
};
diff --git a/locales/zh-cn/json/page/liblol.json b/locales/zh-cn/json/page/liblol.json
deleted file mode 100644
index 58729f79..00000000
--- a/locales/zh-cn/json/page/liblol.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "index": {
- "p1": "libLoL (LoongArch on LoongArch) 是一款用于提供旧世界 ABI 兼容性的运行时。旧世界 ABI 常用于为龙芯提供的 Loongnix 参考发行版和统信 UOS 设计的商业软件,如腾讯 QQ Linux 版、金山 WPS for Linux 和龙芯浏览器等。由于这些应用程序尚未移植到新世界 ABI 上,本运行时旨在为新世界发行版用户提供运行上述应用程序的便利。",
- "p2": "安装 libLoL 后,您可以直接安装运行旧世界 ABI 应用程序。",
- "title1": "libLoL 兼容层"
- }
-}
diff --git a/pages/liblol/index.vue b/pages/liblol/index.vue
index f8efe8c3..fff410fb 100644
--- a/pages/liblol/index.vue
+++ b/pages/liblol/index.vue
@@ -1,44 +1,3 @@
-
-
-
-
-
-
{{ textValue.p1 }}
-
{{ textValue.p2 }}
-
-
-

-
-
-
-
-
+
-
-
-./components/Header.vue
From 3d275eb2716e0aa6a8437b84301982a832542ee7 Mon Sep 17 00:00:00 2001
From: SkyBird233 <52884766+SkyBird233@users.noreply.github.com>
Date: Tue, 5 Aug 2025 01:08:26 +0800
Subject: [PATCH 18/26] feat: replace oma page with md file
---
content/en/oma.md | 16 ++++++++++++
content/zh/oma.md | 16 ++++++++++++
locales/en-US.js | 2 --
locales/en-us/json/page/oma.json | 35 --------------------------
locales/zh-CN.js | 2 --
locales/zh-cn/json/page/oma.json | 35 --------------------------
pages/oma/index.vue | 43 +-------------------------------
7 files changed, 33 insertions(+), 116 deletions(-)
create mode 100644 content/en/oma.md
create mode 100644 content/zh/oma.md
delete mode 100644 locales/en-us/json/page/oma.json
delete mode 100644 locales/zh-cn/json/page/oma.json
diff --git a/content/en/oma.md b/content/en/oma.md
new file mode 100644
index 00000000..d529f21c
--- /dev/null
+++ b/content/en/oma.md
@@ -0,0 +1,16 @@
+---
+title: 小熊猫包管理 (oma)
+---
+
+小熊猫包管理 (oma) 是一款为使用 [dpkg](https://wiki.debian.org/Teams/Dpkg) 的发行版设计的软件包管理前端,也是[安同 OS](/aosc-os) 的默认包管理界面。小熊猫包管理的主要设计目标有:
+
+- **改良 APT 界面**:兼容 dpkg 发行版常用的 APT 包管理工具的同时,让界面指引、报错及操作逻辑更为简洁易懂
+- **增强防呆机制**:通过清晰的指引和操作撤销等机制,助您避免因粗心或其他原因造成系统故障,进而浪费时间和精力
+- **优化网络性能**:使用 HTTP/2 和多线程下载等技术,大幅度加快软件包安装与更新
+- **提升使用效率**:结合 CLI(命令行)和 TUI(终端窗体)界面,让您的系统管理体验更轻松明晰
+- **集成系统功能**:与安同 OS 的测试源和镜像源数据等机制集成,提供一站式的系统组件管理体验
+- **兼容主流系统**:支持 Debian、Ubuntu 和 deepin 等主流 dpkg 发行版,让软件包管理更易用
+
+[代码仓库](https://github.com/AOSC-Dev/oma) | [下载 oma](/download#oma-download)
+
+
diff --git a/content/zh/oma.md b/content/zh/oma.md
new file mode 100644
index 00000000..d529f21c
--- /dev/null
+++ b/content/zh/oma.md
@@ -0,0 +1,16 @@
+---
+title: 小熊猫包管理 (oma)
+---
+
+小熊猫包管理 (oma) 是一款为使用 [dpkg](https://wiki.debian.org/Teams/Dpkg) 的发行版设计的软件包管理前端,也是[安同 OS](/aosc-os) 的默认包管理界面。小熊猫包管理的主要设计目标有:
+
+- **改良 APT 界面**:兼容 dpkg 发行版常用的 APT 包管理工具的同时,让界面指引、报错及操作逻辑更为简洁易懂
+- **增强防呆机制**:通过清晰的指引和操作撤销等机制,助您避免因粗心或其他原因造成系统故障,进而浪费时间和精力
+- **优化网络性能**:使用 HTTP/2 和多线程下载等技术,大幅度加快软件包安装与更新
+- **提升使用效率**:结合 CLI(命令行)和 TUI(终端窗体)界面,让您的系统管理体验更轻松明晰
+- **集成系统功能**:与安同 OS 的测试源和镜像源数据等机制集成,提供一站式的系统组件管理体验
+- **兼容主流系统**:支持 Debian、Ubuntu 和 deepin 等主流 dpkg 发行版,让软件包管理更易用
+
+[代码仓库](https://github.com/AOSC-Dev/oma) | [下载 oma](/download#oma-download)
+
+
diff --git a/locales/en-US.js b/locales/en-US.js
index 9d442969..9664ff45 100644
--- a/locales/en-US.js
+++ b/locales/en-US.js
@@ -3,7 +3,6 @@ import allUniversalLink from './en-us/json/allUniversalLink.json';
import AppSupport from './en-us/json/components/AppSupport.json';
import mascot from './en-us/json/page/mascot.json';
import news from './en-us/json/page/news.json';
-import oma from './en-us/json/page/oma.json';
import sponsors from './en-us/json/page/sponsors.json';
import BarFooter from './en-us/json/components/BarFooter.json';
import BarHeader from './en-us/json/components/BarHeader.json';
@@ -37,7 +36,6 @@ export default {
sponsors,
mascot,
news,
- oma,
BarFooter,
BarHeader,
BarLeft,
diff --git a/locales/en-us/json/page/oma.json b/locales/en-us/json/page/oma.json
deleted file mode 100644
index 64428357..00000000
--- a/locales/en-us/json/page/oma.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "index": {
- "title1": "Red Panda Package Management (oma)",
- "p1": "Red Panda Package Management (oma) is a package for using",
- "p2": "The default package management interface. The main design goals of Red Panda package management are:",
- "ul1": {
- "li": [
- [
- "Improved APT interface:",
- "While being compatible with the APT package management tool commonly used in dpkg distributions, it also makes interface guidance, error reporting and operation logic simpler and easier to understand."
- ],
- [
- "Enhance anti-fool mechanism:",
- "Through clear guidance and operation undoing mechanisms, we help you avoid system failures caused by carelessness or other reasons, thus wasting time and energy."
- ],
- [
- "Optimize network performance:",
- "Dramatically speed up package installation and updates using technologies such as HTTP/2 and multi-threaded downloads"
- ],
- [
- "Improve usage efficiency:",
- "Combined CLI (Command Line) and TUI (Terminal Window) interfaces make your system management experience easier and clearer"
- ],
- [
- "Integrated system features:",
- "Integrate with Antong OS's test source and mirror source data mechanisms to provide a one-stop system component management experience"
- ],
- [
- "Compatible with mainstream systems:",
- "Supports mainstream dpkg distributions such as Debian, Ubuntu and deepin, making software package management easier to use"
- ]
- ]
- }
- }
-}
diff --git a/locales/zh-CN.js b/locales/zh-CN.js
index b0df3164..6caa11bb 100644
--- a/locales/zh-CN.js
+++ b/locales/zh-CN.js
@@ -3,7 +3,6 @@ import allUniversalLink from './zh-cn/json/allUniversalLink.json';
import AppSupport from './zh-cn/json/components/AppSupport.json';
import mascot from './zh-cn/json/page/mascot.json';
import news from './zh-cn/json/page/news.json';
-import oma from './zh-cn/json/page/oma.json';
import sponsors from './zh-cn/json/page/sponsors.json';
import BarFooter from './zh-cn/json/components/BarFooter.json';
import BarHeader from './zh-cn/json/components/BarHeader.json';
@@ -37,7 +36,6 @@ export default {
sponsors,
mascot,
news,
- oma,
BarFooter,
BarHeader,
BarLeft,
diff --git a/locales/zh-cn/json/page/oma.json b/locales/zh-cn/json/page/oma.json
deleted file mode 100644
index 0febcb42..00000000
--- a/locales/zh-cn/json/page/oma.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "index": {
- "title1": "小熊猫包管理 (oma)",
- "p1": "小熊猫包管理 (oma) 是一款为使用",
- "p2": "的默认包管理界面。小熊猫包管理的主要设计目标有:",
- "ul1": {
- "li": [
- [
- "改良 APT 界面:",
- "兼容 dpkg 发行版常用的 APT 包管理工具的同时,让界面指引、报错及操作逻辑更为简洁易懂"
- ],
- [
- "增强防呆机制:",
- "通过清晰的指引和操作撤销等机制,助您避免因粗心或其他原因造成系统故障,进而浪费时间和精力"
- ],
- [
- "优化网络性能:",
- "使用 HTTP/2 和多线程下载等技术,大幅度加快软件包安装与更新"
- ],
- [
- "提升使用效率:",
- "结合 CLI(命令行)和 TUI(终端窗体)界面,让您的系统管理体验更轻松明晰"
- ],
- [
- "集成系统功能:",
- "与安同 OS 的测试源和镜像源数据等机制集成,提供一站式的系统组件管理体验"
- ],
- [
- "兼容主流系统:",
- "支持 Debian、Ubuntu 和 deepin 等主流 dpkg 发行版,让软件包管理更易用"
- ]
- ]
- }
- }
-}
diff --git a/pages/oma/index.vue b/pages/oma/index.vue
index e11d5a7e..fff410fb 100644
--- a/pages/oma/index.vue
+++ b/pages/oma/index.vue
@@ -1,44 +1,3 @@
-
-
-
-
-
-
- {{ textValue.p1 }}
-
- {{ textValue.p2 }}
-
-
-
- -
- {{ item[0] }}
- {{ item[1] }}
-
-
-
-
-
-

-
-
-
+
-
-
-./components/Header.vue
From a0641b108497130699e866e09cc7d3daf3eab427 Mon Sep 17 00:00:00 2001
From: SkyBird233 <52884766+SkyBird233@users.noreply.github.com>
Date: Mon, 11 Aug 2025 11:34:30 +0800
Subject: [PATCH 19/26] fix: strange anchor behavior in Chrome
---
app/router.options.ts | 2 +-
components/content/ProseH2.vue | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/router.options.ts b/app/router.options.ts
index 274122d2..b8e396ae 100644
--- a/app/router.options.ts
+++ b/app/router.options.ts
@@ -4,6 +4,6 @@ import { useScrollStore } from '~/stores/scroll';
export default
{
scrollBehavior(to, _from, savedPosition) {
if (savedPosition) return savedPosition;
- if (to.hash) useScrollStore().scrollOrSet(to.hash);
+ else if (to.hash) useScrollStore().scrollOrSet(to.hash);
}
};
diff --git a/components/content/ProseH2.vue b/components/content/ProseH2.vue
index bbc09033..ecc39c43 100644
--- a/components/content/ProseH2.vue
+++ b/components/content/ProseH2.vue
@@ -1,11 +1,11 @@
-
-
+
@@ -17,4 +17,4 @@ const props = defineProps<{ id?: string }>()
const { headings } = useRuntimeConfig().public.mdc
const generate = computed(() => props.id && ((typeof headings?.anchorLinks === 'boolean' && headings?.anchorLinks === true) || (typeof headings?.anchorLinks === 'object' && headings?.anchorLinks?.h2)))
-
\ No newline at end of file
+
From 831757da89e5b7a5d17019d02d8554e13ea8d7a3 Mon Sep 17 00:00:00 2001
From: hrh
Date: Mon, 11 Aug 2025 15:19:00 +0800
Subject: [PATCH 20/26] =?UTF-8?q?chore:=20=E6=B8=85=E7=90=86=E8=BF=87?=
=?UTF-8?q?=E6=97=B6=E7=9A=84=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/app/AppSupport.vue | 38 -------------------
locales/en-US.js | 2 -
locales/en-us/json/components/AppSupport.json | 3 --
locales/zh-CN.js | 2 -
locales/zh-cn/json/components/AppSupport.json | 3 --
5 files changed, 48 deletions(-)
delete mode 100644 components/app/AppSupport.vue
delete mode 100644 locales/en-us/json/components/AppSupport.json
delete mode 100644 locales/zh-cn/json/components/AppSupport.json
diff --git a/components/app/AppSupport.vue b/components/app/AppSupport.vue
deleted file mode 100644
index 341fc968..00000000
--- a/components/app/AppSupport.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/locales/en-US.js b/locales/en-US.js
index 9664ff45..d0250e4b 100644
--- a/locales/en-US.js
+++ b/locales/en-US.js
@@ -1,6 +1,5 @@
import gallery from './en-us/json/page/gallery.json';
import allUniversalLink from './en-us/json/allUniversalLink.json';
-import AppSupport from './en-us/json/components/AppSupport.json';
import mascot from './en-us/json/page/mascot.json';
import news from './en-us/json/page/news.json';
import sponsors from './en-us/json/page/sponsors.json';
@@ -32,7 +31,6 @@ export default {
allUniversalLink,
CopyButton,
NewsCategoryList,
- AppSupport,
sponsors,
mascot,
news,
diff --git a/locales/en-us/json/components/AppSupport.json b/locales/en-us/json/components/AppSupport.json
deleted file mode 100644
index 28c5445b..00000000
--- a/locales/en-us/json/components/AppSupport.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "title1": "Support documentation"
-}
diff --git a/locales/zh-CN.js b/locales/zh-CN.js
index 6caa11bb..aad7237e 100644
--- a/locales/zh-CN.js
+++ b/locales/zh-CN.js
@@ -1,6 +1,5 @@
import gallery from './zh-cn/json/page/gallery.json';
import allUniversalLink from './zh-cn/json/allUniversalLink.json';
-import AppSupport from './zh-cn/json/components/AppSupport.json';
import mascot from './zh-cn/json/page/mascot.json';
import news from './zh-cn/json/page/news.json';
import sponsors from './zh-cn/json/page/sponsors.json';
@@ -32,7 +31,6 @@ export default {
allUniversalLink,
NewsCategoryList,
CopyButton,
- AppSupport,
sponsors,
mascot,
news,
diff --git a/locales/zh-cn/json/components/AppSupport.json b/locales/zh-cn/json/components/AppSupport.json
deleted file mode 100644
index 74726fd7..00000000
--- a/locales/zh-cn/json/components/AppSupport.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "title1": "支持文档"
-}
From 0e8d1e0d8b539e96bb8d7a50c66a5fb1c3939396 Mon Sep 17 00:00:00 2001
From: hrh
Date: Thu, 14 Aug 2025 16:52:12 +0800
Subject: [PATCH 21/26] =?UTF-8?q?chore:=20=E6=B8=85=E7=90=86=E6=97=A0?=
=?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
utils/utils.js | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/utils/utils.js b/utils/utils.js
index 4319aa6d..1b6882ee 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -1,19 +1,5 @@
import axios from 'axios';
-export function getImgUrl(url) {
- return new URL(`${url}`, import.meta.url).href;
-}
-
-export function toOutUrl(url) {
- window.open(url);
-}
-
-export const title = '安同开源社区 (AOSC)';
-
-export function setTitle(titlePre) {
- document.title = titlePre + ' | ' + title;
-}
-
export const requestGetJson = (() => {
let keys = {};
let promise = {};
@@ -86,10 +72,6 @@ export const requestPostJson = (() => {
};
})();
-export const setBackgroundColor = (color) => {
- return 'bg-[' + color + ']';
-};
-
export const BToMB = (byteSize, fixed = 3) => {
return (byteSize / 1024 / 1024).toFixed(fixed);
};
From 0b84738870e11e93ec1283d3dd8ed707c8faaed0 Mon Sep 17 00:00:00 2001
From: hrh
Date: Thu, 14 Aug 2025 17:18:52 +0800
Subject: [PATCH 22/26] =?UTF-8?q?chore:=20=E7=BB=9F=E4=B8=80=20md=20?=
=?UTF-8?q?=E7=94=9F=E6=88=90=E9=A1=B5=E9=9D=A2=E8=B7=AF=E7=94=B1=E5=85=A5?=
=?UTF-8?q?=E5=8F=A3=E5=B9=B6=E6=B8=85=E7=90=86=E6=97=A0=E7=94=A8=E6=96=87?=
=?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/CommonContent.vue | 1 +
pages/{afterglow/index.vue => [...slug].vue} | 0
pages/about/index.vue | 3 ---
pages/afterglow/isa.vue | 3 ---
pages/afterglow/relnote.vue | 3 ---
pages/afterglow/requirements.vue | 3 ---
pages/aosc-os/asahi/relnote.vue | 3 ---
pages/aosc-os/index.vue | 3 ---
pages/aosc-os/isa.vue | 3 ---
pages/aosc-os/livekit/relnote.vue | 3 ---
pages/aosc-os/livekit/requirements.vue | 3 ---
pages/aosc-os/relnote/index.vue | 3 ---
pages/aosc-os/requirements.vue | 3 ---
pages/aosc-os/right-for-me/index.vue | 3 ---
pages/aosc-os/wsl/relnote.vue | 3 ---
pages/aosc-os/wsl/requirements.vue | 3 ---
pages/aoscc/[slug].vue | 3 ---
pages/contact/index.vue | 3 ---
pages/crowdsourcing/[slug].vue | 3 ---
pages/events/index.vue | 3 ---
pages/guidelines/index.vue | 3 ---
pages/internship/index.vue | 3 ---
pages/l10n/index.vue | 3 ---
pages/liblol/index.vue | 3 ---
pages/news/[slug].vue | 3 ---
pages/oma/index.vue | 3 ---
26 files changed, 1 insertion(+), 72 deletions(-)
rename pages/{afterglow/index.vue => [...slug].vue} (100%)
delete mode 100644 pages/about/index.vue
delete mode 100644 pages/afterglow/isa.vue
delete mode 100644 pages/afterglow/relnote.vue
delete mode 100644 pages/afterglow/requirements.vue
delete mode 100644 pages/aosc-os/asahi/relnote.vue
delete mode 100644 pages/aosc-os/index.vue
delete mode 100644 pages/aosc-os/isa.vue
delete mode 100644 pages/aosc-os/livekit/relnote.vue
delete mode 100644 pages/aosc-os/livekit/requirements.vue
delete mode 100644 pages/aosc-os/relnote/index.vue
delete mode 100644 pages/aosc-os/requirements.vue
delete mode 100644 pages/aosc-os/right-for-me/index.vue
delete mode 100644 pages/aosc-os/wsl/relnote.vue
delete mode 100644 pages/aosc-os/wsl/requirements.vue
delete mode 100644 pages/aoscc/[slug].vue
delete mode 100644 pages/contact/index.vue
delete mode 100644 pages/crowdsourcing/[slug].vue
delete mode 100644 pages/events/index.vue
delete mode 100644 pages/guidelines/index.vue
delete mode 100644 pages/internship/index.vue
delete mode 100644 pages/l10n/index.vue
delete mode 100644 pages/liblol/index.vue
delete mode 100644 pages/news/[slug].vue
delete mode 100644 pages/oma/index.vue
diff --git a/components/CommonContent.vue b/components/CommonContent.vue
index 735075cc..55f24d35 100644
--- a/components/CommonContent.vue
+++ b/components/CommonContent.vue
@@ -8,6 +8,7 @@ const { locale } = useI18n();
const scrollStore = useScrollStore();
const contentRef = useTemplateRef('contentRef');
+
const contentPath = computed(() => {
if (props.path) return props.path;
diff --git a/pages/afterglow/index.vue b/pages/[...slug].vue
similarity index 100%
rename from pages/afterglow/index.vue
rename to pages/[...slug].vue
diff --git a/pages/about/index.vue b/pages/about/index.vue
deleted file mode 100644
index 106acbf8..00000000
--- a/pages/about/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/pages/afterglow/isa.vue b/pages/afterglow/isa.vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/afterglow/isa.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/afterglow/relnote.vue b/pages/afterglow/relnote.vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/afterglow/relnote.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/afterglow/requirements.vue b/pages/afterglow/requirements.vue
deleted file mode 100644
index 106acbf8..00000000
--- a/pages/afterglow/requirements.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/pages/aosc-os/asahi/relnote.vue b/pages/aosc-os/asahi/relnote.vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/aosc-os/asahi/relnote.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/aosc-os/index.vue b/pages/aosc-os/index.vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/aosc-os/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/aosc-os/isa.vue b/pages/aosc-os/isa.vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/aosc-os/isa.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/aosc-os/livekit/relnote.vue b/pages/aosc-os/livekit/relnote.vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/aosc-os/livekit/relnote.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/aosc-os/livekit/requirements.vue b/pages/aosc-os/livekit/requirements.vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/aosc-os/livekit/requirements.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/aosc-os/relnote/index.vue b/pages/aosc-os/relnote/index.vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/aosc-os/relnote/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/aosc-os/requirements.vue b/pages/aosc-os/requirements.vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/aosc-os/requirements.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/aosc-os/right-for-me/index.vue b/pages/aosc-os/right-for-me/index.vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/aosc-os/right-for-me/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/aosc-os/wsl/relnote.vue b/pages/aosc-os/wsl/relnote.vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/aosc-os/wsl/relnote.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/aosc-os/wsl/requirements.vue b/pages/aosc-os/wsl/requirements.vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/aosc-os/wsl/requirements.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/aoscc/[slug].vue b/pages/aoscc/[slug].vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/aoscc/[slug].vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/contact/index.vue b/pages/contact/index.vue
deleted file mode 100644
index 106acbf8..00000000
--- a/pages/contact/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/pages/crowdsourcing/[slug].vue b/pages/crowdsourcing/[slug].vue
deleted file mode 100644
index 106acbf8..00000000
--- a/pages/crowdsourcing/[slug].vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/pages/events/index.vue b/pages/events/index.vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/events/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/guidelines/index.vue b/pages/guidelines/index.vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/guidelines/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/internship/index.vue b/pages/internship/index.vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/internship/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/l10n/index.vue b/pages/l10n/index.vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/l10n/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/liblol/index.vue b/pages/liblol/index.vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/liblol/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/news/[slug].vue b/pages/news/[slug].vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/news/[slug].vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/pages/oma/index.vue b/pages/oma/index.vue
deleted file mode 100644
index fff410fb..00000000
--- a/pages/oma/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
From 8c776e93e1c768391a9efafd5c23976c5b8bf227 Mon Sep 17 00:00:00 2001
From: hrh
Date: Thu, 14 Aug 2025 19:00:13 +0800
Subject: [PATCH 23/26] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BE=A7?=
=?UTF-8?q?=E6=A0=8F=E8=87=AA=E5=8A=A8=E5=B1=95=E5=BC=80=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/bar/BarLeft.vue | 45 +++++++++++++++++++-------------------
layouts/default.vue | 9 ++++++--
2 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/components/bar/BarLeft.vue b/components/bar/BarLeft.vue
index c85112f0..357aeb5c 100644
--- a/components/bar/BarLeft.vue
+++ b/components/bar/BarLeft.vue
@@ -61,6 +61,7 @@ const openMenuList = new Set();
const menuDivRef = useTemplateRef('menuDiv');
const menuRef = useTemplateRef('menu');
const rowHeight = 32;
+const chunkPading = 6;
const rowHeightpx = `${rowHeight}px`;
const route = useRoute();
@@ -70,24 +71,29 @@ const openMenu = (MenuOpenEvent) => {
(item) => item.title === MenuOpenEvent
);
let height =
- result.children.length * rowHeight + menuDivRef.value.clientHeight;
+ result.children.length * rowHeight +
+ chunkPading +
+ menuDivRef.value.clientHeight;
for (const item of openMenuList) {
if (highlyIsQualified(height)) {
break;
} else {
- height =
- height -
- navigationList.value.find((item1) => item1.title === item).children
- .length *
- rowHeight;
+ height = height - item[1] * rowHeight - chunkPading;
openMenuList.delete(item);
- menuRef.value.close(item);
+ console.log(item[0]);
+ menuRef.value.close(item[0]);
}
}
- openMenuList.add(MenuOpenEvent);
+ openMenuList.add([MenuOpenEvent, result.children.length]);
};
+
const closeMenu = (MenuOpenEvent) => {
- openMenuList.delete(MenuOpenEvent);
+ for (const arr of openMenuList) {
+ if (arr[0] === MenuOpenEvent) {
+ openMenuList.delete(arr);
+ break; // 删除后跳出循环,因为我们只删除第一个
+ }
+ }
};
const highlyIsQualified = (height) => {
@@ -146,17 +152,13 @@ onMounted(() => {
// 初次加载的时候尝试打开当前栏目分类
// 记一下目前所在分类的title
let thisTitle = null;
- let thisColumnIsShow = false;
for (const item of navigationList.value.values()) {
- const resule = item.children.find(
- (item1) => item1.url === route.path.replace(/\/+$/, '')
+ const resule = item.children.find((item1) =>
+ route.path.includes(item1.url)
);
if (resule) {
height = height + item.children.length * rowHeight;
- if (highlyIsQualified(height)) {
- // 记下可以展开,但先不展开,因为要给这个放到队列尾
- thisColumnIsShow = true;
- }
+ // 展开但不进入队列,因为要给这个放到队列尾
thisTitle = item.title;
break;
}
@@ -164,9 +166,9 @@ onMounted(() => {
// 然后在剩余空间里按顺序遍历栏目,能展开尽量展开
for (const item of navigationList.value) {
if (thisTitle !== item.title) {
- height = height + item.children.length * rowHeight;
- if (highlyIsQualified(height)) {
- openMenuList.add(item.title);
+ const cache_h = height + item.children.length * rowHeight + chunkPading;
+ if (highlyIsQualified(cache_h)) {
+ height = cache_h;
menuRef.value.open(item.title);
} else {
break;
@@ -174,8 +176,7 @@ onMounted(() => {
}
}
// 剩余栏目展开完毕,展开当前所在栏目,此时屏幕缩小优先关闭其他栏目
- if (thisColumnIsShow) {
- openMenuList.add(thisTitle);
+ if (thisTitle !== null) {
menuRef.value.open(thisTitle);
}
@@ -196,7 +197,7 @@ const returnFromTop = (() => {
backToTopBtnShow.value = false;
}
timeoutID = undefined;
- }, 20);
+ }, 70);
};
})();
diff --git a/layouts/default.vue b/layouts/default.vue
index 49ef89d4..ca522faa 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -1,8 +1,8 @@
-
+
-
+
@@ -15,3 +15,8 @@
+
From ce62333af89369acdf4df4f1524d263f1dfa0640 Mon Sep 17 00:00:00 2001
From: hrh
Date: Fri, 15 Aug 2025 18:00:40 +0800
Subject: [PATCH 24/26] =?UTF-8?q?fix:=20=E5=AF=BC=E8=88=AA=E6=A0=8F?=
=?UTF-8?q?=E5=88=87=E6=8D=A2=E8=AF=AD=E8=A8=80=E5=90=8E=E8=87=AA=E5=8A=A8?=
=?UTF-8?q?=E6=8A=98=E5=8F=A0=20bug=20=E4=BF=AE=E5=A4=8D=EF=BC=8C=E8=BF=9E?=
=?UTF-8?q?=E7=BB=AD=E7=82=B9=E5=87=BB=E5=B1=95=E5=BC=80=20bug=20=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/bar/BarLeft.vue | 199 +++++++++++++++++++------------------
utils/utils.js | 4 +
2 files changed, 108 insertions(+), 95 deletions(-)
diff --git a/components/bar/BarLeft.vue b/components/bar/BarLeft.vue
index 357aeb5c..6273116c 100644
--- a/components/bar/BarLeft.vue
+++ b/components/bar/BarLeft.vue
@@ -1,61 +1,72 @@
-
+
diff --git a/components/bar/BarLeft.vue b/components/bar/BarLeft.vue
index 6273116c..dd567017 100644
--- a/components/bar/BarLeft.vue
+++ b/components/bar/BarLeft.vue
@@ -1,5 +1,5 @@