From 9222ee57a586496b191db0ca75908b26549fc3aa Mon Sep 17 00:00:00 2001
From: Harrison Reid <harrison@twosmalltrees.com>
Date: Thu, 4 Oct 2018 18:44:26 +1000
Subject: [PATCH 1/3] Update text and description in moderation configure view

Rename include_comment_stream to code_of_conduct_summary, update text.
Rename include_comment_stream_desc to code_of_conduct_summary_desc, update text.
---
 .../src/routes/Configure/components/StreamSettings.js     | 4 ++--
 locales/ar.yml                                            | 4 ++--
 locales/da.yml                                            | 4 ++--
 locales/de.yml                                            | 4 ++--
 locales/en.yml                                            | 6 +++---
 locales/es.yml                                            | 4 ++--
 locales/fi_FI.yml                                         | 4 ++--
 locales/fr.yml                                            | 4 ++--
 locales/nl_NL.yml                                         | 4 ++--
 locales/pt_BR.yml                                         | 8 ++++----
 locales/zh_CN.yml                                         | 4 ++--
 locales/zh_TW.yml                                         | 4 ++--
 12 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/client/coral-admin/src/routes/Configure/components/StreamSettings.js b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
index 969155d48..5f98da3d7 100644
--- a/client/coral-admin/src/routes/Configure/components/StreamSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
@@ -155,9 +155,9 @@ class StreamSettings extends React.Component {
         <ConfigureCard
           checked={settings.infoBoxEnable}
           onCheckbox={this.updateInfoBoxEnable}
-          title={t('configure.include_comment_stream')}
+          title={t('configure.code_of_conduct_summary')}
         >
-          <p>{t('configure.include_comment_stream_desc')}</p>
+          <p>{t('configure.code_of_conduct_summary_desc')}</p>
           <div
             className={cn(
               styles.configSettingInfoBox,
diff --git a/locales/ar.yml b/locales/ar.yml
index 87d7f5a8f..6ff2b7f60 100644
--- a/locales/ar.yml
+++ b/locales/ar.yml
@@ -130,8 +130,8 @@ ar:
     enable_questionbox: 'اطرح سؤال على القراء'
     enable_questionbox_description: 'هذا السؤال سيظهر في الجزء العلوي من جدول التعليقات هذا. اسأل القراء عن مسألة معينة في المقال او اطرح أسئلة نقاشية.. الخ.'
     hours: ساعات
-    include_comment_stream: 'ادراج وصف جدول التعليقات للقراء'
-    include_comment_stream_desc: 'اكتب رسالة ليتم إضافتها إلى الجزء العلوي من جدول التعليقات. ضع موضوعا، اشمل القواعد الإرشادية للمجموعة .. الخ'
+    code_of_conduct_summary: 'ادراج وصف جدول التعليقات للقراء'
+    code_of_conduct_summary_desc: 'اكتب رسالة ليتم إضافتها إلى الجزء العلوي من جدول التعليقات. ضع موضوعا، اشمل القواعد الإرشادية للمجموعة .. الخ'
     include_question_here: 'اكتب سؤالك هنا:'
     include_text: 'ادرج النص هنا.'
     moderate: اشرف
diff --git a/locales/da.yml b/locales/da.yml
index 14c19b860..01f62e924 100644
--- a/locales/da.yml
+++ b/locales/da.yml
@@ -123,8 +123,8 @@ da:
     enable_questionbox: 'Stil et spørgsmål til læserne'
     enable_questionbox_description: 'Dette spørgsmål vises øverst i denne kommentarstrøm. Stil et spørgsmål til læserne om et bestemt problem i artiklen eller stil spørgsmål til diskussion mv.'
     hours: Timer
-    include_comment_stream: 'Inkluder kommentarstrømmens beskrivelse for læsere'
-    include_comment_stream_desc: 'Skriv en besked, der skal tilføjes øverst i din kommentarstrøm. Indsæt et emne der omfatter fællesskabsretningslinjer mv.'
+    code_of_conduct_summary: 'Inkluder kommentarstrømmens beskrivelse for læsere'
+    code_of_conduct_summary_desc: 'Skriv en besked, der skal tilføjes øverst i din kommentarstrøm. Indsæt et emne der omfatter fællesskabsretningslinjer mv.'
     include_question_here: 'Stil dit spørgsmål her:'
     include_text: 'Medtag din tekst her.'
     moderate: Moderat
diff --git a/locales/de.yml b/locales/de.yml
index 3264bc44a..e04938f03 100644
--- a/locales/de.yml
+++ b/locales/de.yml
@@ -132,8 +132,8 @@ de:
     enable_questionbox: 'Stellen Sie den Lesern eine Frage'
     enable_questionbox_description: 'Diese Frage erscheint am Anfang des Kommentarbereichs. Regen Sie eine Diskussion an.'
     hours: Stunden
-    include_comment_stream: 'Einleitung zum Kommentarbereich'
-    include_comment_stream_desc: 'Verfassen Sie eine Einleitung, die über jedem Kommentarbereich erscheint. Nützlich z.B. für Community-Richtlinien.'
+    code_of_conduct_summary: 'Einleitung zum Kommentarbereich'
+    code_of_conduct_summary_desc: 'Verfassen Sie eine Einleitung, die über jedem Kommentarbereich erscheint. Nützlich z.B. für Community-Richtlinien.'
     include_question_here: 'Stellen Sie Ihre Frage hier:'
     include_text: 'Fügen Sie Ihren Text hier ein.'
     moderate: Moderieren
diff --git a/locales/en.yml b/locales/en.yml
index c7b4ed926..8d4055b38 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -132,8 +132,8 @@ en:
     enable_questionbox: 'Ask Readers a Question'
     enable_questionbox_description: 'This question will appear at the top of this comment stream. Ask readers about a certain issue in the article or pose discussion questions etc.'
     hours: Hours
-    include_comment_stream: 'Include Comment Stream Description for Readers'
-    include_comment_stream_desc: 'Write a message to be added to the top of your comment stream. Pose a topic include community guidelines etc.'
+    code_of_conduct_summary: 'Summary of your Code of Conduct'
+    code_of_conduct_summary_desc: 'This message will appear above every comments stream on your site. Click here to learn more about writing a good code.'
     include_question_here: 'Write your question here:'
     include_text: 'Include your text here.'
     moderate: Moderate
@@ -253,7 +253,7 @@ en:
     organization_contact_email: 'Organization email is not valid.'
     organization_name: 'Organization name must only contain letters or numbers.'
     password: 'Password must be at least 8 characters'
-    PAGE_NOT_AVAILABLE_ROLE: 'This page is for team use only. Please contact an administrator if you want to join this team.' 
+    PAGE_NOT_AVAILABLE_ROLE: 'This page is for team use only. Please contact an administrator if you want to join this team.'
     PASSWORD_INCORRECT: 'Your current password was entered incorrectly'
     PASSWORD_LENGTH: 'Password is too short'
     PASSWORD_REQUIRED: 'Must input a password'
diff --git a/locales/es.yml b/locales/es.yml
index 7a41207d0..c66699f75 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -125,8 +125,8 @@ es:
     enable_questionbox: 'Hacer una pregunta a los y las lectoras.'
     enable_questionbox_description: 'Esta pregunta aparecerá en la parte de arriba del hilo de comentarios.'
     hours: Horas
-    include_comment_stream: 'Incluir Descripción de Hilo de Comentarios para Lectores'
-    include_comment_stream_desc: 'Escribir un mensaje para ser incluido al principio del hilo de comentarios. Un tema planteado podría ser la guía de comunidad, etc.'
+    code_of_conduct_summary: 'Incluir Descripción de Hilo de Comentarios para Lectores'
+    code_of_conduct_summary_desc: 'Escribir un mensaje para ser incluido al principio del hilo de comentarios. Un tema planteado podría ser la guía de comunidad, etc.'
     include_question_here: 'Escribir la pregunta aquí.'
     include_text: 'Agregar tu texto aquí.'
     moderate: Moderar
diff --git a/locales/fi_FI.yml b/locales/fi_FI.yml
index 4d379d9ca..5c7d019a2 100644
--- a/locales/fi_FI.yml
+++ b/locales/fi_FI.yml
@@ -123,8 +123,8 @@ fi_FI:
     enable_questionbox: 'Kysy lukijoilta'
     enable_questionbox_description: 'Tämä kysymys tulee näkymään kommenttiosion ylälaidassa. Kysy artikkelin aiheesta tai ohjaa keskustelua kysymyksen avulla.'
     hours: Tuntia
-    include_comment_stream: 'Sisällytä kommentoinnin kuvaus lukijoille'
-    include_comment_stream_desc: 'Kirjoita kommenttiosion yläreunassa näkyvä viesti. Aseta keskustelun aihe, sisällytä sääntöjä tms.'
+    code_of_conduct_summary: 'Sisällytä kommentoinnin kuvaus lukijoille'
+    code_of_conduct_summary_desc: 'Kirjoita kommenttiosion yläreunassa näkyvä viesti. Aseta keskustelun aihe, sisällytä sääntöjä tms.'
     include_question_here: 'Kirjoita kysymyksesi tähän:'
     include_text: 'Lisää teksti tähän.'
     moderate: Moderoi
diff --git a/locales/fr.yml b/locales/fr.yml
index 12fdb8e06..511090912 100644
--- a/locales/fr.yml
+++ b/locales/fr.yml
@@ -127,8 +127,8 @@ fr:
     enable_questionbox: 'Posez une question aux lecteurs.'
     enable_questionbox_description: 'Cette question apparaîtra en haut de ce fil de commentaires. Demandez aux lecteurs de s''exprimer sur un sujet évoqué dans l''article ou posez les termes de la discussion, etc.'
     hours: Heures
-    include_comment_stream: 'Inclure la description du fil de commentaires pour les lecteurs'
-    include_comment_stream_desc: 'Écrivez un message à ajouter au haut de votre flux de commentaires. Publiez un sujet de discussion, avec des suggestion sur la tenue des débats, etc.'
+    code_of_conduct_summary: 'Inclure la description du fil de commentaires pour les lecteurs'
+    code_of_conduct_summary_desc: 'Écrivez un message à ajouter au haut de votre flux de commentaires. Publiez un sujet de discussion, avec des suggestion sur la tenue des débats, etc.'
     include_question_here: 'Écrivez votre question ici.'
     include_text: 'Entrez votre texte ici.'
     moderate: Modérer
diff --git a/locales/nl_NL.yml b/locales/nl_NL.yml
index 8245931f3..d290e549c 100644
--- a/locales/nl_NL.yml
+++ b/locales/nl_NL.yml
@@ -123,8 +123,8 @@ nl_NL:
     enable_questionbox: 'Stel een vraag aan de lezers'
     enable_questionbox_description: 'Deze vraag zal bovenaan de conversatie verschijnen. Vraag lezers naar een probleem in het artikel, poneer discussie vragen, enzovoort.'
     hours: Uren
-    include_comment_stream: 'Neem conversatie beschrijving op voor lezers.'
-    include_comment_stream_desc: 'Schrijf een bericht voor boven je conversatie. Poneer een stelling, wijs op de community richtlijnen, etc.'
+    code_of_conduct_summary: 'Neem conversatie beschrijving op voor lezers.'
+    code_of_conduct_summary_desc: 'Schrijf een bericht voor boven je conversatie. Poneer een stelling, wijs op de community richtlijnen, etc.'
     include_question_here: 'Schrijf je vraag hier:'
     include_text: 'Schrijf hier je tekst.'
     moderate: Modereer
diff --git a/locales/pt_BR.yml b/locales/pt_BR.yml
index 66273f137..2f11f8344 100644
--- a/locales/pt_BR.yml
+++ b/locales/pt_BR.yml
@@ -130,8 +130,8 @@ pt_BR:
     enable_questionbox: 'Faça uma pergunta aos leitores'
     enable_questionbox_description: 'Esta pergunta aparecerá no topo da lista de comentários. Pergunte aos leitores sobre um determinado problema no artigo, abra o assunto para discussão, etc.'
     hours: Horas
-    include_comment_stream: 'Incluir descrição da lista comentários para leitores'
-    include_comment_stream_desc: 'Escreva uma mensagem para adicionar ao topo do seu hilo de comentários. Posicionar um tópico, incluem diretrizes comunitárias, etc.'
+    code_of_conduct_summary: 'Incluir descrição da lista comentários para leitores'
+    code_of_conduct_summary_desc: 'Escreva uma mensagem para adicionar ao topo do seu hilo de comentários. Posicionar um tópico, incluem diretrizes comunitárias, etc.'
     include_question_here: 'Escreva sua pergunta aqui:'
     include_text: 'Inclua seu texto aqui:'
     moderate: Moderar
@@ -209,7 +209,7 @@ pt_BR:
       to_confirm: 'Para confirmar a conta, visite este link: '
     password_change:
       body: "A sua senha foi alterada.\n\nSe você não solicitou essa alteracão, por favor nos contate em {0}"
-      subject: '{0} password change'  
+      subject: '{0} password change'
     password_reset:
       if_you_did: 'Se você solicitou isso, '
       please_click: 'clique aqui para redefinir sua senha.'
@@ -223,7 +223,7 @@ pt_BR:
     copied: 'Copiado'
   error:
     ALREADY_EXISTS: 'O recurso já existe'
-    AUTHENTICATION: ‘Ocorreu um erro durante a autenticação da sua conta’ 
+    AUTHENTICATION: ‘Ocorreu um erro durante a autenticação da sua conta’
     CANNOT_IGNORE_STAFF: 'Não é possível ignorar membros Staff.'
     COMMENT_PARENT_NOT_VISIBLE: 'O comentário que você está respondendo foi removido ou não existe.'
     COMMENT_TOO_SHORT: 'Seu comentário precisar ter mais de um caracter. Revise seu comentário e envie novamente'
diff --git a/locales/zh_CN.yml b/locales/zh_CN.yml
index c3a1b2249..aa983688a 100644
--- a/locales/zh_CN.yml
+++ b/locales/zh_CN.yml
@@ -114,8 +114,8 @@ zh_CN:
     enable_questionbox: 向读者提问
     enable_questionbox_description: 该问题将在评论流顶部出现。可以就文章中特定内容发问，也可以设置一个讨论问题，等等。
     hours: 小时
-    include_comment_stream: 开启评论流描述
-    include_comment_stream_desc: 填写将在评论流顶部出现的描述。可以写评论主题、社群指引方针，等等。
+    code_of_conduct_summary: 开启评论流描述
+    code_of_conduct_summary_desc: 填写将在评论流顶部出现的描述。可以写评论主题、社群指引方针，等等。
     include_question_here: 此处输入问题：
     include_text: 此处输入文本。
     moderate: 审查
diff --git a/locales/zh_TW.yml b/locales/zh_TW.yml
index caa01ec62..208cfddc8 100644
--- a/locales/zh_TW.yml
+++ b/locales/zh_TW.yml
@@ -113,8 +113,8 @@ zh_TW:
     enable_questionbox: 向讀者提問
     enable_questionbox_description: 該問題將會在評論流置頂。您可以詢問其他讀者有關文章中的具體時間或是提出討論等
     hours: 小時
-    include_comment_stream: 包含讀者的評論流描述
-    include_comment_stream_desc: 留言將在您的評論流中置頂。發布一個社區規則等
+    code_of_conduct_summary: 包含讀者的評論流描述
+    code_of_conduct_summary_desc: 留言將在您的評論流中置頂。發布一個社區規則等
     include_question_here: 請在此處輸入問題：
     include_text: 在此插入您的文本
     moderate: 審核

From 7f45f7e2e2a1fa14c5d0e432e73c5ac471dc9046 Mon Sep 17 00:00:00 2001
From: Harrison Reid <harrison@twosmalltrees.com>
Date: Sat, 20 Oct 2018 08:43:13 +1100
Subject: [PATCH 2/3] Add Code of Conduct Link

---
 .../routes/Configure/components/StreamSettings.js    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/client/coral-admin/src/routes/Configure/components/StreamSettings.js b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
index 5f98da3d7..5ce329f69 100644
--- a/client/coral-admin/src/routes/Configure/components/StreamSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
@@ -157,7 +157,17 @@ class StreamSettings extends React.Component {
           onCheckbox={this.updateInfoBoxEnable}
           title={t('configure.code_of_conduct_summary')}
         >
-          <p>{t('configure.code_of_conduct_summary_desc')}</p>
+          <p>
+            {t('configure.code_of_conduct_summary_desc')}
+            &nbsp;
+            <a
+              target="_blank"
+              rel="noopener noreferrer"
+              href="https://guides.coralproject.net/create-a-code-of-conduct/"
+            >
+              Code of Conduct Guide.
+            </a>
+          </p>
           <div
             className={cn(
               styles.configSettingInfoBox,

From aac7cae6d68026570bc5f314e721022db64a8305 Mon Sep 17 00:00:00 2001
From: Parikshit Hooda <phooda804@live.com>
Date: Fri, 26 Oct 2018 22:52:19 +0530
Subject: [PATCH 3/3] typo fix : whih to which (#2039)

typo fix : whih to which
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a57451e00..dd04b096f 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ You’ve installed Talk on your server, and you’re preparing to launch it on y
 
 ## Advanced Usage
 
-For advanced configuration and usage of Talk, check out our [Configuration](https://docs.coralproject.net/talk/advanced-configuration/) and [Integration](https://docs.coralproject.net/talk/integrating/authentication/) how-tos. This covers topics in whih you will need dev support to fully customize and integrate Talk, such as SSO/authentication, creating and managing assets and articles, styling Talk with custom CSS, and setting up Notifications and SMTP support.
+For advanced configuration and usage of Talk, check out our [Configuration](https://docs.coralproject.net/talk/advanced-configuration/) and [Integration](https://docs.coralproject.net/talk/integrating/authentication/) how-tos. This covers topics in which you will need dev support to fully customize and integrate Talk, such as SSO/authentication, creating and managing assets and articles, styling Talk with custom CSS, and setting up Notifications and SMTP support.
 
 ## Versions & Upgrading