From e2cba32b15b974d076557223d200b710540b1d6b Mon Sep 17 00:00:00 2001
From: SachaG <358832+SachaG@users.noreply.github.com>
Date: Thu, 10 May 2018 09:38:25 +0900
Subject: [PATCH] Clean up

---
 packages/vulcan-core/lib/modules/components/App.jsx          | 4 ++--
 packages/vulcan-i18n/lib/modules/index.js                    | 1 -
 packages/vulcan-lib/lib/client/main.js                       | 2 +-
 .../detect.js => vulcan-lib/lib/modules/detect_locale.js}    | 5 +++++
 packages/vulcan-lib/lib/modules/index.js                     | 1 +
 packages/vulcan-routing/lib/server/router.jsx                | 2 --
 6 files changed, 9 insertions(+), 6 deletions(-)
 rename packages/{vulcan-i18n/lib/modules/detect.js => vulcan-lib/lib/modules/detect_locale.js} (91%)

diff --git a/packages/vulcan-core/lib/modules/components/App.jsx b/packages/vulcan-core/lib/modules/components/App.jsx
index 11298206a..500972d86 100644
--- a/packages/vulcan-core/lib/modules/components/App.jsx
+++ b/packages/vulcan-core/lib/modules/components/App.jsx
@@ -1,7 +1,7 @@
-import { Components, registerComponent, getSetting, Strings, runCallbacks } from 'meteor/vulcan:lib';
+import { Components, registerComponent, getSetting, Strings, runCallbacks, detectLocale } from 'meteor/vulcan:lib';
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { IntlProvider, intlShape, detectLocale } from 'meteor/vulcan:i18n';
+import { IntlProvider, intlShape } from 'meteor/vulcan:i18n';
 import withCurrentUser from '../containers/withCurrentUser.js';
 
 class App extends PureComponent {
diff --git a/packages/vulcan-i18n/lib/modules/index.js b/packages/vulcan-i18n/lib/modules/index.js
index 3816ff24e..71a833b71 100644
--- a/packages/vulcan-i18n/lib/modules/index.js
+++ b/packages/vulcan-i18n/lib/modules/index.js
@@ -4,5 +4,4 @@ registerSetting('locale', 'en', 'Your app\'s locale (“en”, “fr”, etc.)')
 
 export { default as FormattedMessage } from './message.js';
 export { intlShape } from './shape.js';
-export * from './detect.js';
 export { default as IntlProvider } from './provider.js';
\ No newline at end of file
diff --git a/packages/vulcan-lib/lib/client/main.js b/packages/vulcan-lib/lib/client/main.js
index a355ea23f..6c38a996e 100644
--- a/packages/vulcan-lib/lib/client/main.js
+++ b/packages/vulcan-lib/lib/client/main.js
@@ -3,4 +3,4 @@ import './auth.js';
 export * from '../modules/index.js';
 export * from './mongo_redux.js';
 export * from './render_context.js';
-export * from './inject_data.js';
+export * from './inject_data.js';
\ No newline at end of file
diff --git a/packages/vulcan-i18n/lib/modules/detect.js b/packages/vulcan-lib/lib/modules/detect_locale.js
similarity index 91%
rename from packages/vulcan-i18n/lib/modules/detect.js
rename to packages/vulcan-lib/lib/modules/detect_locale.js
index 84c733f8f..a9220bb8f 100644
--- a/packages/vulcan-i18n/lib/modules/detect.js
+++ b/packages/vulcan-lib/lib/modules/detect_locale.js
@@ -1,3 +1,8 @@
+/*
+
+Helper to detect current browser locale
+
+*/
 export const detectLocale = () => {
   var lang
 
diff --git a/packages/vulcan-lib/lib/modules/index.js b/packages/vulcan-lib/lib/modules/index.js
index 6bef5dd8e..6cb45833a 100644
--- a/packages/vulcan-lib/lib/modules/index.js
+++ b/packages/vulcan-lib/lib/modules/index.js
@@ -28,4 +28,5 @@ export * from './debug.js';
 export * from './startup.js';
 export * from './errors.js';
 export * from './intl.js';
+export * from './detect_locale.js';
 // export * from './resolvers.js';
diff --git a/packages/vulcan-routing/lib/server/router.jsx b/packages/vulcan-routing/lib/server/router.jsx
index 52d8a64b8..cc127e8f4 100644
--- a/packages/vulcan-routing/lib/server/router.jsx
+++ b/packages/vulcan-routing/lib/server/router.jsx
@@ -111,8 +111,6 @@ function sendSSRHtml(options, req, res, next, renderProps) {
 
   req.dynamicBody += `<${options.rootElementType || 'div'} id="${options.rootElement || 'react-app'}"${rootElementAttributes}>${html || ''}</${options.rootElementType || 'div'}>`;
 
-  console.log(req.headers['accept-language'])
-
   if (typeof options.htmlHook === 'function') {
     const { dynamicHead, dynamicBody } = options.htmlHook(req, res, req.dynamicHead, req.dynamicBody);
     req.dynamicHead = dynamicHead;