From c0c6dd6252e3c7fe8ff5a87d5dc549cc3f3861b3 Mon Sep 17 00:00:00 2001
From: gaba <gabelula@gmail.com>
Date: Mon, 15 May 2017 14:23:56 -0700
Subject: [PATCH] The merge got back some code to the coral-framework.

---
 .../coral-embed-stream/src/components/CountdownSeconds.js  | 7 +++----
 .../src/components/EditableCommentContent.js               | 5 ++---
 client/coral-framework/actions/auth.js                     | 5 ++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/client/coral-embed-stream/src/components/CountdownSeconds.js b/client/coral-embed-stream/src/components/CountdownSeconds.js
index 1b9fca5d5..93ddc2270 100644
--- a/client/coral-embed-stream/src/components/CountdownSeconds.js
+++ b/client/coral-embed-stream/src/components/CountdownSeconds.js
@@ -1,8 +1,7 @@
 import React, {PropTypes} from 'react';
-import I18n from 'coral-framework/modules/i18n/i18n';
-import translations from 'coral-framework/translations';
+import I18n from 'coral-i18n/modules/i18n/i18n';
 
-const lang = new I18n(translations);
+const lang = new I18n();
 
 /**
  * Countdown the number of seconds until a given Date
@@ -30,7 +29,7 @@ export class CountdownSeconds extends React.Component {
   componentWillUnmount() {
     if (this.countdownInterval) {
       this.countdownInterval = clearInterval(this.countdownInterval);
-    }    
+    }
   }
   render() {
     const now = new Date();
diff --git a/client/coral-embed-stream/src/components/EditableCommentContent.js b/client/coral-embed-stream/src/components/EditableCommentContent.js
index 186317393..0b79a05f1 100644
--- a/client/coral-embed-stream/src/components/EditableCommentContent.js
+++ b/client/coral-embed-stream/src/components/EditableCommentContent.js
@@ -6,9 +6,8 @@ import {CountdownSeconds} from './CountdownSeconds';
 import {getEditableUntilDate} from './util';
 
 import {Icon} from 'coral-ui';
-import I18n from 'coral-framework/modules/i18n/i18n';
-import translations from 'coral-framework/translations';
-const lang = new I18n(translations);
+import I18n from 'coral-i18n/modules/i18n/i18n';
+const lang = new I18n();
 
 /**
  * Renders a Comment's body in such a way that the end-user can edit it and save changes
diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index abb5fd79e..acbe91e5a 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -4,9 +4,8 @@ import * as actions from '../constants/auth';
 import coralApi, {base} from '../helpers/response';
 import jwtDecode from 'jwt-decode';
 
-const lang = new I18n(translations);
-import translations from './../translations';
-import I18n from '../../coral-framework/modules/i18n/i18n';
+const lang = new I18n();
+import I18n from '../../coral-i18n/modules/i18n/i18n';
 
 // Dialog Actions
 export const showSignInDialog = () => (dispatch) => {