Merge branch 'master' into feature/talk-plugin-toxic-comments

.gitignore

@@ -12,6 +12,7 @@ client/coral-framework/graphql/introspection.json
 
 .idea/
 *.swp
+*.DS_STORE
 
 test/e2e/reports
 coverage/

plugins/coral-plugin-viewing-options/client/translations.yml

@@ -1,4 +0,0 @@
-en:
-  viewing_options: "Viewing Options"
-es:
-  viewing_options: "Opciones de visualización"

plugins/talk-plugin-offtopic/client/containers/OffTopicFilter.js

@@ -13,7 +13,7 @@ import {
 
 const mapStateToProps = (state) => ({
   commentClassNames: commentClassNamesSelector(state),
-  checked: state.coralPluginOfftopic.checked
+  checked: state.talkPluginOfftopic.checked
 });
 
 const mapDispatchToProps = (dispatch) =>

plugins/talk-plugin-viewing-options/client/components/ViewingOptions.js

@@ -26,7 +26,7 @@ const ViewingOptions = (props) => {
         <div>
           <button className={styles.button} onClick={toggleOpen}>
             <Icon className={styles.filterIcon} name="filter_list" />
-            <span className={styles.filterText}>{t('viewing_options')}</span> 
+            <span className={styles.filterText}>{t('talk-plugin-viewing-options.viewing_options')}</span> 
             {props.open ? <Icon name="arrow_drop_up" className={styles.icon}/> : <Icon name="arrow_drop_down" className={styles.icon}/>}
           </button>
         </div>

plugins/talk-plugin-viewing-options/client/translations.yml

@@ -0,0 +1,6 @@
+en:
+  talk-plugin-viewing-options:
+    viewing_options: "Viewing Options"
+es:
+  talk-plugin-viewing-options:
+    viewing_options: "Opciones de visualización"