From d5d43cfd3a47ae5ded34629599446fac884e5b36 Mon Sep 17 00:00:00 2001
From: Florian Gilcher <florian.gilcher@asquera.de>
Date: Wed, 30 Sep 2020 16:35:06 +0200
Subject: [PATCH] Pull text from Citizen Code of Conduct into ours

---
 locales/en-US/code-of-conduct.ftl      | 22 +++++++++++++++++++++-
 templates/policies/code-of-conduct.hbs | 10 ++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/locales/en-US/code-of-conduct.ftl b/locales/en-US/code-of-conduct.ftl
index dbc0f7ada..466c53d88 100644
--- a/locales/en-US/code-of-conduct.ftl
+++ b/locales/en-US/code-of-conduct.ftl
@@ -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
 
diff --git a/templates/policies/code-of-conduct.hbs b/templates/policies/code-of-conduct.hbs
index 5b41c3e2f..6a48a36ff 100644
--- a/templates/policies/code-of-conduct.hbs
+++ b/templates/policies/code-of-conduct.hbs
@@ -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>