From f8758bd755b9d83efbce4e8a213e98dd2f0adac4 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 27 Jul 2017 11:58:36 -0400
Subject: [PATCH 1/5] Fix folders

---
 .gitignore                                                   | 1 +
 plugins/coral-plugin-viewing-options/client/translations.yml | 4 ----
 plugins/talk-plugin-viewing-options/translations.yml         | 0
 3 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 plugins/coral-plugin-viewing-options/client/translations.yml
 create mode 100644 plugins/talk-plugin-viewing-options/translations.yml

diff --git a/.gitignore b/.gitignore
index db7732cf5..f5482fd36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ client/coral-framework/graphql/introspection.json
 
 .idea/
 *.swp
+*.DS_STORE
 
 test/e2e/reports
 coverage/
diff --git a/plugins/coral-plugin-viewing-options/client/translations.yml b/plugins/coral-plugin-viewing-options/client/translations.yml
deleted file mode 100644
index 6ab31fa1b..000000000
--- a/plugins/coral-plugin-viewing-options/client/translations.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-en:
-  viewing_options: "Viewing Options"
-es:
-  viewing_options: "Opciones de visualización"
\ No newline at end of file
diff --git a/plugins/talk-plugin-viewing-options/translations.yml b/plugins/talk-plugin-viewing-options/translations.yml
new file mode 100644
index 000000000..e69de29bb

From 9bd3e6b541238c83e0c75bd0a0876d795df06647 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 27 Jul 2017 12:20:07 -0400
Subject: [PATCH 2/5] Fix translation file

---
 plugins/talk-plugin-viewing-options/client/translations.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/talk-plugin-viewing-options/client/translations.yml b/plugins/talk-plugin-viewing-options/client/translations.yml
index e69de29bb..742754160 100644
--- a/plugins/talk-plugin-viewing-options/client/translations.yml
+++ b/plugins/talk-plugin-viewing-options/client/translations.yml
@@ -0,0 +1,4 @@
+en:
+  viewing_options: "Viewing Options"
+es:
+  viewing_options: "Opciones de visualización"

From cf8528dcf1d9e17c9d02f6e793fc87ddc46f31a6 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Thu, 27 Jul 2017 12:23:18 -0400
Subject: [PATCH 3/5] Remove file

---
 plugins/talk-plugin-viewing-options/translations.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 plugins/talk-plugin-viewing-options/translations.yml

diff --git a/plugins/talk-plugin-viewing-options/translations.yml b/plugins/talk-plugin-viewing-options/translations.yml
deleted file mode 100644
index e69de29bb..000000000

From 447c3aa7cc2a250c58d3aa7a5b2b302990e6269d Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 27 Jul 2017 13:48:03 -0300
Subject: [PATCH 4/5] Wrong reducer name

---
 .../talk-plugin-offtopic/client/containers/OffTopicFilter.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/talk-plugin-offtopic/client/containers/OffTopicFilter.js b/plugins/talk-plugin-offtopic/client/containers/OffTopicFilter.js
index 65431f5c0..9548b764e 100644
--- a/plugins/talk-plugin-offtopic/client/containers/OffTopicFilter.js
+++ b/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) =>

From 47d37e31d8631a7810ecd188ffe4702861e102c3 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Thu, 27 Jul 2017 13:50:14 -0300
Subject: [PATCH 5/5] prefixing translations

---
 .../client/components/ViewingOptions.js                     | 2 +-
 plugins/talk-plugin-viewing-options/client/translations.yml | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/talk-plugin-viewing-options/client/components/ViewingOptions.js b/plugins/talk-plugin-viewing-options/client/components/ViewingOptions.js
index f05cc2eea..8988dd1ec 100644
--- a/plugins/talk-plugin-viewing-options/client/components/ViewingOptions.js
+++ b/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>
diff --git a/plugins/talk-plugin-viewing-options/client/translations.yml b/plugins/talk-plugin-viewing-options/client/translations.yml
index 742754160..d1b1c1896 100644
--- a/plugins/talk-plugin-viewing-options/client/translations.yml
+++ b/plugins/talk-plugin-viewing-options/client/translations.yml
@@ -1,4 +1,6 @@
 en:
-  viewing_options: "Viewing Options"
+  talk-plugin-viewing-options:
+    viewing_options: "Viewing Options"
 es:
-  viewing_options: "Opciones de visualización"
+  talk-plugin-viewing-options:
+    viewing_options: "Opciones de visualización"