From 984b2acac49d882405d90517f561ad28744f15f4 Mon Sep 17 00:00:00 2001
From: Belen Curcio <curciobelen@gmail.com>
Date: Fri, 11 Nov 2016 22:38:15 -0300
Subject: [PATCH] =?UTF-8?q?=C3=81dding=20Traslations=20and=20Same=20Origin?=
 =?UTF-8?q?=20Requests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/coral-framework/actions/auth.js    |  9 +++------
 client/coral-framework/helpers/index.js   | 13 ++++++++-----
 client/coral-sign-in/components/SignIn.js |  8 ++++++--
 client/coral-sign-in/translations.js      | 14 ++++++++++++++
 4 files changed, 31 insertions(+), 13 deletions(-)
 create mode 100644 client/coral-sign-in/translations.js

diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js
index 9b1053161..fb5e8d3d7 100644
--- a/client/coral-framework/actions/auth.js
+++ b/client/coral-framework/actions/auth.js
@@ -1,5 +1,5 @@
 import * as actions from '../constants/auth';
-import {base, handleResp} from '../helpers';
+import {base, handleResp, getInit} from '../helpers';
 
 export const loginFacebook = () => dispatch => {
   dispatch(loginFacebookRequest());
@@ -30,10 +30,7 @@ export const loginFacebookCallback = (err, data) => {
 
 export const logout = () => dispatch => {
   dispatch(logoutRequest());
-  fetch(`${base}/api/v1/auth`, {
-    method: 'DELETE',
-    credentials: 'same-origin'
-  })
+  fetch(`${base}/auth`, getInit('DELETE'))
   .then(handleResp)
   .then(() => dispatch(dispatch(logoutSuccess())))
   .catch(error => dispatch(logoutFailure(error)));
@@ -44,7 +41,7 @@ const logoutRequest = () => ({
 });
 
 const logoutSuccess = () => ({
-  type: actions.USER_LOGOUT_SUCCESS
+  type: actions.USER_LOGOUT_SUCCESS,
 });
 
 const logoutFailure = (error) => ({
diff --git a/client/coral-framework/helpers/index.js b/client/coral-framework/helpers/index.js
index 439ba5a8a..bccfc5a04 100644
--- a/client/coral-framework/helpers/index.js
+++ b/client/coral-framework/helpers/index.js
@@ -1,12 +1,15 @@
 export const base = '/api/v1';
 
 export const getInit = (method, body) => {
-  const headers = new Headers({
-    'Content-Type': 'application/json',
-    'Accept': 'application/json'
-  });
+  let init = {
+    method,
+    headers: new Headers({
+      'Content-Type': 'application/json',
+      'Accept': 'application/json'
+    }),
+    credentials: 'same-origin'
+  };
 
-  const init = {method, headers};
   if (method.toLowerCase() !== 'get') {
     init.body = JSON.stringify(body);
   }
diff --git a/client/coral-sign-in/components/SignIn.js b/client/coral-sign-in/components/SignIn.js
index 61f1e387e..52b6ba19d 100644
--- a/client/coral-sign-in/components/SignIn.js
+++ b/client/coral-sign-in/components/SignIn.js
@@ -1,13 +1,17 @@
 import React from 'react';
 import Button from './Button';
+import I18n from 'coral-framework/modules/i18n/i18n';
+import translations from '../translations';
+
+const lang = new I18n(translations);
 
 const SignIn = ({openFacebookWindow, logout}) => (
   <div>
     <Button type="facebook" onClick={openFacebookWindow}>
-      Continue with Facebook
+      {lang.t('signIn.facebookLogin')}
     </Button>
     <a onClick={logout}>
-      Logout
+      {lang.t('signIn.logout')}
     </a>
   </div>
 );
diff --git a/client/coral-sign-in/translations.js b/client/coral-sign-in/translations.js
new file mode 100644
index 000000000..16e3a0425
--- /dev/null
+++ b/client/coral-sign-in/translations.js
@@ -0,0 +1,14 @@
+export default {
+  en: {
+    'signIn': {
+      facebookLogin: 'Continue with Facebook',
+      logout: 'Logout'
+    }
+  },
+  es: {
+    'signIn': {
+      facebookLogin: 'Continuar con Facebook',
+      logout: 'Salir'
+    }
+  }
+};