From 9be443eda8af095e95c45122e186e55749cbdc3f Mon Sep 17 00:00:00 2001 From: gaba Date: Fri, 19 May 2017 12:28:44 -0700 Subject: [PATCH] Moves i18n into coral-framework. --- client/coral-admin/src/components/AdminLogin.js | 2 +- client/coral-admin/src/components/BanUserButton.js | 2 +- client/coral-admin/src/components/BanUserDialog.js | 2 +- client/coral-admin/src/components/CountdownTimer.js | 2 +- client/coral-admin/src/components/ModerationKeysModal.js | 2 +- client/coral-admin/src/components/ui/Drawer.js | 2 +- client/coral-admin/src/components/ui/Header.js | 2 +- .../coral-admin/src/containers/Community/FlaggedAccounts.js | 2 +- client/coral-admin/src/containers/Community/Loading.js | 2 +- client/coral-admin/src/containers/Community/People.js | 2 +- client/coral-admin/src/containers/Community/Table.js | 2 +- .../src/containers/Community/components/BanUserDialog.js | 2 +- .../src/containers/Community/components/CommunityMenu.js | 2 +- .../src/containers/Community/components/SuspendUserDialog.js | 2 +- .../coral-admin/src/containers/Community/components/User.js | 2 +- client/coral-admin/src/containers/Configure/Configure.js | 2 +- client/coral-admin/src/containers/Configure/Domainlist.js | 2 +- client/coral-admin/src/containers/Configure/EmbedLink.js | 2 +- .../src/containers/Configure/ModerationSettings.js | 2 +- client/coral-admin/src/containers/Configure/StreamSettings.js | 2 +- client/coral-admin/src/containers/Configure/TechSettings.js | 2 +- client/coral-admin/src/containers/Configure/Wordlist.js | 2 +- client/coral-admin/src/containers/Dashboard/ActivityWidget.js | 2 +- client/coral-admin/src/containers/Dashboard/FlagWidget.js | 2 +- client/coral-admin/src/containers/Dashboard/LikeWidget.js | 2 +- .../src/containers/Dashboard/MostLikedCommentsWidget.js | 2 +- .../Install/components/Steps/AddOrganizationName.js | 2 +- .../containers/Install/components/Steps/CreateYourAccount.js | 2 +- .../src/containers/Install/components/Steps/FinalStep.js | 2 +- .../src/containers/Install/components/Steps/InitialStep.js | 2 +- .../Install/components/Steps/PermittedDomainsStep.js | 2 +- .../src/containers/ModerationQueue/ModerationQueue.js | 2 +- .../src/containers/ModerationQueue/components/Comment.js | 2 +- .../src/containers/ModerationQueue/components/CommentCount.js | 2 +- .../src/containers/ModerationQueue/components/FlagBox.js | 2 +- .../containers/ModerationQueue/components/ModerationMenu.js | 2 +- client/coral-admin/src/containers/Stories/Stories.js | 2 +- client/coral-admin/src/containers/Streams/Stories.js | 2 +- client/coral-configure/components/CloseCommentsInfo.js | 2 +- client/coral-configure/components/ConfigureCommentStream.js | 2 +- client/coral-configure/containers/ConfigureStreamContainer.js | 2 +- client/coral-embed-stream/src/components/CountdownSeconds.js | 2 +- .../src/components/EditableCommentContent.js | 2 +- client/coral-embed-stream/src/components/Embed.js | 2 +- .../src/components/IgnoredCommentTombstone.js | 2 +- client/coral-embed-stream/src/components/LoadMore.js | 2 +- client/coral-embed-stream/src/components/NewCount.js | 2 +- client/coral-embed-stream/src/index.js | 2 +- client/coral-framework/actions/asset.js | 2 +- client/coral-framework/actions/auth.js | 2 +- client/coral-framework/actions/user.js | 2 +- client/coral-framework/components/RestrictedContent.js | 2 +- client/coral-framework/components/SuspendedAccount.js | 2 +- client/coral-framework/helpers/error.js | 2 +- client/coral-framework/index.js | 2 +- client/{coral-i18n => coral-framework}/locales/en.yml | 0 client/{coral-i18n => coral-framework}/locales/es.yml | 0 client/{coral-i18n => coral-framework}/services/i18n.js | 0 client/coral-plugin-best/BestButton.js | 2 +- client/coral-plugin-comment-count/CommentCount.js | 2 +- client/coral-plugin-commentbox/CommentBox.js | 2 +- client/coral-plugin-commentbox/CommentForm.js | 2 +- client/coral-plugin-flags/FlagButton.js | 2 +- client/coral-plugin-flags/FlagComment.js | 2 +- client/coral-plugin-moderation/ModerationLink.js | 2 +- client/coral-plugin-permalinks/PermalinkButton.js | 2 +- client/coral-plugin-pubdate/PubDate.js | 2 +- client/coral-plugin-replies/ReplyButton.js | 2 +- client/coral-settings/components/NotLoggedIn.js | 2 +- client/coral-settings/containers/ProfileContainer.js | 2 +- client/coral-sign-in/components/CreateUsernameDialog.js | 2 +- client/coral-sign-in/components/FakeComment.js | 2 +- client/coral-sign-in/components/ForgotContent.js | 2 +- client/coral-sign-in/components/SignInContent.js | 2 +- client/coral-sign-in/components/SignUpContent.js | 2 +- client/coral-sign-in/components/UserBox.js | 2 +- client/coral-sign-in/containers/ChangeUsernameContainer.js | 2 +- client/coral-sign-in/containers/SignInContainer.js | 2 +- plugins/coral-plugin-like/client/components/LikeButton.js | 2 +- plugins/coral-plugin-like/client/index.js | 2 +- plugins/coral-plugin-love/client/LoveButton.js | 2 +- plugins/coral-plugin-love/client/index.js | 2 +- .../coral-plugin-respect/client/components/RespectButton.js | 2 +- plugins/coral-plugin-respect/client/index.js | 2 +- webpack.config.js | 4 +++- 85 files changed, 84 insertions(+), 82 deletions(-) rename client/{coral-i18n => coral-framework}/locales/en.yml (100%) rename client/{coral-i18n => coral-framework}/locales/es.yml (100%) rename client/{coral-i18n => coral-framework}/services/i18n.js (100%) diff --git a/client/coral-admin/src/components/AdminLogin.js b/client/coral-admin/src/components/AdminLogin.js index 0de782fb1..f63a0014d 100644 --- a/client/coral-admin/src/components/AdminLogin.js +++ b/client/coral-admin/src/components/AdminLogin.js @@ -2,7 +2,7 @@ import React, {PropTypes} from 'react'; import Layout from 'coral-admin/src/components/ui/Layout'; import styles from './NotFound.css'; import {Button, TextField, Alert, Success} from 'coral-ui'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; import Recaptcha from 'react-recaptcha'; class AdminLogin extends React.Component { diff --git a/client/coral-admin/src/components/BanUserButton.js b/client/coral-admin/src/components/BanUserButton.js index 4a5f8f391..cc4935204 100644 --- a/client/coral-admin/src/components/BanUserButton.js +++ b/client/coral-admin/src/components/BanUserButton.js @@ -2,7 +2,7 @@ import React, {PropTypes} from 'react'; import {Button, Icon} from 'coral-ui'; import styles from './BanUserButton.css'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const BanUserButton = ({user, ...props}) => (
diff --git a/client/coral-admin/src/components/BanUserDialog.js b/client/coral-admin/src/components/BanUserDialog.js index 1234c6d48..33d3a2ab4 100644 --- a/client/coral-admin/src/components/BanUserDialog.js +++ b/client/coral-admin/src/components/BanUserDialog.js @@ -4,7 +4,7 @@ import styles from './BanUserDialog.css'; import Button from 'coral-ui/components/Button'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const onBanClick = (userId, commentId, commentStatus, handleBanUser, rejectComment, handleClose) => (e) => { e.preventDefault(); diff --git a/client/coral-admin/src/components/CountdownTimer.js b/client/coral-admin/src/components/CountdownTimer.js index 970757ca2..a1bf32769 100644 --- a/client/coral-admin/src/components/CountdownTimer.js +++ b/client/coral-admin/src/components/CountdownTimer.js @@ -2,7 +2,7 @@ import React, {PropTypes} from 'react'; import styles from 'coral-admin/src/containers/Dashboard/Dashboard.css'; import {Icon} from 'coral-ui'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const refreshIntervalSeconds = 60 * 5; class CountdownTimer extends React.Component { diff --git a/client/coral-admin/src/components/ModerationKeysModal.js b/client/coral-admin/src/components/ModerationKeysModal.js index b83099125..fabd5098c 100644 --- a/client/coral-admin/src/components/ModerationKeysModal.js +++ b/client/coral-admin/src/components/ModerationKeysModal.js @@ -1,7 +1,7 @@ import React, {PropTypes} from 'react'; import Modal from 'components/Modal'; import styles from './ModerationKeysModal.css'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const shortcuts = [ { diff --git a/client/coral-admin/src/components/ui/Drawer.js b/client/coral-admin/src/components/ui/Drawer.js index fcdfeef25..49f658c52 100644 --- a/client/coral-admin/src/components/ui/Drawer.js +++ b/client/coral-admin/src/components/ui/Drawer.js @@ -2,7 +2,7 @@ import React, {PropTypes} from 'react'; import {Navigation, Drawer} from 'react-mdl'; import {IndexLink, Link} from 'react-router'; import styles from './Drawer.css'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const CoralDrawer = ({handleLogout, restricted = false}) => ( diff --git a/client/coral-admin/src/components/ui/Header.js b/client/coral-admin/src/components/ui/Header.js index 71cf4cba8..673c75d61 100644 --- a/client/coral-admin/src/components/ui/Header.js +++ b/client/coral-admin/src/components/ui/Header.js @@ -2,7 +2,7 @@ import React, {PropTypes} from 'react'; import {Navigation, Header, IconButton, MenuItem, Menu} from 'react-mdl'; import {Link, IndexLink} from 'react-router'; import styles from './Header.css'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; import {Logo} from './Logo'; const CoralHeader = ({handleLogout, showShortcuts = () => {}, restricted = false}) => ( diff --git a/client/coral-admin/src/containers/Community/FlaggedAccounts.js b/client/coral-admin/src/containers/Community/FlaggedAccounts.js index 159cbd33d..222ace8bb 100644 --- a/client/coral-admin/src/containers/Community/FlaggedAccounts.js +++ b/client/coral-admin/src/containers/Community/FlaggedAccounts.js @@ -1,6 +1,6 @@ import React from 'react'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; import styles from './Community.css'; import Loading from './Loading'; import EmptyCard from 'coral-admin/src/components/EmptyCard'; diff --git a/client/coral-admin/src/containers/Community/Loading.js b/client/coral-admin/src/containers/Community/Loading.js index 03b1de522..72353a619 100644 --- a/client/coral-admin/src/containers/Community/Loading.js +++ b/client/coral-admin/src/containers/Community/Loading.js @@ -1,6 +1,6 @@ import React from 'react'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const Loading = () => (

{t('loading_results')}

diff --git a/client/coral-admin/src/containers/Community/People.js b/client/coral-admin/src/containers/Community/People.js index fbcc098f1..93d975c6b 100644 --- a/client/coral-admin/src/containers/Community/People.js +++ b/client/coral-admin/src/containers/Community/People.js @@ -4,7 +4,7 @@ import styles from './Community.css'; import Table from './Table'; import {Pager, Icon} from 'coral-ui'; import EmptyCard from '../../components/EmptyCard'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const tableHeaders = [ { diff --git a/client/coral-admin/src/containers/Community/Table.js b/client/coral-admin/src/containers/Community/Table.js index 8c8b39cdd..5c27a71f8 100644 --- a/client/coral-admin/src/containers/Community/Table.js +++ b/client/coral-admin/src/containers/Community/Table.js @@ -4,7 +4,7 @@ import {SelectField, Option} from 'react-mdl-selectfield'; import styles from './Community.css'; import {setRole, setCommenterStatus} from '../../actions/community'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; class Table extends Component { diff --git a/client/coral-admin/src/containers/Community/components/BanUserDialog.js b/client/coral-admin/src/containers/Community/components/BanUserDialog.js index 6dc41ee20..26a885e8b 100644 --- a/client/coral-admin/src/containers/Community/components/BanUserDialog.js +++ b/client/coral-admin/src/containers/Community/components/BanUserDialog.js @@ -4,7 +4,7 @@ import styles from './BanUserDialog.css'; import Button from 'coral-ui/components/Button'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const BanUserDialog = ({open, handleClose, handleBanUser, user}) => ( { diff --git a/client/coral-admin/src/containers/Community/components/SuspendUserDialog.js b/client/coral-admin/src/containers/Community/components/SuspendUserDialog.js index 808092a4c..f0ce274b9 100644 --- a/client/coral-admin/src/containers/Community/components/SuspendUserDialog.js +++ b/client/coral-admin/src/containers/Community/components/SuspendUserDialog.js @@ -3,7 +3,7 @@ import React, {Component, PropTypes} from 'react'; import {Dialog, Button} from 'coral-ui'; import styles from './SuspendUserDialog.css'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const stages = [ { diff --git a/client/coral-admin/src/containers/Community/components/User.js b/client/coral-admin/src/containers/Community/components/User.js index fffb47ef0..feab1f690 100644 --- a/client/coral-admin/src/containers/Community/components/User.js +++ b/client/coral-admin/src/containers/Community/components/User.js @@ -3,7 +3,7 @@ import styles from '../Community.css'; import ActionButton from './ActionButton'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; // Render a single user for the list const User = (props) => { diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js index 6465e6bc4..ef5990e03 100644 --- a/client/coral-admin/src/containers/Configure/Configure.js +++ b/client/coral-admin/src/containers/Configure/Configure.js @@ -13,7 +13,7 @@ import styles from './Configure.css'; import StreamSettings from './StreamSettings'; import ModerationSettings from './ModerationSettings'; import TechSettings from './TechSettings'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; class Configure extends Component { constructor (props) { diff --git a/client/coral-admin/src/containers/Configure/Domainlist.js b/client/coral-admin/src/containers/Configure/Domainlist.js index 339a7a272..45790ec89 100644 --- a/client/coral-admin/src/containers/Configure/Domainlist.js +++ b/client/coral-admin/src/containers/Configure/Domainlist.js @@ -2,7 +2,7 @@ import React from 'react'; import {Card} from 'coral-ui'; import styles from './Configure.css'; import TagsInput from 'react-tagsinput'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const Domainlist = ({domains, onChangeDomainlist}) => { return ( diff --git a/client/coral-admin/src/containers/Configure/EmbedLink.js b/client/coral-admin/src/containers/Configure/EmbedLink.js index 89584559c..7ff348b50 100644 --- a/client/coral-admin/src/containers/Configure/EmbedLink.js +++ b/client/coral-admin/src/containers/Configure/EmbedLink.js @@ -1,6 +1,6 @@ import React, {Component} from 'react'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; import styles from './Configure.css'; import {Button, Card} from 'coral-ui'; diff --git a/client/coral-admin/src/containers/Configure/ModerationSettings.js b/client/coral-admin/src/containers/Configure/ModerationSettings.js index 51d1d5ac6..61f81e99c 100644 --- a/client/coral-admin/src/containers/Configure/ModerationSettings.js +++ b/client/coral-admin/src/containers/Configure/ModerationSettings.js @@ -3,7 +3,7 @@ import styles from './Configure.css'; import {Card} from 'coral-ui'; import {Checkbox} from 'react-mdl'; import Wordlist from './Wordlist'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const updateModeration = (updateSettings, mod) => () => { const moderation = mod === 'PRE' ? 'POST' : 'PRE'; diff --git a/client/coral-admin/src/containers/Configure/StreamSettings.js b/client/coral-admin/src/containers/Configure/StreamSettings.js index 3050415ba..41c62c153 100644 --- a/client/coral-admin/src/containers/Configure/StreamSettings.js +++ b/client/coral-admin/src/containers/Configure/StreamSettings.js @@ -1,6 +1,6 @@ import React from 'react'; import {SelectField, Option} from 'react-mdl-selectfield'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; import styles from './Configure.css'; import {Checkbox, Textfield} from 'react-mdl'; import {Card, Icon, TextArea} from 'coral-ui'; diff --git a/client/coral-admin/src/containers/Configure/TechSettings.js b/client/coral-admin/src/containers/Configure/TechSettings.js index 8fc103aee..2dca7b207 100644 --- a/client/coral-admin/src/containers/Configure/TechSettings.js +++ b/client/coral-admin/src/containers/Configure/TechSettings.js @@ -3,7 +3,7 @@ import {Card} from 'coral-ui'; import Domainlist from './Domainlist'; import EmbedLink from './EmbedLink'; import styles from './Configure.css'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const updateCustomCssUrl = (updateSettings) => (event) => { const customCssUrl = event.target.value; diff --git a/client/coral-admin/src/containers/Configure/Wordlist.js b/client/coral-admin/src/containers/Configure/Wordlist.js index b107d8056..af8c1b383 100644 --- a/client/coral-admin/src/containers/Configure/Wordlist.js +++ b/client/coral-admin/src/containers/Configure/Wordlist.js @@ -1,5 +1,5 @@ import React from 'react'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; import TagsInput from 'react-tagsinput'; import styles from './Configure.css'; import {Card} from 'coral-ui'; diff --git a/client/coral-admin/src/containers/Dashboard/ActivityWidget.js b/client/coral-admin/src/containers/Dashboard/ActivityWidget.js index c28376a3d..495927df8 100644 --- a/client/coral-admin/src/containers/Dashboard/ActivityWidget.js +++ b/client/coral-admin/src/containers/Dashboard/ActivityWidget.js @@ -1,7 +1,7 @@ import React, {PropTypes} from 'react'; import {Link} from 'react-router'; import styles from './Widget.css'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const ActivityWidget = ({assets}) => { return ( diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js index c15e30013..ef0974fbd 100644 --- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js +++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js @@ -2,7 +2,7 @@ import React, {PropTypes} from 'react'; import {Link} from 'react-router'; import styles from './Widget.css'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const FlagWidget = ({assets}) => { diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js index 0ecb44742..2188e38dd 100644 --- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js +++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js @@ -1,7 +1,7 @@ import React, {PropTypes} from 'react'; import {Link} from 'react-router'; import styles from './Widget.css'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const LikeWidget = ({assets}) => { diff --git a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js index c51946046..6bbb67c50 100644 --- a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js +++ b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js @@ -3,7 +3,7 @@ import React from 'react'; import ModerationQueue from 'coral-admin/src/containers/ModerationQueue/ModerationQueue'; import styles from './Widget.css'; import BanUserDialog from 'coral-admin/src/components/BanUserDialog'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const MostLikedCommentsWidget = (props) => { const { diff --git a/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js b/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js index ae5ca2d9c..294e64f8d 100644 --- a/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js +++ b/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js @@ -2,7 +2,7 @@ import React from 'react'; import styles from './style.css'; import {TextField, Button} from 'coral-ui'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const AddOrganizationName = (props) => { const {handleSettingsChange, handleSettingsSubmit, install} = props; diff --git a/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js b/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js index a1c447219..d07b9e9ff 100644 --- a/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js +++ b/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js @@ -2,7 +2,7 @@ import React from 'react'; import styles from './style.css'; import {TextField, Button, Spinner} from 'coral-ui'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const InitialStep = (props) => { const {handleUserChange, handleUserSubmit, install} = props; diff --git a/client/coral-admin/src/containers/Install/components/Steps/FinalStep.js b/client/coral-admin/src/containers/Install/components/Steps/FinalStep.js index 0c9c1534a..a09b6ebb1 100644 --- a/client/coral-admin/src/containers/Install/components/Steps/FinalStep.js +++ b/client/coral-admin/src/containers/Install/components/Steps/FinalStep.js @@ -3,7 +3,7 @@ import styles from './style.css'; import {Button} from 'coral-ui'; import {Link} from 'react-router'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const InitialStep = () => { return ( diff --git a/client/coral-admin/src/containers/Install/components/Steps/InitialStep.js b/client/coral-admin/src/containers/Install/components/Steps/InitialStep.js index 4b5f3e90d..1d8d8b050 100644 --- a/client/coral-admin/src/containers/Install/components/Steps/InitialStep.js +++ b/client/coral-admin/src/containers/Install/components/Steps/InitialStep.js @@ -2,7 +2,7 @@ import React from 'react'; import styles from './style.css'; import {Button} from 'coral-ui'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const InitialStep = (props) => { const {nextStep} = props; diff --git a/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js b/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js index 1c6829067..450aeabd8 100644 --- a/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js +++ b/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js @@ -3,7 +3,7 @@ import styles from './style.css'; import {Button, Card} from 'coral-ui'; import TagsInput from 'react-tagsinput'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const PermittedDomainsStep = (props) => { const {finishInstall, install, handleDomainsChange} = props; diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js index f62d882d2..16898a622 100644 --- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js +++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js @@ -4,7 +4,7 @@ import Comment from './components/Comment'; import styles from './components/styles.css'; import EmptyCard from '../../components/EmptyCard'; import {actionsMap} from './helpers/moderationQueueActionsMap'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; import LoadMore from './components/LoadMore'; diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js index 0be281821..6b204eafc 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js @@ -14,7 +14,7 @@ import BanUserButton from 'coral-admin/src/components/BanUserButton'; const linkify = new Linkify(); -import t, {timeago} from 'coral-i18n/services/i18n'; +import t, {timeago} from 'coral-framework/services/i18n'; const Comment = ({ actions = [], diff --git a/client/coral-admin/src/containers/ModerationQueue/components/CommentCount.js b/client/coral-admin/src/containers/ModerationQueue/components/CommentCount.js index 5325088e7..75af89584 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/CommentCount.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/CommentCount.js @@ -1,7 +1,7 @@ import React, {PropTypes} from 'react'; import styles from './CommentCount.css'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const CommentCount = ({count}) => { let number = count; diff --git a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js index 51015b242..b2651d1bc 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js @@ -1,7 +1,7 @@ import React, {Component, PropTypes} from 'react'; import {Icon} from 'coral-ui'; import styles from './FlagBox.css'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const shortReasons = { 'This comment is offensive': t('modqueue.offensive'), diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js index 15871e49b..fded114ea 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js @@ -4,7 +4,7 @@ import styles from './styles.css'; import {SelectField, Option} from 'react-mdl-selectfield'; import {Icon} from 'coral-ui'; import {Link} from 'react-router'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const ModerationMenu = ( {asset, allCount, acceptedCount, premodCount, rejectedCount, flaggedCount, selectSort, sort} diff --git a/client/coral-admin/src/containers/Stories/Stories.js b/client/coral-admin/src/containers/Stories/Stories.js index 55c55746c..292eaeaba 100644 --- a/client/coral-admin/src/containers/Stories/Stories.js +++ b/client/coral-admin/src/containers/Stories/Stories.js @@ -1,7 +1,7 @@ import React, {Component} from 'react'; import styles from './Stories.css'; import {connect} from 'react-redux'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; import {fetchAssets, updateAssetState} from 'coral-admin/src/actions/assets'; import {Link} from 'react-router'; diff --git a/client/coral-admin/src/containers/Streams/Stories.js b/client/coral-admin/src/containers/Streams/Stories.js index 142b65a18..86db633b2 100644 --- a/client/coral-admin/src/containers/Streams/Stories.js +++ b/client/coral-admin/src/containers/Streams/Stories.js @@ -1,7 +1,7 @@ import React, {Component} from 'react'; import styles from './Stories.css'; import {connect} from 'react-redux'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; import {fetchAssets, updateAssetState} from '../../actions/assets'; import {Link} from 'react-router'; diff --git a/client/coral-configure/components/CloseCommentsInfo.js b/client/coral-configure/components/CloseCommentsInfo.js index 792260313..b9c6371c4 100644 --- a/client/coral-configure/components/CloseCommentsInfo.js +++ b/client/coral-configure/components/CloseCommentsInfo.js @@ -1,7 +1,7 @@ import React from 'react'; import {Button} from 'coral-ui'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; export default ({status, onClick}) => ( status === 'open' ? ( diff --git a/client/coral-configure/components/ConfigureCommentStream.js b/client/coral-configure/components/ConfigureCommentStream.js index e3526a399..5ee9b706f 100644 --- a/client/coral-configure/components/ConfigureCommentStream.js +++ b/client/coral-configure/components/ConfigureCommentStream.js @@ -3,7 +3,7 @@ import {Button, Checkbox, TextField} from 'coral-ui'; import styles from './ConfigureCommentStream.css'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; export default ({handleChange, handleApply, changed, ...props}) => (
diff --git a/client/coral-configure/containers/ConfigureStreamContainer.js b/client/coral-configure/containers/ConfigureStreamContainer.js index c6295e085..63dea35b1 100644 --- a/client/coral-configure/containers/ConfigureStreamContainer.js +++ b/client/coral-configure/containers/ConfigureStreamContainer.js @@ -7,7 +7,7 @@ import {updateOpenStatus, updateConfiguration} from 'coral-framework/actions/ass import CloseCommentsInfo from '../components/CloseCommentsInfo'; import ConfigureCommentStream from '../components/ConfigureCommentStream'; -import t, {timeago} from 'coral-i18n/services/i18n'; +import t, {timeago} from 'coral-framework/services/i18n'; class ConfigureStreamContainer extends Component { constructor (props) { diff --git a/client/coral-embed-stream/src/components/CountdownSeconds.js b/client/coral-embed-stream/src/components/CountdownSeconds.js index dd1da8edc..46bca0eff 100644 --- a/client/coral-embed-stream/src/components/CountdownSeconds.js +++ b/client/coral-embed-stream/src/components/CountdownSeconds.js @@ -1,5 +1,5 @@ import React, {PropTypes} from 'react'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; /** * Countdown the number of seconds until a given Date diff --git a/client/coral-embed-stream/src/components/EditableCommentContent.js b/client/coral-embed-stream/src/components/EditableCommentContent.js index 6a6095235..ec6718217 100644 --- a/client/coral-embed-stream/src/components/EditableCommentContent.js +++ b/client/coral-embed-stream/src/components/EditableCommentContent.js @@ -6,7 +6,7 @@ import {CountdownSeconds} from './CountdownSeconds'; import {getEditableUntilDate} from './util'; import {Icon} from 'coral-ui'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/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-embed-stream/src/components/Embed.js b/client/coral-embed-stream/src/components/Embed.js index 58a457cba..2f4d738fa 100644 --- a/client/coral-embed-stream/src/components/Embed.js +++ b/client/coral-embed-stream/src/components/Embed.js @@ -1,5 +1,5 @@ import React from 'react'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; import {TabBar, Tab, TabContent, Button} from 'coral-ui'; diff --git a/client/coral-embed-stream/src/components/IgnoredCommentTombstone.js b/client/coral-embed-stream/src/components/IgnoredCommentTombstone.js index 9176cc49f..18fb0338c 100644 --- a/client/coral-embed-stream/src/components/IgnoredCommentTombstone.js +++ b/client/coral-embed-stream/src/components/IgnoredCommentTombstone.js @@ -1,6 +1,6 @@ import React from 'react'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; // Render in place of a Comment when the author of the comment is ignored const IgnoredCommentTombstone = () => ( diff --git a/client/coral-embed-stream/src/components/LoadMore.js b/client/coral-embed-stream/src/components/LoadMore.js index ae84e8258..8715e7902 100644 --- a/client/coral-embed-stream/src/components/LoadMore.js +++ b/client/coral-embed-stream/src/components/LoadMore.js @@ -1,7 +1,7 @@ import React, {PropTypes} from 'react'; import {ADDTL_COMMENTS_ON_LOAD_MORE} from '../constants/stream'; import {Button} from 'coral-ui'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const loadMoreComments = (assetId, comments, loadMore, parentId, replyCount) => { diff --git a/client/coral-embed-stream/src/components/NewCount.js b/client/coral-embed-stream/src/components/NewCount.js index f9ea003e1..b0449bddc 100644 --- a/client/coral-embed-stream/src/components/NewCount.js +++ b/client/coral-embed-stream/src/components/NewCount.js @@ -1,6 +1,6 @@ import React, {PropTypes} from 'react'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const onLoadMoreClick = ({loadMore, commentCount, firstCommentDate, assetId, setCommentCountCache}) => (e) => { e.preventDefault(); diff --git a/client/coral-embed-stream/src/index.js b/client/coral-embed-stream/src/index.js index 7af73edb3..ec4865d5c 100644 --- a/client/coral-embed-stream/src/index.js +++ b/client/coral-embed-stream/src/index.js @@ -12,7 +12,7 @@ import localStore, {injectReducers} from 'coral-framework/services/store'; import AppRouter from './AppRouter'; import {pym} from 'coral-framework'; -import {loadTranslations} from 'coral-i18n/services/i18n'; +import {loadTranslations} from 'coral-framework/services/i18n'; loadTranslations(); diff --git a/client/coral-framework/actions/asset.js b/client/coral-framework/actions/asset.js index 0cf307fa9..2f0523fea 100644 --- a/client/coral-framework/actions/asset.js +++ b/client/coral-framework/actions/asset.js @@ -2,7 +2,7 @@ import * as actions from '../constants/asset'; import coralApi from '../helpers/response'; import {addNotification} from '../actions/notification'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; export const fetchAssetRequest = () => ({type: actions.FETCH_ASSET_REQUEST}); export const fetchAssetSuccess = (asset) => ({type: actions.FETCH_ASSET_SUCCESS, asset}); diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js index 4ab42d701..4f55f67b9 100644 --- a/client/coral-framework/actions/auth.js +++ b/client/coral-framework/actions/auth.js @@ -4,7 +4,7 @@ import * as actions from '../constants/auth'; import coralApi, {base} from '../helpers/response'; import jwtDecode from 'jwt-decode'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; // Dialog Actions export const showSignInDialog = () => (dispatch) => { diff --git a/client/coral-framework/actions/user.js b/client/coral-framework/actions/user.js index b1e18da4f..53d59a743 100644 --- a/client/coral-framework/actions/user.js +++ b/client/coral-framework/actions/user.js @@ -2,7 +2,7 @@ import {addNotification} from '../actions/notification'; import coralApi from '../helpers/response'; import * as actions from '../constants/auth'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const editUsernameFailure = (error) => ({type: actions.EDIT_USERNAME_FAILURE, error}); const editUsernameSuccess = () => ({type: actions.EDIT_USERNAME_SUCCESS}); diff --git a/client/coral-framework/components/RestrictedContent.js b/client/coral-framework/components/RestrictedContent.js index 1eba8e626..0f7175537 100644 --- a/client/coral-framework/components/RestrictedContent.js +++ b/client/coral-framework/components/RestrictedContent.js @@ -1,7 +1,7 @@ import React from 'react'; import styles from './RestrictedContent.css'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; export default ({children, restricted, message = t('framework.content_not_available'), restrictedComp}) => { if (restricted) { diff --git a/client/coral-framework/components/SuspendedAccount.js b/client/coral-framework/components/SuspendedAccount.js index d670a1602..df1715776 100644 --- a/client/coral-framework/components/SuspendedAccount.js +++ b/client/coral-framework/components/SuspendedAccount.js @@ -1,6 +1,6 @@ import React, {Component, PropTypes} from 'react'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; import styles from './RestrictedContent.css'; import {Button} from 'coral-ui'; diff --git a/client/coral-framework/helpers/error.js b/client/coral-framework/helpers/error.js index 787a965db..18c365de1 100644 --- a/client/coral-framework/helpers/error.js +++ b/client/coral-framework/helpers/error.js @@ -1,4 +1,4 @@ -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; export default { email: t('error.email'), diff --git a/client/coral-framework/index.js b/client/coral-framework/index.js index 8f5407c19..35ccefc5c 100644 --- a/client/coral-framework/index.js +++ b/client/coral-framework/index.js @@ -1,6 +1,6 @@ import pym from './services/PymConnection'; import actions from './actions'; -import {loadTranslations} from '../coral-i18n/services/i18n'; +import {loadTranslations} from '../coral-framework/services/i18n'; // TODO (bc): Deprecate old actions. Spreading actions is now needed. diff --git a/client/coral-i18n/locales/en.yml b/client/coral-framework/locales/en.yml similarity index 100% rename from client/coral-i18n/locales/en.yml rename to client/coral-framework/locales/en.yml diff --git a/client/coral-i18n/locales/es.yml b/client/coral-framework/locales/es.yml similarity index 100% rename from client/coral-i18n/locales/es.yml rename to client/coral-framework/locales/es.yml diff --git a/client/coral-i18n/services/i18n.js b/client/coral-framework/services/i18n.js similarity index 100% rename from client/coral-i18n/services/i18n.js rename to client/coral-framework/services/i18n.js diff --git a/client/coral-plugin-best/BestButton.js b/client/coral-plugin-best/BestButton.js index 629d7d05f..febf26991 100644 --- a/client/coral-plugin-best/BestButton.js +++ b/client/coral-plugin-best/BestButton.js @@ -1,6 +1,6 @@ import React, {Component, PropTypes} from 'react'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; import {Icon} from 'coral-ui'; import classnames from 'classnames'; diff --git a/client/coral-plugin-comment-count/CommentCount.js b/client/coral-plugin-comment-count/CommentCount.js index 2c143980d..8a2517387 100644 --- a/client/coral-plugin-comment-count/CommentCount.js +++ b/client/coral-plugin-comment-count/CommentCount.js @@ -1,6 +1,6 @@ import React, {PropTypes} from 'react'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const name = 'coral-plugin-comment-count'; diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js index 1dddb77aa..ab318be13 100644 --- a/client/coral-plugin-commentbox/CommentBox.js +++ b/client/coral-plugin-commentbox/CommentBox.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 Slot from 'coral-framework/components/Slot'; import {connect} from 'react-redux'; diff --git a/client/coral-plugin-commentbox/CommentForm.js b/client/coral-plugin-commentbox/CommentForm.js index b4d5ba1e8..4ce32c11f 100644 --- a/client/coral-plugin-commentbox/CommentForm.js +++ b/client/coral-plugin-commentbox/CommentForm.js @@ -5,7 +5,7 @@ import Slot from 'coral-framework/components/Slot'; import {name} from './CommentBox'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; /** * Common UI for Creating or Editing a Comment diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js index 9f88aeaa1..9a772f102 100644 --- a/client/coral-plugin-flags/FlagButton.js +++ b/client/coral-plugin-flags/FlagButton.js @@ -1,6 +1,6 @@ import React, {Component} from 'react'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; import {PopupMenu, Button} from 'coral-ui'; import onClickOutside from 'react-onclickoutside'; diff --git a/client/coral-plugin-flags/FlagComment.js b/client/coral-plugin-flags/FlagComment.js index 45fcbb85a..efc4c282f 100644 --- a/client/coral-plugin-flags/FlagComment.js +++ b/client/coral-plugin-flags/FlagComment.js @@ -1,7 +1,7 @@ import React from 'react'; import FlagButton from './FlagButton'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const FlagComment = (props) => ; diff --git a/client/coral-plugin-moderation/ModerationLink.js b/client/coral-plugin-moderation/ModerationLink.js index 6fe9d93ed..020b8c345 100644 --- a/client/coral-plugin-moderation/ModerationLink.js +++ b/client/coral-plugin-moderation/ModerationLink.js @@ -1,7 +1,7 @@ import React, {PropTypes} from 'react'; import styles from './styles.css'; -import t from 'coral-i18n/services/i18n'; +import t from 'coral-framework/services/i18n'; const ModerationLink = (props) => props.isAdmin ? (
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$/, } ]