Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull text from Citizen Code of Conduct into ours #1287

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Pull text from Citizen Code of Conduct into ours #1287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion locales/en-US/code-of-conduct.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,30 @@ coc-conduct-description =
<li>Please be kind and courteous. There’s no need to be mean or rude.</li>
<li>Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer.</li>
<li>Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works.</li>
<li>We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behavior. We interpret the term “harassment” as including the definition in the <a href="https://github.com/stumpsyn/policies/blob/master/citizen_code_of_conduct.md">Citizen Code of Conduct</a>; if you have any lack of clarity about what might be included in that concept, please read their definition. In particular, we don’t tolerate behavior that excludes people in socially marginalized groups.</li>
<li>We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behavior. We interpret the term “harassment” as described in the section below; if you have any lack of clarity about what might be included in that concept, please read their definition. In particular, we don’t tolerate behavior that excludes people in socially marginalized groups.</li>
<li>Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact one of the channel ops or any of the { $coc-rust-moderation-team-anchor } immediately. Whether you’re a regular contributor or a newcomer, we care about making this community a safe place for you and we’ve got your back.</li>
<li>Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome.</li>
</ul>
coc-conduct-harrassment-heading = Unacceptable Behaviour
coc-conduct-harrassment-description =
<p>The following behaviors are considered harassment and are unacceptable within our community:</p>

<ul>
<li>Violence, threats of violence or violent language directed against another person.</li>
<li>Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.</li>
<li>Posting or displaying sexually explicit or violent material.</li>
<li>Posting or threatening to post other people's personally identifying information ("doxing").</li>
<li>Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.</li>
<li>Inappropriate photography or recording.</li>
<li>Inappropriate physical contact. You should have someone's consent before touching them.</li>
<li>Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.</li>
<li>Deliberate intimidation, stalking or following (online or in person).</li>
<li>Advocating for, or encouraging, any of the above behavior.</li>
<li>Sustained disruption of community events, including talks and presentations.</li>
</ul>
<p><i>Adapted from the <a href="https://github.com/stumpsyn/policies/blob/master/citizen_code_of_conduct.md">Stumptown Syndicate Citizen Code of Conduct</a>.</i></p>


coc-conduct-description-team-anchor-text = Rust moderation team
coc-conduct-email-button = Email The Moderation Team

Expand Down
10 changes: 10 additions & 0 deletions templates/policies/code-of-conduct.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@
<a href="{{baseurl}}/governance/teams/moderation">{{fluent "coc-conduct-description-team-anchor-text"}}</a>
{{/fluentparam}}
{{/fluent}}

<header>
<h3>{{fluent "coc-conduct-harrassment-heading"}}</h2>
<div class="highlight"></div>
</header>
{{#fluent "coc-conduct-harrassement-description"}}
{{#fluentparam "coc-rust-moderation-team-anchor"}}
<a href="{{baseurl}}/governance/teams/moderation">{{fluent "coc-conduct-description-team-anchor-text"}}</a>
{{/fluentparam}}
{{/fluent}}
<p><a class="button button-secondary" href="mailto:rust-mods@rust-lang.org">{{fluent "coc-conduct-email-button"}}</a></p>
</div>
</section>
Expand Down