diff --git a/client/coral-plugin-permalinks/PermalinkButton.js b/client/coral-plugin-permalinks/PermalinkButton.js
index 97e19cc5b..8cab70b0d 100644
--- a/client/coral-plugin-permalinks/PermalinkButton.js
+++ b/client/coral-plugin-permalinks/PermalinkButton.js
@@ -4,7 +4,7 @@ const name = 'coral-plugin-permalinks';
import {Button} from 'coral-ui';
import styles from './styles.css';
-import t from 'coral-i18n/services/i18n';
+import t from 'coral-framework/services/i18n';
class PermalinkButton extends React.Component {
diff --git a/client/coral-plugin-pubdate/PubDate.js b/client/coral-plugin-pubdate/PubDate.js
index 0445076e3..6604f3523 100644
--- a/client/coral-plugin-pubdate/PubDate.js
+++ b/client/coral-plugin-pubdate/PubDate.js
@@ -1,5 +1,5 @@
import React from 'react';
-import {timeago} from 'coral-i18n/services/i18n';
+import {timeago} from 'coral-framework/services/i18n';
const name = 'coral-plugin-pubdate';
diff --git a/client/coral-plugin-replies/ReplyButton.js b/client/coral-plugin-replies/ReplyButton.js
index 2a28b7174..6fb6a5aca 100644
--- a/client/coral-plugin-replies/ReplyButton.js
+++ b/client/coral-plugin-replies/ReplyButton.js
@@ -1,6 +1,6 @@
import React, {PropTypes} from 'react';
-import t from 'coral-i18n/services/i18n';
+import t from 'coral-framework/services/i18n';
import classnames from 'classnames';
diff --git a/client/coral-settings/components/NotLoggedIn.js b/client/coral-settings/components/NotLoggedIn.js
index eaabe75b5..38bd15977 100644
--- a/client/coral-settings/components/NotLoggedIn.js
+++ b/client/coral-settings/components/NotLoggedIn.js
@@ -1,7 +1,7 @@
import React from 'react';
import styles from './NotLoggedIn.css';
-import t from 'coral-i18n/services/i18n';
+import t from 'coral-framework/services/i18n';
export default ({showSignInDialog}) => (
diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-settings/containers/ProfileContainer.js
index 37c5991b3..4858752de 100644
--- a/client/coral-settings/containers/ProfileContainer.js
+++ b/client/coral-settings/containers/ProfileContainer.js
@@ -12,7 +12,7 @@ import {Spinner} from 'coral-ui';
import CommentHistory from 'coral-plugin-history/CommentHistory';
import {showSignInDialog, checkLogin} from 'coral-framework/actions/auth';
-import t from 'coral-i18n/services/i18n';
+import t from 'coral-framework/services/i18n';
class ProfileContainer extends Component {
constructor() {
diff --git a/client/coral-sign-in/components/CreateUsernameDialog.js b/client/coral-sign-in/components/CreateUsernameDialog.js
index ebe2212de..c3e640218 100644
--- a/client/coral-sign-in/components/CreateUsernameDialog.js
+++ b/client/coral-sign-in/components/CreateUsernameDialog.js
@@ -6,7 +6,7 @@ import FakeComment from './FakeComment';
import styles from './styles.css';
-import t from 'coral-i18n/services/i18n';
+import t from 'coral-framework/services/i18n';
const CreateUsernameDialog = ({open, handleClose, formData, handleSubmitUsername, handleChange, ...props}) => {
return (
diff --git a/client/coral-sign-in/components/FakeComment.js b/client/coral-sign-in/components/FakeComment.js
index f1faedc68..b73532591 100644
--- a/client/coral-sign-in/components/FakeComment.js
+++ b/client/coral-sign-in/components/FakeComment.js
@@ -5,7 +5,7 @@ import AuthorName from 'coral-plugin-author-name/AuthorName';
import Content from 'coral-plugin-commentcontent/CommentContent';
import PubDate from 'coral-plugin-pubdate/PubDate';
import {ReplyButton} from 'coral-plugin-replies';
-import t from 'coral-i18n/services/i18n';
+import t from 'coral-framework/services/i18n';
class FakeComment extends React.Component {
constructor (props) {
diff --git a/client/coral-sign-in/components/ForgotContent.js b/client/coral-sign-in/components/ForgotContent.js
index ca915c833..502335c01 100644
--- a/client/coral-sign-in/components/ForgotContent.js
+++ b/client/coral-sign-in/components/ForgotContent.js
@@ -1,7 +1,7 @@
import React from 'react';
import styles from './styles.css';
import Button from 'coral-ui/components/Button';
-import t from 'coral-i18n/services/i18n';
+import t from 'coral-framework/services/i18n';
class ForgotContent extends React.Component {
constructor (props) {
diff --git a/client/coral-sign-in/components/SignInContent.js b/client/coral-sign-in/components/SignInContent.js
index ef76c70c2..1349fda6f 100644
--- a/client/coral-sign-in/components/SignInContent.js
+++ b/client/coral-sign-in/components/SignInContent.js
@@ -1,7 +1,7 @@
import React, {PropTypes} from 'react';
import {Button, TextField, Spinner, Success, Alert} from 'coral-ui';
import styles from './styles.css';
-import t from 'coral-i18n/services/i18n';
+import t from 'coral-framework/services/i18n';
const SignInContent = ({
handleChange,
diff --git a/client/coral-sign-in/components/SignUpContent.js b/client/coral-sign-in/components/SignUpContent.js
index 23164f860..7d3c7a4ca 100644
--- a/client/coral-sign-in/components/SignUpContent.js
+++ b/client/coral-sign-in/components/SignUpContent.js
@@ -1,7 +1,7 @@
import React, {PropTypes} from 'react';
import {Button, TextField, Spinner, Success, Alert} from 'coral-ui';
import styles from './styles.css';
-import t from 'coral-i18n/services/i18n';
+import t from 'coral-framework/services/i18n';
class SignUpContent extends React.Component {
diff --git a/client/coral-sign-in/components/UserBox.js b/client/coral-sign-in/components/UserBox.js
index 679599816..4fe420cfc 100644
--- a/client/coral-sign-in/components/UserBox.js
+++ b/client/coral-sign-in/components/UserBox.js
@@ -1,6 +1,6 @@
import React from 'react';
import styles from './styles.css';
-import t from 'coral-i18n/services/i18n';
+import t from 'coral-framework/services/i18n';
const UserBox = ({className, user, onLogout, onShowProfile}) => (
diff --git a/client/coral-sign-in/containers/ChangeUsernameContainer.js b/client/coral-sign-in/containers/ChangeUsernameContainer.js
index 5082eace9..d9cffa962 100644
--- a/client/coral-sign-in/containers/ChangeUsernameContainer.js
+++ b/client/coral-sign-in/containers/ChangeUsernameContainer.js
@@ -6,7 +6,7 @@ import errorMsj from 'coral-framework/helpers/error';
import CreateUsernameDialog from '../components/CreateUsernameDialog';
-import t from 'coral-i18n/services/i18n';
+import t from 'coral-framework/services/i18n';
import {
showCreateUsernameDialog,
diff --git a/client/coral-sign-in/containers/SignInContainer.js b/client/coral-sign-in/containers/SignInContainer.js
index 1350b423a..054319d73 100644
--- a/client/coral-sign-in/containers/SignInContainer.js
+++ b/client/coral-sign-in/containers/SignInContainer.js
@@ -5,7 +5,7 @@ import validate from 'coral-framework/helpers/validate';
import errorMsj from 'coral-framework/helpers/error';
import {pym} from 'coral-framework';
-import t from 'coral-i18n/services/i18n';
+import t from 'coral-framework/services/i18n';
import {
changeView,
diff --git a/plugins/coral-plugin-like/client/components/LikeButton.js b/plugins/coral-plugin-like/client/components/LikeButton.js
index 3360cbccf..f042faffa 100644
--- a/plugins/coral-plugin-like/client/components/LikeButton.js
+++ b/plugins/coral-plugin-like/client/components/LikeButton.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
import styles from './style.css';
import Icon from './Icon';
-import t from 'coral-i18n/services/i18n';
+import t from 'coral-framework/services/i18n';
import cn from 'classnames';
import translations from '../translations.json';
import { getMyActionSummary, getTotalActionCount } from 'coral-framework/utils';
diff --git a/plugins/coral-plugin-like/client/index.js b/plugins/coral-plugin-like/client/index.js
index 1f4c745b8..f68599db3 100644
--- a/plugins/coral-plugin-like/client/index.js
+++ b/plugins/coral-plugin-like/client/index.js
@@ -1,7 +1,7 @@
import LikeButton from './containers/LikeButton';
import translations from './translations.json';
-import {loadTranslations} from '/coral-i18n/services/i18n';
+import {loadTranslations} from '/coral-framework/services/i18n';
Promise.all([loadTranslations(translations)]);
diff --git a/plugins/coral-plugin-love/client/LoveButton.js b/plugins/coral-plugin-love/client/LoveButton.js
index aad5cbf08..684ef41c8 100644
--- a/plugins/coral-plugin-love/client/LoveButton.js
+++ b/plugins/coral-plugin-love/client/LoveButton.js
@@ -1,7 +1,7 @@
import React from 'react';
import {Icon} from 'coral-ui';
import styles from './styles.css';
-import t from 'coral-i18n/services/i18n';
+import t from 'coral-framework/services/i18n';
import {withReaction} from 'coral-plugin-api';
class LoveButton extends React.Component {
diff --git a/plugins/coral-plugin-love/client/index.js b/plugins/coral-plugin-love/client/index.js
index 84f1d88c6..671fd2f5a 100644
--- a/plugins/coral-plugin-love/client/index.js
+++ b/plugins/coral-plugin-love/client/index.js
@@ -1,7 +1,7 @@
import LoveButton from './LoveButton';
import translations from './translations.json';
-import {loadTranslations} from '/coral-i18n/services/i18n';
+import {loadTranslations} from '/coral-framework/services/i18n';
Promise.all([loadTranslations(translations)]);
diff --git a/plugins/coral-plugin-respect/client/components/RespectButton.js b/plugins/coral-plugin-respect/client/components/RespectButton.js
index 3f53891ca..9bce367f4 100644
--- a/plugins/coral-plugin-respect/client/components/RespectButton.js
+++ b/plugins/coral-plugin-respect/client/components/RespectButton.js
@@ -2,7 +2,7 @@ import React, {Component} from 'react';
import styles from './style.css';
import Icon from './Icon';
-import t from 'coral-i18n/services/i18n';
+import t from 'coral-framework/services/i18n';
import cn from 'classnames';
import {getMyActionSummary, getTotalActionCount} from 'coral-framework/utils';
diff --git a/plugins/coral-plugin-respect/client/index.js b/plugins/coral-plugin-respect/client/index.js
index e76ecbd15..4fe209940 100644
--- a/plugins/coral-plugin-respect/client/index.js
+++ b/plugins/coral-plugin-respect/client/index.js
@@ -1,7 +1,7 @@
import RespectButton from './containers/RespectButton';
import translations from './translations.json';
-import {loadTranslations} from 'coral-i18n/services/i18n';
+import {loadTranslations} from 'coral-framework/services/i18n';
loadTranslations(translations);
diff --git a/webpack.config.js b/webpack.config.js
index 26b0c928a..b3f8295c4 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -24,6 +24,8 @@ if (process.env.TALK_PLUGINS_JSON && process.env.TALK_PLUGINS_JSON.length > 0) {
pluginsConfigPath = defaultPlugins;
}
+let localesPath = path.join(__dirname, 'locales');
+
console.log(`Using ${pluginsConfigPath} as the plugin configuration path`);
// Edit the build targets and embeds below.
@@ -119,7 +121,7 @@ const config = {
},
{
loader: 'yaml',
- include: path.resolve('locales'),
+ include: localesPath,
test: /\.yml$/,
}
]