From 36b010c1dccb24e57072f7cc82d10f662aff5c0e Mon Sep 17 00:00:00 2001 From: Ray Wang Date: Mon, 30 Nov 2020 19:12:07 +0800 Subject: [PATCH 1/2] Replace English CNCF code of conduct into Chinese one --- content/zh/community/code-of-conduct.md | 2 +- .../community/static/cncf-code-of-conduct.md | 50 +++++++------------ 2 files changed, 18 insertions(+), 34 deletions(-) diff --git a/content/zh/community/code-of-conduct.md b/content/zh/community/code-of-conduct.md index 848c58832e..42450d7e86 100644 --- a/content/zh/community/code-of-conduct.md +++ b/content/zh/community/code-of-conduct.md @@ -24,7 +24,7 @@ If you notice that this is out of date, please file an issue. --> Kubernetes 遵循 -CNCF 行为规范。 +CNCF 行为规范。 CNCF 社区规范文本如下链接 commit 0ce4694。 如果您发现这个 CNCF 社区规范文本已经过时，请 diff --git a/content/zh/community/static/cncf-code-of-conduct.md b/content/zh/community/static/cncf-code-of-conduct.md index 3ee025ba34..f3a0ffbef9 100644 --- a/content/zh/community/static/cncf-code-of-conduct.md +++ b/content/zh/community/static/cncf-code-of-conduct.md @@ -1,46 +1,30 @@ -## CNCF Community Code of Conduct v1.0 +## 云原生计算基金会（CNCF）社区行为准则 1.0 版本 -### Contributor Code of Conduct +### 贡献者行为准则 -As contributors and maintainers of this project, and in the interest of fostering -an open and welcoming community, we pledge to respect all people who contribute -through reporting issues, posting feature requests, updating documentation, -submitting pull requests or patches, and other activities. +作为这个项目的贡献者和维护者，为了建立一个开放和受欢迎的社区，我们保证尊重所有通过报告问题、发布功能请求、更新文档、提交拉取请求或补丁以及其他活动做出贡献的人员。 -We are committed to making participation in this project a harassment-free experience for -everyone, regardless of level of experience, gender, gender identity and expression, -sexual orientation, disability, personal appearance, body size, race, ethnicity, age, -religion, or nationality. +我们致力于让参与此项目的每个人都不受骚扰，无论其经验水平、性别、性别认同和表达、性取向、残疾、个人外貌、体型、人种、种族、年龄、宗教或国籍等。 -Examples of unacceptable behavior by participants include: +不可接受的参与者行为包括： -* The use of sexualized language or imagery -* Personal attacks -* Trolling or insulting/derogatory comments -* Public or private harassment -* Publishing other's private information, such as physical or electronic addresses, - without explicit permission -* Other unethical or unprofessional conduct. +- 使用性语言或图像 +- 人身攻击 +- 挑衅、侮辱或贬低性评论 +- 公开或私下骚扰 +- 未经明确许可，发布他人的私人信息，比如地址或电子邮箱 +- 其他不道德或不专业的行为 -Project maintainers have the right and responsibility to remove, edit, or reject -comments, commits, code, wiki edits, issues, and other contributions that are not -aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers -commit themselves to fairly and consistently applying these principles to every aspect -of managing this project. Project maintainers who do not follow or enforce the Code of -Conduct may be permanently removed from the project team. +项目维护者有权利和责任删除、编辑或拒绝评论、提交、代码、维基编辑、问题和其他不符合本行为准则的贡献。通过采用本行为准则，项目维护者承诺将这些原则公平且一致地应用到这个项目管理的各个方面。不遵守或不执行行为准则的项目维护者可能被永久地从项目团队中移除。 -This code of conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. +当个人代表项目或其社区时，本行为准则适用于项目空间和公共空间。 -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting -the [Kubernetes Code of Conduct Committee](https://github.com/kubernetes/community/tree/master/committee-code-of-conduct) . +如需举报侮辱、骚扰或其他不可接受的行为，您可发送邮件至 联系 [Kubernetes行为守则委员会](https://github.com/kubernetes/community/tree/master/committee-code-of-conduct)。其他事务请联系CNCF项目维护专员，或发送邮件至 联系我们的调解员Mishi Choudhary。 -This Code of Conduct is adapted from the Contributor Covenant -(http://contributor-covenant.org), version 1.2.0, available at -http://contributor-covenant.org/version/1/2/0/ +本行为准则改编自《贡献者契约》（ http://contributor-covenant.org ）1.2.0 版本，可在 http://contributor-covenant.org/version/1/2/0/ 查看。 -### CNCF Events Code of Conduct +### CNCF 活动行为准则 -CNCF events are governed by the Linux Foundation [Code of Conduct](http://events.linuxfoundation.org/events/cloudnativecon/attend/code-of-conduct) available on the event page. This is designed to be compatible with the above policy and also includes more details on responding to incidents. +云原生计算基金会（CNCF）活动受 Linux 基金会《[行为准则](https://events.linuxfoundation.org/code-of-conduct/)》管辖，该行为准则可在活动页面获得。其旨在与上述政策兼容，且包括更多关于事件回应的细节。 \ No newline at end of file From 20fdd094e6742fd54643c7844da1aeffda0a2ef0 Mon Sep 17 00:00:00 2001 From: Ray Wang Date: Mon, 30 Nov 2020 19:24:12 +0800 Subject: [PATCH 2/2] Change URL which suggests where to get the latest code of conduct --- content/zh/community/static/cncf-code-of-conduct.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/zh/community/static/cncf-code-of-conduct.md b/content/zh/community/static/cncf-code-of-conduct.md index f3a0ffbef9..189675848a 100644 --- a/content/zh/community/static/cncf-code-of-conduct.md +++ b/content/zh/community/static/cncf-code-of-conduct.md @@ -1,5 +1,5 @@ + https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/zh.md --> ## 云原生计算基金会（CNCF）社区行为准则 1.0 版本 ### 贡献者行为准则