Merge issues

plugins/coral-plugin-offtopic/client/components/OffTopicCheckbox.js

@@ -4,13 +4,16 @@ import {bindActionCreators} from 'redux';
 import {addTag, removeTag, clearTags} from 'coral-plugin-commentbox/actions';
 import styles from './styles.css';
 
+import t from 'coral-framework/services/i18n';
+
 class OffTopicCheckbox extends React.Component {
 
   label = 'OFF_TOPIC';
 
   componentDidMount() {
-    this.clearTagsHook = this.props.registerHook('postSubmit', (data) => {
-      this.props.clearTags();
+    this.clearTagsHook = this.props.registerHook('postSubmit', () => {
+      const idx = this.props.commentBox.tags.indexOf(this.label);
+      this.props.removeTag(idx);
     });
   }
 
@@ -20,7 +23,7 @@ class OffTopicCheckbox extends React.Component {
 
   handleChange = (e) => {
     if (e.target.checked) {
-      this.props.addTag(this.label)
+      this.props.addTag(this.label);
     } else {
       const idx = this.props.commentBox.tags.indexOf(this.label);
       this.props.removeTag(idx);
@@ -32,17 +35,16 @@ class OffTopicCheckbox extends React.Component {
       <div className={styles.offTopic}>
         <label className={styles.offTopicLabel}>
           <input type="checkbox" onChange={this.handleChange}/>
-          Off-Topic
+          {t('off_topic')}
         </label>
       </div>
-    )
+    );
   }
 }
 
-
 const mapStateToProps = ({commentBox}) => ({commentBox});
 
-const mapDispatchToProps = dispatch =>
-  bindActionCreators({addTag, removeTag, clearTags}, dispatch);
+const mapDispatchToProps = (dispatch) =>
+  bindActionCreators({addTag, removeTag}, dispatch);
 
 export default connect(mapStateToProps, mapDispatchToProps)(OffTopicCheckbox);