From ef58c439f21bcc8cc5857f4da849eece09191db1 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 1 Dec 2016 18:46:02 -0500
Subject: [PATCH 01/16] Adding banned word list menu option.

---
 client/coral-admin/src/containers/Configure/Configure.js | 5 +++++
 client/coral-admin/src/translations.json                 | 1 +
 2 files changed, 6 insertions(+)

diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index a9e2f3ef2..93935a630 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -144,6 +144,11 @@ class Configure extends React.Component {
                   onClick={this.changeSection.bind(this, 'embed')}
                   icon='code'>{lang.t('configure.embed-comment-stream')}</ListItemContent>
               </ListItem>
+              <ListItem className={styles.settingOption}>
+                <ListItemContent
+                  onClick={this.changeSection.bind(this, 'wordlist')}
+                  icon='settings'>{lang.t('configure.wordlist')}</ListItemContent>
+              </ListItem>
             </List>
             <Button raised colored onClick={this.saveSettings}>
               <Icon name='save' /> {lang.t('configure.save-changes')}
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index dd959172b..68533a447 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -37,6 +37,7 @@
       "include-text": "Include your text here.",
       "comment-settings": "Comment Settings",
       "embed-comment-stream": "Embed Comment Stream",
+      "wordlist": "Banned words list",
       "save-changes": "Save Changes",
       "copy-and-paste": "Copy and paste code below into your CMS to embed your comment box in your articles",
       "moderate": "Moderate",

From 957837169fb93ae9336b97653ecf166207fa36f4 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 1 Dec 2016 19:35:35 -0500
Subject: [PATCH 02/16] Moving configuration sections to seperate files.

---
 .../containers/Configure/CommentSettings.js   |  65 +++++++++
 .../src/containers/Configure/Configure.js     | 124 ++++--------------
 .../src/containers/Configure/EmbedLink.js     |  49 +++++++
 .../src/containers/Configure/Wordlist.js      |  17 +++
 client/coral-admin/src/translations.json      |   1 +
 5 files changed, 158 insertions(+), 98 deletions(-)
 create mode 100644 client/coral-admin/src/containers/Configure/CommentSettings.js
 create mode 100644 client/coral-admin/src/containers/Configure/EmbedLink.js
 create mode 100644 client/coral-admin/src/containers/Configure/Wordlist.js

diff --git a/client/coral-admin/src/containers/Configure/CommentSettings.js b/client/coral-admin/src/containers/Configure/CommentSettings.js
new file mode 100644
index 000000000..c6a53adbe
--- /dev/null
+++ b/client/coral-admin/src/containers/Configure/CommentSettings.js
@@ -0,0 +1,65 @@
+import React from 'react';
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from '../../translations.json';
+import styles from './Configure.css';
+import {
+  List,
+  ListItem,
+  ListItemContent,
+  ListItemAction,
+  Textfield,
+  Checkbox
+} from 'react-mdl';
+import {updateSettings} from '../../actions/settings';
+
+const updateModeration = (props) => () => {
+  const moderation = props.settings.moderation === 'pre' ? 'post' : 'pre';
+  props.dispatch(updateSettings({moderation}));
+};
+
+const updateInfoBoxEnable = (props) => () => {
+  const infoBoxEnable = !props.settings.infoBoxEnable;
+  props.dispatch(updateSettings({infoBoxEnable}));
+};
+
+const updateInfoBoxContent = (props) => (event) => {
+  const infoBoxContent =  event.target.value;
+  props.dispatch(updateSettings({infoBoxContent}));
+};
+
+const StateLess = (props) => <List>
+  <ListItem className={styles.configSetting}>
+    <ListItemAction>
+      <Checkbox
+        onClick={updateModeration(props)}
+        checked={props.settings.moderation === 'pre'} />
+    </ListItemAction>
+    {lang.t('configure.enable-pre-moderation')}
+  </ListItem>
+  <ListItem threeLine className={styles.configSettingInfoBox}>
+    <ListItemAction>
+      <Checkbox
+        onClick={updateInfoBoxEnable(props)}
+        checked={props.settings.infoBoxEnable} />
+    </ListItemAction>
+    <ListItemContent>
+      {lang.t('configure.include-comment-stream')}
+      <p>
+        {lang.t('configure.include-comment-stream-desc')}
+      </p>
+    </ListItemContent>
+  </ListItem>
+  <ListItem className={`${styles.configSettingInfoBox} ${props.settings.infoBoxEnable ? null : styles.hidden}`} >
+    <ListItemContent>
+      <Textfield
+        onChange={updateInfoBoxContent(props)}
+        value={props.settings.infoBoxContent}
+        label={lang.t('configure.include-text')}
+        rows={3}/>
+    </ListItemContent>
+  </ListItem>
+</List>;
+
+export default StateLess;
+
+const lang = new I18n(translations);
diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index 93935a630..4ff268c78 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -5,30 +5,20 @@ import {
   List,
   ListItem,
   ListItemContent,
-  ListItemAction,
-  Textfield,
-  Checkbox,
   Button,
   Icon
 } from 'react-mdl';
 import styles from './Configure.css';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
+import EmbedLink from './EmbedLink';
+import CommentSettings from './CommentSettings';
 
 class Configure extends React.Component {
   constructor (props) {
     super(props);
 
-    this.state = {activeSection: 'comments', copied: false};
-
-    this.copyToClipBoard = this.copyToClipBoard.bind(this);
-
-    // Update settings
-    this.updateModeration = this.updateModeration.bind(this);
-    // InfoBox has two settings. Enable or not and the content of it if it is enable.
-    this.updateInfoBoxEnable = this.updateInfoBoxEnable.bind(this);
-    this.updateInfoBoxContent = this.updateInfoBoxContent.bind(this);
-
+    this.state = {activeSection: 'comments'};
     this.saveSettings = this.saveSettings.bind(this);
   }
 
@@ -36,95 +26,37 @@ class Configure extends React.Component {
     this.props.dispatch(fetchSettings());
   }
 
-  updateModeration () {
-    const moderation = this.props.settings.moderation === 'pre' ? 'post' : 'pre';
-    this.props.dispatch(updateSettings({moderation}));
-  }
-
-  updateInfoBoxEnable () {
-    const infoBoxEnable = !this.props.settings.infoBoxEnable;
-    this.props.dispatch(updateSettings({infoBoxEnable}));
-  }
-
-  updateInfoBoxContent (event) {
-    const infoBoxContent =  event.target.value;
-    this.props.dispatch(updateSettings({infoBoxContent}));
-  }
-
   saveSettings () {
     this.props.dispatch(saveSettingsToServer());
   }
 
-  getCommentSettings () {
-    return <List>
-      <ListItem className={styles.configSetting}>
-        <ListItemAction>
-          <Checkbox
-            onClick={this.updateModeration}
-            checked={this.props.settings.moderation === 'pre'} />
-        </ListItemAction>
-        {lang.t('configure.enable-pre-moderation')}
-      </ListItem>
-      <ListItem threeLine className={styles.configSettingInfoBox}>
-        <ListItemAction>
-          <Checkbox
-            onClick={this.updateInfoBoxEnable}
-            checked={this.props.settings.infoBoxEnable} />
-        </ListItemAction>
-        <ListItemContent>
-          {lang.t('configure.include-comment-stream')}
-          <p>
-            {lang.t('configure.include-comment-stream-desc')}
-          </p>
-        </ListItemContent>
-      </ListItem>
-      <ListItem className={`${styles.configSettingInfoBox} ${this.props.settings.infoBoxEnable ? null : styles.hidden}`} >
-        <ListItemContent>
-          <Textfield
-            onChange={this.updateInfoBoxContent}
-            value={this.props.settings.infoBoxContent}
-            label={lang.t('configure.include-text')}
-            rows={3}/>
-        </ListItemContent>
-      </ListItem>
-    </List>;
-  }
-
-  copyToClipBoard () {
-    const copyTextarea = document.querySelector(`.${  styles.embedInput}`);
-    copyTextarea.select();
-
-    try {
-      document.execCommand('copy');
-      this.setState({copied: true});
-    } catch (err) {
-      console.error('Unable to copy', err);
-    }
-  }
-
-  getEmbed () {
-    const embedText = `<div id='coralStreamEmbed'></div><script type='text/javascript' src='${window.location.protocol}//pym.nprapps.org/pym.v1.min.js'></script><script>var pymParent = new pym.Parent('coralStreamEmbed', '${window.location.protocol}//${window.location.host}/embed/stream', {title: 'Comments'});</script>`;
-
-    return <List>
-      <ListItem className={styles.configSettingEmbed}>
-        <p>{lang.t('configure.copy-and-paste')}</p>
-        <textarea rows={5} type='text' className={styles.embedInput} value={embedText} readOnly={true}/>
-        <Button raised colored className={styles.copyButton} onClick={this.copyToClipBoard}>
-          {lang.t('embedlink.copy')}
-        </Button>
-        <div className={styles.copiedText}>{this.state.copied && 'Copied!'}</div>
-      </ListItem>
-    </List>;
-  }
-
   changeSection (activeSection) {
     this.setState({activeSection});
   }
 
+  getSection (section) {
+    switch(section){
+    case 'comments':
+      return <CommentSettings settings={this.props.settings}/>;
+    case 'embed':
+      return <EmbedLink/>;
+    }
+  }
+
+  getPageTitle (section) {
+    switch(section) {
+    case 'comments':
+      return lang.t('configure.comment-settings');
+    case 'embed':
+      return lang.t('configure.embed-comment-stream');
+    case 'wordlist':
+      return lang.t('configure.wordlist');
+    }
+  }
+
   render () {
-    let pageTitle = this.state.activeSection === 'comments'
-      ? lang.t('configure.comment-settings')
-      : lang.t('configure.embed-comment-stream');
+    let pageTitle = this.getPageTitle(this.state.activeSection);
+    const section = this.getSection(this.state.activeSection);
 
     if (this.props.fetchingSettings) {
       pageTitle += ' - Loading...';
@@ -158,11 +90,7 @@ class Configure extends React.Component {
             <h1>{pageTitle}</h1>
             { this.props.saveFetchingError }
             { this.props.fetchSettingsError }
-            {
-              this.state.activeSection === 'comments'
-              ? this.getCommentSettings()
-              : this.getEmbed()
-            }
+            { section }
           </div>
         </div>
     );
diff --git a/client/coral-admin/src/containers/Configure/EmbedLink.js b/client/coral-admin/src/containers/Configure/EmbedLink.js
new file mode 100644
index 000000000..3cc22fd09
--- /dev/null
+++ b/client/coral-admin/src/containers/Configure/EmbedLink.js
@@ -0,0 +1,49 @@
+import React, {Component} from 'react'
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from '../../translations.json';
+import styles from './Configure.css';
+import {
+  List,
+  ListItem,
+  Button
+} from 'react-mdl';
+
+class EmbedLink extends Component {
+
+  constructor (props) {
+    super(props);
+
+    this.state = {copied: false};
+  }
+
+  copyToClipBoard = () => {
+    const copyTextarea = document.querySelector(`.${styles.embedInput}`);
+    copyTextarea.select();
+
+    try {
+      document.execCommand('copy');
+      this.setState({copied: true});
+    } catch (err) {
+      console.error('Unable to copy', err);
+    }
+  }
+
+  render () {
+    const embedText = `<div id='coralStreamEmbed'></div><script type='text/javascript' src='${window.location.protocol}//pym.nprapps.org/pym.v1.min.js'></script><script>var pymParent = new pym.Parent('coralStreamEmbed', '${window.location.protocol}//${window.location.host}/embed/stream', {title: 'Comments'});</script>`;
+
+    return <List>
+      <ListItem className={styles.configSettingEmbed}>
+        <p>{lang.t('configure.copy-and-paste')}</p>
+        <textarea rows={5} type='text' className={styles.embedInput} value={embedText} readOnly={true}/>
+        <Button raised colored className={styles.copyButton} onClick={this.copyToClipBoard}>
+          {lang.t('embedlink.copy')}
+        </Button>
+        <div className={styles.copiedText}>{this.state.copied && 'Copied!'}</div>
+      </ListItem>
+    </List>;
+  }
+}
+
+export default EmbedLink
+
+const lang = new I18n(translations);
diff --git a/client/coral-admin/src/containers/Configure/Wordlist.js b/client/coral-admin/src/containers/Configure/Wordlist.js
new file mode 100644
index 000000000..020fdc4bb
--- /dev/null
+++ b/client/coral-admin/src/containers/Configure/Wordlist.js
@@ -0,0 +1,17 @@
+import React from 'react'
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from '../../translations.json';
+import styles from './Configure.css';
+import {
+  Card
+} from 'react-mdl';
+
+const Wordlist = () => <Card id='bannedWordlist'>
+  <h4 className={styles.bannedWordHeader}>Write the bannned words list</h4>
+  <p className={styles.bannedWordText}>Comments which contain these words or phrases, not seperated by commas and not
+  case sensitive, will be automatically removed from the comment stream.</p>
+</Card>;
+
+export default Wordlist;
+
+const lang = new I18n(translations);
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index 68533a447..10924623b 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -72,6 +72,7 @@
       "include-text": "Incluir tu texto aqui.",
       "comment-settings": "Configuración de Comentarios",
       "embed-comment-stream": "Colocar Hilo de Comentarios",
+      "wordlist": "tracundeme",
       "save-changes": "Guardar Cambios",
       "copy-and-paste": "Copiar y pegar el código de más abajo en tu CMS para colocar la caja de comentarios en tus articulos",
       "moderate": "Moderar",

From a16faddac68e93895f5569fbaaa5b1f70b871b97 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 1 Dec 2016 20:11:33 -0500
Subject: [PATCH 03/16] Adding banned word list.

---
 .../containers/Configure/CommentSettings.js   |  7 ++---
 .../src/containers/Configure/Configure.css    | 13 +++++++++
 .../src/containers/Configure/Configure.js     | 28 +++++++++++++++++--
 .../src/containers/Configure/EmbedLink.js     |  4 +--
 .../src/containers/Configure/Wordlist.js      | 18 ++++++++----
 5 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/client/coral-admin/src/containers/Configure/CommentSettings.js b/client/coral-admin/src/containers/Configure/CommentSettings.js
index c6a53adbe..f5be9f5c8 100644
--- a/client/coral-admin/src/containers/Configure/CommentSettings.js
+++ b/client/coral-admin/src/containers/Configure/CommentSettings.js
@@ -10,21 +10,20 @@ import {
   Textfield,
   Checkbox
 } from 'react-mdl';
-import {updateSettings} from '../../actions/settings';
 
 const updateModeration = (props) => () => {
   const moderation = props.settings.moderation === 'pre' ? 'post' : 'pre';
-  props.dispatch(updateSettings({moderation}));
+  props.updateSettings({moderation});
 };
 
 const updateInfoBoxEnable = (props) => () => {
   const infoBoxEnable = !props.settings.infoBoxEnable;
-  props.dispatch(updateSettings({infoBoxEnable}));
+  props.updateSettings({infoBoxEnable});
 };
 
 const updateInfoBoxContent = (props) => (event) => {
   const infoBoxContent =  event.target.value;
-  props.dispatch(updateSettings({infoBoxContent}));
+  props.updateSettings({infoBoxContent});
 };
 
 const StateLess = (props) => <List>
diff --git a/client/coral-admin/src/containers/Configure/Configure.css b/client/coral-admin/src/containers/Configure/Configure.css
index 8d1fc49a2..c1ac13375 100644
--- a/client/coral-admin/src/containers/Configure/Configure.css
+++ b/client/coral-admin/src/containers/Configure/Configure.css
@@ -69,6 +69,19 @@
   letter-spacing: 0.03em;
 }
 
+#bannedWordlist {
+    width: 100%;
+    padding: 10px;
+}
+
+.bannedWordHeader {
+  font-weight: bold;
+  font-size:18px;
+  margin-bottom:3px;
+}
+
+
+
 .hidden {
   display: none;
 }
diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index 4ff268c78..abf3a0343 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -13,13 +13,18 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
 import EmbedLink from './EmbedLink';
 import CommentSettings from './CommentSettings';
+import Wordlist from './Wordlist';
 
 class Configure extends React.Component {
   constructor (props) {
     super(props);
-
-    this.state = {activeSection: 'comments'};
+    console.log(props);
+    this.state = {
+      activeSection: 'comments',
+      wordlist: props.settings.wordlist && props.settings.wordlist.join(' ')
+    };
     this.saveSettings = this.saveSettings.bind(this);
+    this.onChangeWordlist = this.onChangeWordlist.bind(this);
   }
 
   componentWillMount () {
@@ -34,12 +39,29 @@ class Configure extends React.Component {
     this.setState({activeSection});
   }
 
+  onChangeWordlist (event) {
+    event.preventDefault();
+    const newlist = event.target.value;
+    this.setState({wordlist: newlist.toLowerCase()});
+    this.props.dispatch(updateSettings({
+      wordlist: newlist.toLowerCase()
+        .split(',')
+        .map((word) => word.trim())
+    }));
+  }
+
   getSection (section) {
     switch(section){
     case 'comments':
-      return <CommentSettings settings={this.props.settings}/>;
+      return <CommentSettings
+        settings={this.props.settings}
+        updateSettings={(setting) => this.props.dispatch(updateSettings(setting))}/>;
     case 'embed':
       return <EmbedLink/>;
+    case 'wordlist':
+      return <Wordlist
+        wordlist={this.state.wordlist}
+        onChangeWordlist={this.onChangeWordlist}/>;
     }
   }
 
diff --git a/client/coral-admin/src/containers/Configure/EmbedLink.js b/client/coral-admin/src/containers/Configure/EmbedLink.js
index 3cc22fd09..6c5c3da99 100644
--- a/client/coral-admin/src/containers/Configure/EmbedLink.js
+++ b/client/coral-admin/src/containers/Configure/EmbedLink.js
@@ -1,4 +1,4 @@
-import React, {Component} from 'react'
+import React, {Component} from 'react';
 import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
 import styles from './Configure.css';
@@ -44,6 +44,6 @@ class EmbedLink extends Component {
   }
 }
 
-export default EmbedLink
+export default EmbedLink;
 
 const lang = new I18n(translations);
diff --git a/client/coral-admin/src/containers/Configure/Wordlist.js b/client/coral-admin/src/containers/Configure/Wordlist.js
index 020fdc4bb..7411d71a8 100644
--- a/client/coral-admin/src/containers/Configure/Wordlist.js
+++ b/client/coral-admin/src/containers/Configure/Wordlist.js
@@ -1,17 +1,23 @@
-import React from 'react'
-import I18n from 'coral-framework/modules/i18n/i18n';
-import translations from '../../translations.json';
+import React from 'react';
+// import I18n from 'coral-framework/modules/i18n/i18n';
+// import translations from '../../translations.json';
 import styles from './Configure.css';
 import {
   Card
 } from 'react-mdl';
 
-const Wordlist = () => <Card id='bannedWordlist'>
-  <h4 className={styles.bannedWordHeader}>Write the bannned words list</h4>
+const Wordlist = ({wordlist, onChangeWordlist}) => <Card id={styles.bannedWordlist} shadow={2}>
+  <p className={styles.bannedWordHeader}>Write the bannned words list</p>
   <p className={styles.bannedWordText}>Comments which contain these words or phrases, not seperated by commas and not
   case sensitive, will be automatically removed from the comment stream.</p>
+  <textarea
+    rows={5}
+    type='text'
+    className={styles.bannedWordInput}
+    onChange={onChangeWordlist}
+    value={wordlist}/>
 </Card>;
 
 export default Wordlist;
 
-const lang = new I18n(translations);
+// const lang = new I18n(translations);

From 827b94001ada5080dd2f8c60e68050b1b185e4ed Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 1 Dec 2016 20:24:34 -0500
Subject: [PATCH 04/16] Changing save button color when settings are changed

---
 .../src/containers/Configure/Configure.css    |  4 +++
 .../src/containers/Configure/Configure.js     | 28 +++++++++++++++----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/client/coral-admin/src/containers/Configure/Configure.css b/client/coral-admin/src/containers/Configure/Configure.css
index c1ac13375..388813a64 100644
--- a/client/coral-admin/src/containers/Configure/Configure.css
+++ b/client/coral-admin/src/containers/Configure/Configure.css
@@ -45,6 +45,10 @@
   display: block;
 }
 
+.changedSave {
+  background-color:#4caf50;
+}
+
 .copiedText {
   color: #008000;
   float: right;
diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index abf3a0343..bd0f18045 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -21,7 +21,8 @@ class Configure extends React.Component {
     console.log(props);
     this.state = {
       activeSection: 'comments',
-      wordlist: props.settings.wordlist && props.settings.wordlist.join(' ')
+      wordlist: props.settings.wordlist && props.settings.wordlist.join(' '),
+      changed: false
     };
     this.saveSettings = this.saveSettings.bind(this);
     this.onChangeWordlist = this.onChangeWordlist.bind(this);
@@ -42,7 +43,7 @@ class Configure extends React.Component {
   onChangeWordlist (event) {
     event.preventDefault();
     const newlist = event.target.value;
-    this.setState({wordlist: newlist.toLowerCase()});
+    this.setState({wordlist: newlist.toLowerCase(), changed: true});
     this.props.dispatch(updateSettings({
       wordlist: newlist.toLowerCase()
         .split(',')
@@ -50,12 +51,17 @@ class Configure extends React.Component {
     }));
   }
 
+  onSettingUpdate (setting) {
+    this.setState({changed: true})
+    this.props.dispatch(updateSettings(setting))
+  }
+
   getSection (section) {
     switch(section){
     case 'comments':
       return <CommentSettings
         settings={this.props.settings}
-        updateSettings={(setting) => this.props.dispatch(updateSettings(setting))}/>;
+        updateSettings={this.onSettingUpdate}/>;
     case 'embed':
       return <EmbedLink/>;
     case 'wordlist':
@@ -104,9 +110,21 @@ class Configure extends React.Component {
                   icon='settings'>{lang.t('configure.wordlist')}</ListItemContent>
               </ListItem>
             </List>
-            <Button raised colored onClick={this.saveSettings}>
-              <Icon name='save' /> {lang.t('configure.save-changes')}
+            {
+              this.state.changed ?
+              <Button
+                raised
+                onClick={this.saveSettings}
+                className={styles.changedSave}>
+                <Icon name='check' /> {lang.t('configure.save-changes')}
+              </Button>
+              : <Button
+              raised
+              disabled>
+              {lang.t('configure.save-changes')}
             </Button>
+            }
+
           </div>
           <div className={styles.mainContent}>
             <h1>{pageTitle}</h1>

From a91b73e94a4c70fbeaa43a664d038e00cffe3991 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 1 Dec 2016 20:26:48 -0500
Subject: [PATCH 05/16] Fixing bug when writing settings to state.

---
 client/coral-admin/src/containers/Configure/Configure.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index bd0f18045..be51f6639 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -26,6 +26,7 @@ class Configure extends React.Component {
     };
     this.saveSettings = this.saveSettings.bind(this);
     this.onChangeWordlist = this.onChangeWordlist.bind(this);
+    this.onSettingUpdate = this.onSettingUpdate.bind(this);
   }
 
   componentWillMount () {
@@ -52,8 +53,8 @@ class Configure extends React.Component {
   }
 
   onSettingUpdate (setting) {
-    this.setState({changed: true})
-    this.props.dispatch(updateSettings(setting))
+    this.setState({changed: true});
+    this.props.dispatch(updateSettings(setting));
   }
 
   getSection (section) {

From 2cb439ccf8ec1b32e027ba2096931e2a6bb49cd7 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 1 Dec 2016 21:12:13 -0500
Subject: [PATCH 06/16] Reloading banned word list from settings.

---
 .../src/containers/Configure/Configure.js           | 13 +++++++++++--
 client/coral-framework/reducers/items.js            |  3 +--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js
index be51f6639..4ee8a1c13 100644
--- a/client/coral-admin/src/containers/Configure/Configure.js
+++ b/client/coral-admin/src/containers/Configure/Configure.js
@@ -18,10 +18,9 @@ import Wordlist from './Wordlist';
 class Configure extends React.Component {
   constructor (props) {
     super(props);
-    console.log(props);
     this.state = {
       activeSection: 'comments',
-      wordlist: props.settings.wordlist && props.settings.wordlist.join(' '),
+      wordlist: [],
       changed: false
     };
     this.saveSettings = this.saveSettings.bind(this);
@@ -33,8 +32,18 @@ class Configure extends React.Component {
     this.props.dispatch(fetchSettings());
   }
 
+  componentWillUpdate (newProps) {
+    if ((!this.props.settings
+      || !this.props.settings.wordlist)
+      && newProps.settings.wordlist
+      && newProps.settings.wordlist.length !== 0 ) {
+      this.setState({wordlist: newProps.settings.wordlist.join(', ')});
+    }
+  }
+
   saveSettings () {
     this.props.dispatch(saveSettingsToServer());
+    this.setState({changed: false});
   }
 
   changeSection (activeSection) {
diff --git a/client/coral-framework/reducers/items.js b/client/coral-framework/reducers/items.js
index 17569c545..93388c1ab 100644
--- a/client/coral-framework/reducers/items.js
+++ b/client/coral-framework/reducers/items.js
@@ -6,7 +6,7 @@ import * as actions from '../actions/items';
 const initialState = fromJS({
   comments: {},
   users: {},
-  actions: {} 
+  actions: {}
 });
 
 export default (state = initialState, action) => {
@@ -17,7 +17,6 @@ export default (state = initialState, action) => {
     return state.setIn([action.item_type, action.id, action.property], fromJS(action.value));
   case actions.APPEND_ITEM_ARRAY:
     return state.updateIn([action.item_type, action.id, action.property], (prop) => {
-      console.log(prop);
       if (action.add_to_front) {
         return prop ? prop.unshift(fromJS(action.value)) : fromJS([action.value]);
       } else {

From b5b0cd9b128163df06e7e93e8b0cd9a2ab9233cf Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 1 Dec 2016 21:32:08 -0500
Subject: [PATCH 07/16] Adding banned word notification on post.

---
 client/coral-framework/actions/items.js                | 2 +-
 client/coral-plugin-commentbox/CommentBox.js           | 6 ++++--
 client/coral-plugin-commentbox/translations.json       | 6 ++++--
 tests/client/coral-framework/store/itemActions.spec.js | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/client/coral-framework/actions/items.js b/client/coral-framework/actions/items.js
index 2029714c7..d7d482991 100644
--- a/client/coral-framework/actions/items.js
+++ b/client/coral-framework/actions/items.js
@@ -197,7 +197,7 @@ export function postItem (item, type, id) {
     return coralApi(`/${type}`, {method: 'POST', body: item})
       .then((json) => {
         dispatch(addItem({...item, id:json.id}, type));
-        return json.id;
+        return json;
       });
   };
 }
diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index 9ae524652..b2cc48381 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -41,8 +41,10 @@ class CommentBox extends Component {
     }
     updateItem(child_id || parent_id, 'showReply', false, 'comments');
     postItem(comment, 'comments')
-    .then((comment_id) => {
-      if (premod === 'pre') {
+    .then(({comment_id, status}) => {
+      if (status === 'rejected') {
+        addNotification('error', lang.t('comment-post-banned-word'));
+      } else if (premod === 'pre') {
         addNotification('success', lang.t('comment-post-notif-premod'));
       } else {
         appendItemArray(parent_id || id, related, comment_id, !parent_id, parent_type);
diff --git a/client/coral-plugin-commentbox/translations.json b/client/coral-plugin-commentbox/translations.json
index 29f3212b9..2211cbbca 100644
--- a/client/coral-plugin-commentbox/translations.json
+++ b/client/coral-plugin-commentbox/translations.json
@@ -5,7 +5,8 @@
     "comment": "Comment",
     "name": "Name",
     "comment-post-notif": "Your comment has been posted.",
-    "comment-post-notif-premod": "Thank you for posting. Our moderation team will review your comment shortly."
+    "comment-post-notif-premod": "Thank you for posting. Our moderation team will review your comment shortly.",
+    "comment-post-banned-word":  "Your comment contains one or more words which we do not allow. It has been sent to the moderation team for review."
   },
   "es": {
     "post": "Publicar",
@@ -13,6 +14,7 @@
     "comment": "Comentario",
     "name": "Nombre",
     "comment-post-notif": "¡traduceme!",
-    "comment-post-notif-premod": "¡traduceme!"
+    "comment-post-notif-premod": "¡traduceme!",
+    "comment-post-banned-word":  "¡traduceme!"
   }
 }
diff --git a/tests/client/coral-framework/store/itemActions.spec.js b/tests/client/coral-framework/store/itemActions.spec.js
index 45c41025f..6a9b2aeb2 100644
--- a/tests/client/coral-framework/store/itemActions.spec.js
+++ b/tests/client/coral-framework/store/itemActions.spec.js
@@ -131,7 +131,7 @@ describe('itemActions', () => {
               body: JSON.stringify(item.data)
             }
           );
-          expect(id).to.equal('123');
+          expect(id).to.deep.equal({id: '123'});
           expect(store.getActions()[0]).to.deep.equal({
             type: actions.ADD_ITEM,
             item: {

From 0e75319c04f920bdaa645eb3f9c29e0a971781ba Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 1 Dec 2016 21:49:55 -0500
Subject: [PATCH 08/16] Moving banned wordlist text to translations.

---
 .../coral-admin/src/containers/Configure/Wordlist.js  | 11 +++++------
 client/coral-admin/src/translations.json              |  6 +++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/client/coral-admin/src/containers/Configure/Wordlist.js b/client/coral-admin/src/containers/Configure/Wordlist.js
index 7411d71a8..8ffb5920b 100644
--- a/client/coral-admin/src/containers/Configure/Wordlist.js
+++ b/client/coral-admin/src/containers/Configure/Wordlist.js
@@ -1,15 +1,14 @@
 import React from 'react';
-// import I18n from 'coral-framework/modules/i18n/i18n';
-// import translations from '../../translations.json';
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from '../../translations.json';
 import styles from './Configure.css';
 import {
   Card
 } from 'react-mdl';
 
 const Wordlist = ({wordlist, onChangeWordlist}) => <Card id={styles.bannedWordlist} shadow={2}>
-  <p className={styles.bannedWordHeader}>Write the bannned words list</p>
-  <p className={styles.bannedWordText}>Comments which contain these words or phrases, not seperated by commas and not
-  case sensitive, will be automatically removed from the comment stream.</p>
+  <p className={styles.bannedWordHeader}>{lang.t('configure.banned-word-header')}</p>
+  <p className={styles.bannedWordText}>{lang.t('configure.banned-word-text')}</p>
   <textarea
     rows={5}
     type='text'
@@ -20,4 +19,4 @@ const Wordlist = ({wordlist, onChangeWordlist}) => <Card id={styles.bannedWordli
 
 export default Wordlist;
 
-// const lang = new I18n(translations);
+const lang = new I18n(translations);
diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index 10924623b..3452e1c2f 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -37,6 +37,8 @@
       "include-text": "Include your text here.",
       "comment-settings": "Comment Settings",
       "embed-comment-stream": "Embed Comment Stream",
+      "banned-word-header": "Write the bannned words list",
+      "banned-word-text": "Comments which contain these words or phrases, not seperated by commas and not case sensitive, will be automatically removed from the comment stream.",
       "wordlist": "Banned words list",
       "save-changes": "Save Changes",
       "copy-and-paste": "Copy and paste code below into your CMS to embed your comment box in your articles",
@@ -72,7 +74,9 @@
       "include-text": "Incluir tu texto aqui.",
       "comment-settings": "Configuración de Comentarios",
       "embed-comment-stream": "Colocar Hilo de Comentarios",
-      "wordlist": "tracundeme",
+      "wordlist": "¡traduceme!",
+      "banned-word-header": "¡traduceme!",
+      "banned-word-text": "¡traduceme!",
       "save-changes": "Guardar Cambios",
       "copy-and-paste": "Copiar y pegar el código de más abajo en tu CMS para colocar la caja de comentarios en tus articulos",
       "moderate": "Moderar",

From 582c0c0c9e9b8f64c32db21c6315d17551c1a33a Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Tue, 6 Dec 2016 12:53:35 -0500
Subject: [PATCH 09/16] Handling case where child and parent_id are undefined.

---
 client/coral-plugin-commentbox/CommentBox.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index b2cc48381..065b1f9e0 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -39,7 +39,9 @@ class CommentBox extends Component {
       related = 'comments';
       parent_type = 'assets';
     }
-    updateItem(child_id || parent_id, 'showReply', false, 'comments');
+    if (child_id || parent_id) {
+      updateItem(child_id || parent_id, 'showReply', false, 'comments');
+    }
     postItem(comment, 'comments')
     .then(({comment_id, status}) => {
       if (status === 'rejected') {

From 09245403aa670f17789df1148fa004be843aa9b7 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 6 Dec 2016 14:42:09 -1000
Subject: [PATCH 10/16] riley is silly

---
 client/coral-embed-stream/src/CommentStream.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-embed-stream/src/CommentStream.js b/client/coral-embed-stream/src/CommentStream.js
index 0fda9444d..bb1d4e6e0 100644
--- a/client/coral-embed-stream/src/CommentStream.js
+++ b/client/coral-embed-stream/src/CommentStream.js
@@ -70,7 +70,7 @@ class CommentStream extends Component {
     const path = /https?\:\/\/([^?#]+)/.exec(this.pym.parentUrl);
 
     this.props.getStream(path[1] || window.location);
-    this.path = path;
+    this.path = path[1] || window.location;
 
     this.pym.sendMessage('childReady');
   }

From d9d9c5096146a64ef354c4f1db6188b35f1b4fe7 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Tue, 6 Dec 2016 15:52:22 -1000
Subject: [PATCH 11/16] un-sneaking in some stuff

---
 client/coral-embed-stream/src/CommentStream.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-embed-stream/src/CommentStream.js b/client/coral-embed-stream/src/CommentStream.js
index bb1d4e6e0..0fda9444d 100644
--- a/client/coral-embed-stream/src/CommentStream.js
+++ b/client/coral-embed-stream/src/CommentStream.js
@@ -70,7 +70,7 @@ class CommentStream extends Component {
     const path = /https?\:\/\/([^?#]+)/.exec(this.pym.parentUrl);
 
     this.props.getStream(path[1] || window.location);
-    this.path = path[1] || window.location;
+    this.path = path;
 
     this.pym.sendMessage('childReady');
   }

From 8446c49c14dccbfd0c254e5129d4a7a9b7441889 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 8 Dec 2016 13:08:18 -0500
Subject: [PATCH 12/16] Fixing error when posting comment.

---
 client/coral-plugin-commentbox/CommentBox.js | 22 +++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index 89200f9a4..df158b3e1 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -43,16 +43,18 @@ class CommentBox extends Component {
       updateItem(child_id || parent_id, 'showReply', false, 'comments');
     }
     postItem(comment, 'comments')
-    .then(({comment_id, status}) => {
-      if (status === 'rejected') {
-        addNotification('error', lang.t('comment-post-banned-word'));
-      } else if (premod === 'pre') {
-        addNotification('success', lang.t('comment-post-notif-premod'));
-      } else {
-        appendItemArray(parent_id || id, related, comment_id, !parent_id, parent_type);
-        addNotification('success', 'Your comment has been posted.');
-      }
-    })
+      .then((postedComment) => {
+        const commentId = postedComment.id;
+        const status = postedComment.status;
+        if (status === 'rejected') {
+          addNotification('error', lang.t('comment-post-banned-word'));
+        } else if (premod === 'pre') {
+          addNotification('success', lang.t('comment-post-notif-premod'));
+        } else {
+          appendItemArray(parent_id || id, related, commentId, !parent_id, parent_type);
+          addNotification('success', 'Your comment has been posted.');
+        }
+      })
     .catch((err) => console.error(err));
     this.setState({body: ''});
   }

From 6d701ef49e7fa32af1699e1e81bee6b6f7591a5d Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Thu, 8 Dec 2016 13:25:18 -0500
Subject: [PATCH 13/16] Updating to detect new status format.

---
 client/coral-plugin-commentbox/CommentBox.js | 2 +-
 routes/api/comments/index.js                 | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js
index df158b3e1..0167d517f 100644
--- a/client/coral-plugin-commentbox/CommentBox.js
+++ b/client/coral-plugin-commentbox/CommentBox.js
@@ -46,7 +46,7 @@ class CommentBox extends Component {
       .then((postedComment) => {
         const commentId = postedComment.id;
         const status = postedComment.status;
-        if (status === 'rejected') {
+        if (status[0] && status[0].type === 'rejected') {
           addNotification('error', lang.t('comment-post-banned-word'));
         } else if (premod === 'pre') {
           addNotification('success', lang.t('comment-post-notif-premod'));
diff --git a/routes/api/comments/index.js b/routes/api/comments/index.js
index b82c1faf3..32b2cb4cc 100644
--- a/routes/api/comments/index.js
+++ b/routes/api/comments/index.js
@@ -95,7 +95,6 @@ router.post('/', wordlist.filter('body'), (req, res, next) => {
     author_id: req.user.id
   }))
   .then((comment) => {
-
     // The comment was created! Send back the created comment.
     res.status(201).send(comment);
   })

From bfe188eb5c0e346de1163c91b93d93b4510c01f1 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Fri, 9 Dec 2016 13:17:50 -0500
Subject: [PATCH 14/16] Cleaning up from merge.

---
 .../containers/Configure/CommentSettings.js   | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/client/coral-admin/src/containers/Configure/CommentSettings.js b/client/coral-admin/src/containers/Configure/CommentSettings.js
index d9628f352..194af720c 100644
--- a/client/coral-admin/src/containers/Configure/CommentSettings.js
+++ b/client/coral-admin/src/containers/Configure/CommentSettings.js
@@ -11,31 +11,31 @@ import {
   Checkbox
 } from 'react-mdl';
 
-const updateModeration = (props) => () => {
-  const moderation = props.settings.moderation === 'pre' ? 'post' : 'pre';
-  props.updateSettings({moderation});
+const updateModeration = (updateSettings, mod) => () => {
+  const moderation = mod === 'pre' ? 'post' : 'pre';
+  updateSettings({moderation});
 };
 
-const updateInfoBoxEnable = (props) => () => {
-  const infoBoxEnable = !props.settings.infoBoxEnable;
-  props.updateSettings({infoBoxEnable});
+const updateInfoBoxEnable = (updateSettings, infoBox) => () => {
+  const infoBoxEnable = !infoBox;
+  updateSettings({infoBoxEnable});
 };
 
-const updateInfoBoxContent = (props) => (event) => {
+const updateInfoBoxContent = (updateSettings) => (event) => {
   const infoBoxContent =  event.target.value;
-  props.updateSettings({infoBoxContent});
+  updateSettings({infoBoxContent});
 };
 
-const updateClosedMessage = (props) => (event) => {
+const updateClosedMessage = (updateSettings) => (event) => {
   const closedMessage = event.target.value;
-  props.updateSettings({closedMessage});
+  updateSettings({closedMessage});
 };
 
 const CommentSettings = (props) => <List>
   <ListItem className={styles.configSetting}>
     <ListItemAction>
       <Checkbox
-        onClick={updateModeration}
+        onClick={updateModeration(props.updateSettings, props.settings.moderation)}
         checked={props.settings.moderation === 'pre'} />
     </ListItemAction>
     {lang.t('configure.enable-pre-moderation')}
@@ -43,7 +43,7 @@ const CommentSettings = (props) => <List>
   <ListItem threeLine className={styles.configSettingInfoBox}>
     <ListItemAction>
       <Checkbox
-        onClick={updateInfoBoxEnable}
+        onClick={updateInfoBoxEnable(props.updateSettings, props.settings.infoBoxEnable)}
         checked={props.settings.infoBoxEnable} />
     </ListItemAction>
     <ListItemContent>
@@ -53,25 +53,25 @@ const CommentSettings = (props) => <List>
       </p>
     </ListItemContent>
   </ListItem>
+  <ListItem className={`${styles.configSettingInfoBox} ${props.settings.infoBoxEnable ? null : styles.hidden}`} >
+    <ListItemContent>
+      <Textfield
+        onChange={updateInfoBoxContent(props.updateSettings)}
+        value={props.settings.infoBoxContent}
+        label={lang.t('configure.include-text')}
+        rows={3}/>
+    </ListItemContent>
+  </ListItem>
   <ListItem className={styles.configSettingInfoBox}>
     <ListItemContent>
       {lang.t('configure.closed-comments-desc')}
       <Textfield
-        onChange={updateClosedMessage}
+        onChange={updateClosedMessage(props.updateSettings)}
         value={props.settings.closedMessage}
         label={lang.t('configure.closed-comments-label')}
         rows={3}/>
     </ListItemContent>
   </ListItem>
-  <ListItem className={`${styles.configSettingInfoBox} ${this.props.settings.infoBoxEnable ? null : styles.hidden}`} >
-    <ListItemContent>
-      <Textfield
-        onChange={updateInfoBoxContent}
-        value={props.settings.infoBoxContent}
-        label={lang.t('configure.include-text')}
-        rows={3}/>
-    </ListItemContent>
-  </ListItem>
 </List>;
 
 export default CommentSettings;

From d9b778fa74dfc456dc1b735dd53aa350914cce87 Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Fri, 9 Dec 2016 09:19:08 -1000
Subject: [PATCH 15/16] A few translations for the spanish for this feature.

---
 client/coral-admin/src/translations.json         | 6 +++---
 client/coral-plugin-commentbox/translations.json | 6 +++---
 client/coral-plugin-flags/translations.json      | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json
index 23081d32d..849ce0c39 100644
--- a/client/coral-admin/src/translations.json
+++ b/client/coral-admin/src/translations.json
@@ -76,9 +76,9 @@
       "include-text": "Incluir tu texto aqui.",
       "comment-settings": "Configuración de Comentarios",
       "embed-comment-stream": "Colocar Hilo de Comentarios",
-      "wordlist": "¡traduceme!",
-      "banned-word-header": "¡traduceme!",
-      "banned-word-text": "¡traduceme!",
+      "wordlist": "Lista de palabras no permitidas",
+      "banned-word-header": "Escribir las palabras no permitidas",
+      "banned-word-text": "Comentarios que contengan estas palabras o frases, no separadas por comas y en mayusculas o minusuculas, serán automaticamente separadas de los comentarios publicados.",
       "save-changes": "Guardar Cambios",
       "copy-and-paste": "Copiar y pegar el código de más abajo en tu CMS para colocar la caja de comentarios en tus articulos",
       "moderate": "Moderar",
diff --git a/client/coral-plugin-commentbox/translations.json b/client/coral-plugin-commentbox/translations.json
index 2211cbbca..1ba5dfb12 100644
--- a/client/coral-plugin-commentbox/translations.json
+++ b/client/coral-plugin-commentbox/translations.json
@@ -13,8 +13,8 @@
     "reply": "Respuesta",
     "comment": "Comentario",
     "name": "Nombre",
-    "comment-post-notif": "¡traduceme!",
-    "comment-post-notif-premod": "¡traduceme!",
-    "comment-post-banned-word":  "¡traduceme!"
+    "comment-post-notif": "Tu comentario ha sido publicado.",
+    "comment-post-notif-premod": "Gracias por comentar. Nuestro equipo de moderación va a revisarlo muy pronto.",
+    "comment-post-banned-word":  "Tu comentario contiene una o más palabras que son sensibles a nuestros filtros. Ha sido enviado a nuestro equipo de moderación para que lo revisen."
   }
 }
diff --git a/client/coral-plugin-flags/translations.json b/client/coral-plugin-flags/translations.json
index fb2daa883..633b85282 100644
--- a/client/coral-plugin-flags/translations.json
+++ b/client/coral-plugin-flags/translations.json
@@ -9,6 +9,6 @@
     "flag": "Marcar",
     "flagged": "Marcado",
     "flag-notif": "Gracias por marcar este comentario. Nuestro equipo de moderación ha sido notificado y muy pronto lo va a revisar.",
-    "flag-notif-remove": "¡traduceme!"
+    "flag-notif-remove": "Tu marca ha sido eliminada."
   }
 }

From 8b850a8d33e54e39d905413517e5a5484f99d347 Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Fri, 9 Dec 2016 09:29:27 -1000
Subject: [PATCH 16/16] Fix the message.

---
 client/coral-plugin-commentbox/translations.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-plugin-commentbox/translations.json b/client/coral-plugin-commentbox/translations.json
index 1ba5dfb12..73bef0079 100644
--- a/client/coral-plugin-commentbox/translations.json
+++ b/client/coral-plugin-commentbox/translations.json
@@ -6,7 +6,7 @@
     "name": "Name",
     "comment-post-notif": "Your comment has been posted.",
     "comment-post-notif-premod": "Thank you for posting. Our moderation team will review your comment shortly.",
-    "comment-post-banned-word":  "Your comment contains one or more words which we do not allow. It has been sent to the moderation team for review."
+    "comment-post-banned-word":  "Your comment contains one or more words that are not permitted, so it will not be published. If you think this message is incorrect, please contact our moderation team."
   },
   "es": {
     "post": "Publicar",
@@ -15,6 +15,6 @@
     "name": "Nombre",
     "comment-post-notif": "Tu comentario ha sido publicado.",
     "comment-post-notif-premod": "Gracias por comentar. Nuestro equipo de moderación va a revisarlo muy pronto.",
-    "comment-post-banned-word":  "Tu comentario contiene una o más palabras que son sensibles a nuestros filtros. Ha sido enviado a nuestro equipo de moderación para que lo revisen."
+    "comment-post-banned-word":  "Tu comentario contiene una o más palabras que no estan permitidasen nuestro espacio, por lo que no será publicado. Si crees que es un error, por favor contacta a nuestro equipo de moderación."
   }
 }