diff --git a/client/coral-admin/src/components/AdminLogin.js b/client/coral-admin/src/components/AdminLogin.js index e7e41eb48..4770a63fd 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../translations'; import Recaptcha from 'react-recaptcha'; const lang = new I18n(translations); diff --git a/client/coral-admin/src/components/BanUserButton.js b/client/coral-admin/src/components/BanUserButton.js index a54cdd322..a31371a5c 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-admin/src/translations.json'; const lang = new I18n(translations); diff --git a/client/coral-admin/src/components/BanUserDialog.js b/client/coral-admin/src/components/BanUserDialog.js index ee5830249..1dfdc2793 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../translations'; const lang = new I18n(translations); diff --git a/client/coral-admin/src/components/CountdownTimer.js b/client/coral-admin/src/components/CountdownTimer.js index aba4d0b5a..4630820f8 100644 --- a/client/coral-admin/src/components/CountdownTimer.js +++ b/client/coral-admin/src/components/CountdownTimer.js @@ -1,5 +1,5 @@ import React, {PropTypes} from 'react'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-admin/src/translations'; import styles from 'coral-admin/src/containers/Dashboard/Dashboard.css'; import {Icon} from 'coral-ui'; diff --git a/client/coral-admin/src/components/ModerationKeysModal.js b/client/coral-admin/src/components/ModerationKeysModal.js index 5a951e588..e0ec9a77b 100644 --- a/client/coral-admin/src/components/ModerationKeysModal.js +++ b/client/coral-admin/src/components/ModerationKeysModal.js @@ -1,4 +1,4 @@ -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../translations.json'; import React from 'react'; import Modal from 'components/Modal'; diff --git a/client/coral-admin/src/components/ui/Drawer.js b/client/coral-admin/src/components/ui/Drawer.js index 5ac55045c..461c88df5 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../../translations.json'; 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 f09a9f9f7..7a7cbd3e2 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../../translations.json'; import {Logo} from './Logo'; diff --git a/client/coral-admin/src/containers/Community/FlaggedAccounts.js b/client/coral-admin/src/containers/Community/FlaggedAccounts.js index 692cef70d..a19965f6e 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-admin/src/translations.json'; const lang = new I18n(translations); diff --git a/client/coral-admin/src/containers/Community/People.js b/client/coral-admin/src/containers/Community/People.js index 0011cd704..d6a280a72 100644 --- a/client/coral-admin/src/containers/Community/People.js +++ b/client/coral-admin/src/containers/Community/People.js @@ -1,5 +1,5 @@ import React from 'react'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-admin/src/translations.json'; import styles from './Community.css'; diff --git a/client/coral-admin/src/containers/Community/Table.js b/client/coral-admin/src/containers/Community/Table.js index aacc9c82f..96c7e3bc0 100644 --- a/client/coral-admin/src/containers/Community/Table.js +++ b/client/coral-admin/src/containers/Community/Table.js @@ -2,7 +2,7 @@ import React, {Component} from 'react'; import {connect} from 'react-redux'; import {SelectField, Option} from 'react-mdl-selectfield'; import styles from './Community.css'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../../translations'; import {setRole, setCommenterStatus} from '../../actions/community'; diff --git a/client/coral-admin/src/containers/Community/components/BanUserDialog.js b/client/coral-admin/src/containers/Community/components/BanUserDialog.js index affffcd54..d4f6c1ba4 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-admin/src/translations.json'; const lang = new I18n(translations); diff --git a/client/coral-admin/src/containers/Community/components/CommunityMenu.js b/client/coral-admin/src/containers/Community/components/CommunityMenu.js index 9a51798ec..ae76098b8 100644 --- a/client/coral-admin/src/containers/Community/components/CommunityMenu.js +++ b/client/coral-admin/src/containers/Community/components/CommunityMenu.js @@ -2,7 +2,7 @@ import React from 'react'; import styles from './styles.css'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-admin/src/translations.json'; import {Link} from 'react-router'; diff --git a/client/coral-admin/src/containers/Community/components/SuspendUserDialog.js b/client/coral-admin/src/containers/Community/components/SuspendUserDialog.js index 20e221c48..a54b1e507 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-admin/src/translations.json'; const lang = new I18n(translations); diff --git a/client/coral-admin/src/containers/Community/components/User.js b/client/coral-admin/src/containers/Community/components/User.js index 20b599a7a..a6b2f26dc 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../../../translations.json'; const lang = new I18n(translations); diff --git a/client/coral-admin/src/containers/Configure/Configure.js b/client/coral-admin/src/containers/Configure/Configure.js index b94394c61..5b8d8ca95 100644 --- a/client/coral-admin/src/containers/Configure/Configure.js +++ b/client/coral-admin/src/containers/Configure/Configure.js @@ -10,7 +10,7 @@ import { import {Button, List, Item, Card, Spinner} from 'coral-ui'; import styles from './Configure.css'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-admin/src/translations.json'; import StreamSettings from './StreamSettings'; import ModerationSettings from './ModerationSettings'; diff --git a/client/coral-admin/src/containers/Configure/Domainlist.js b/client/coral-admin/src/containers/Configure/Domainlist.js index f1fc25dd0..53f5e4074 100644 --- a/client/coral-admin/src/containers/Configure/Domainlist.js +++ b/client/coral-admin/src/containers/Configure/Domainlist.js @@ -3,7 +3,7 @@ import {Card} from 'coral-ui'; import styles from './Configure.css'; import TagsInput from 'react-tagsinput'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../../translations.json'; const lang = new I18n(translations); diff --git a/client/coral-admin/src/containers/Configure/EmbedLink.js b/client/coral-admin/src/containers/Configure/EmbedLink.js index 86ab8b1f8..c4bc44cfc 100644 --- a/client/coral-admin/src/containers/Configure/EmbedLink.js +++ b/client/coral-admin/src/containers/Configure/EmbedLink.js @@ -1,5 +1,5 @@ import React, {Component} from 'react'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../../translations.json'; 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 5b7286b98..eb91fad72 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../../translations.json'; const lang = new I18n(translations); diff --git a/client/coral-admin/src/containers/Configure/StreamSettings.js b/client/coral-admin/src/containers/Configure/StreamSettings.js index 08ec062c8..26340cb8e 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../../translations.json'; import styles from './Configure.css'; import {Checkbox, Textfield} from 'react-mdl'; diff --git a/client/coral-admin/src/containers/Configure/TechSettings.js b/client/coral-admin/src/containers/Configure/TechSettings.js index 6fbc302a0..9ebee3ee7 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../../translations.json'; const lang = new I18n(translations); diff --git a/client/coral-admin/src/containers/Configure/Wordlist.js b/client/coral-admin/src/containers/Configure/Wordlist.js index 8eb010b79..4fbf43946 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../../translations.json'; import TagsInput from 'react-tagsinput'; import styles from './Configure.css'; diff --git a/client/coral-admin/src/containers/Dashboard/ActivityWidget.js b/client/coral-admin/src/containers/Dashboard/ActivityWidget.js index a6e293b82..559479dd1 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-admin/src/translations'; const lang = new I18n(translations); diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js index 92de6c4d2..afd732cc7 100644 --- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js +++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js @@ -1,7 +1,7 @@ import React, {PropTypes} from 'react'; import {Link} from 'react-router'; import styles from './Widget.css'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-admin/src/translations'; const lang = new I18n(translations); diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js index b878c281b..4a4fbd28a 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-admin/src/translations'; const lang = new I18n(translations); diff --git a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js index 0c41ac7c6..71f1da2a2 100644 --- a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js +++ b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js @@ -1,5 +1,5 @@ import React from 'react'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-admin/src/translations'; import ModerationQueue from 'coral-admin/src/containers/ModerationQueue/ModerationQueue'; import styles from './Widget.css'; 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 bcac6ef29..910832cdf 100644 --- a/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js +++ b/client/coral-admin/src/containers/Install/components/Steps/AddOrganizationName.js @@ -4,7 +4,7 @@ import {TextField, Button} from 'coral-ui'; const lang = new I18n(translations); import translations from '../../translations.json'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/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 416fac195..9e871765f 100644 --- a/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js +++ b/client/coral-admin/src/containers/Install/components/Steps/CreateYourAccount.js @@ -4,7 +4,7 @@ import {TextField, Button, Spinner} from 'coral-ui'; const lang = new I18n(translations); import translations from '../../translations.json'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/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 0ad918487..fd2b81fee 100644 --- a/client/coral-admin/src/containers/Install/components/Steps/FinalStep.js +++ b/client/coral-admin/src/containers/Install/components/Steps/FinalStep.js @@ -5,7 +5,7 @@ import {Link} from 'react-router'; const lang = new I18n(translations); import translations from '../../translations.json'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/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 1838e3178..8995756ea 100644 --- a/client/coral-admin/src/containers/Install/components/Steps/InitialStep.js +++ b/client/coral-admin/src/containers/Install/components/Steps/InitialStep.js @@ -4,7 +4,7 @@ import {Button} from 'coral-ui'; const lang = new I18n(translations); import translations from '../../translations.json'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/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 f2c1546f6..03dc06640 100644 --- a/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js +++ b/client/coral-admin/src/containers/Install/components/Steps/PermittedDomainsStep.js @@ -5,7 +5,7 @@ import TagsInput from 'react-tagsinput'; const lang = new I18n(translations); import translations from '../../translations.json'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/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 79b4ce7e4..f33baacfa 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-admin/src/translations'; 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 b18f239e4..447de0099 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 {getActionSummary} from 'coral-framework/utils'; const linkify = new Linkify(); -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-admin/src/translations.json'; const lang = new I18n(translations); diff --git a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js index 62b4e554d..16340963c 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-admin/src/translations.json'; const lang = new I18n(translations); diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js index 0606fdb81..085d96333 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js @@ -2,7 +2,7 @@ import React, {PropTypes} from 'react'; import CommentCount from './CommentCount'; import styles from './styles.css'; import {SelectField, Option} from 'react-mdl-selectfield'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-admin/src/translations.json'; import {Link} from 'react-router'; diff --git a/client/coral-admin/src/containers/Stories/Stories.js b/client/coral-admin/src/containers/Stories/Stories.js index 1264663f0..3ba9b1359 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import {fetchAssets, updateAssetState} from 'coral-admin/src/actions/assets'; import translations from 'coral-admin/src/translations.json'; 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 4d2ad086a..7a11c014f 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import {fetchAssets, updateAssetState} from '../../actions/assets'; import translations from '../../translations.json'; import {Link} from 'react-router'; diff --git a/client/coral-configure/components/CloseCommentsInfo.js b/client/coral-configure/components/CloseCommentsInfo.js index fae7bc5e5..6d12c8bd0 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-admin/src/translations'; const lang = new I18n(translations); diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js index 2f33228fa..f4cde5d05 100644 --- a/client/coral-embed-stream/src/Embed.js +++ b/client/coral-embed-stream/src/Embed.js @@ -2,7 +2,7 @@ import React from 'react'; import {compose} from 'react-apollo'; import {connect} from 'react-redux'; import isEqual from 'lodash/isEqual'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-framework/translations'; const lang = new I18n(translations); diff --git a/client/coral-embed-stream/src/IgnoredCommentTombstone.js b/client/coral-embed-stream/src/IgnoredCommentTombstone.js index 0ed746976..3f4dc949e 100644 --- a/client/coral-embed-stream/src/IgnoredCommentTombstone.js +++ b/client/coral-embed-stream/src/IgnoredCommentTombstone.js @@ -1,6 +1,6 @@ import React from 'react'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-framework/translations'; const lang = new I18n(translations); diff --git a/client/coral-embed-stream/src/LoadMore.js b/client/coral-embed-stream/src/LoadMore.js index 1a58c8d19..3d858270b 100644 --- a/client/coral-embed-stream/src/LoadMore.js +++ b/client/coral-embed-stream/src/LoadMore.js @@ -1,5 +1,5 @@ import React, {PropTypes} from 'react'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-framework/translations.json'; import {ADDTL_COMMENTS_ON_LOAD_MORE} from 'coral-framework/constants/comments'; import {Button} from 'coral-ui'; diff --git a/client/coral-embed-stream/src/NewCount.js b/client/coral-embed-stream/src/NewCount.js index 8d7333aab..facc0d381 100644 --- a/client/coral-embed-stream/src/NewCount.js +++ b/client/coral-embed-stream/src/NewCount.js @@ -1,5 +1,5 @@ import React, {PropTypes} from 'react'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from 'coral-framework/translations.json'; const lang = new I18n(translations); diff --git a/client/coral-framework/actions/asset.js b/client/coral-framework/actions/asset.js index 50efa3dcb..27dd97b01 100644 --- a/client/coral-framework/actions/asset.js +++ b/client/coral-framework/actions/asset.js @@ -3,7 +3,7 @@ import coralApi from '../helpers/response'; import {addNotification} from '../actions/notification'; import {pym} from 'coral-framework'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from './../translations'; const lang = new I18n(translations); diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js index e112b2b6c..f277e01a7 100644 --- a/client/coral-framework/actions/auth.js +++ b/client/coral-framework/actions/auth.js @@ -1,6 +1,6 @@ import {gql} from 'react-apollo'; import client from 'coral-framework/services/client'; -import I18n from '../../coral-framework/modules/i18n/i18n'; +import I18n from '../../coral-i18n/modules/i18n/i18n'; import translations from './../translations'; const lang = new I18n(translations); import * as actions from '../constants/auth'; diff --git a/client/coral-framework/actions/user.js b/client/coral-framework/actions/user.js index 3e80b718c..202139c12 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from './../translations'; const lang = new I18n(translations); diff --git a/client/coral-framework/helpers/error.js b/client/coral-framework/helpers/error.js index 89f20c928..5943f6a86 100644 --- a/client/coral-framework/helpers/error.js +++ b/client/coral-framework/helpers/error.js @@ -1,4 +1,4 @@ -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from './../translations'; const lang = new I18n(translations); diff --git a/client/coral-framework/index.js b/client/coral-framework/index.js index b85b69bcd..e1e1c55e7 100644 --- a/client/coral-framework/index.js +++ b/client/coral-framework/index.js @@ -1,5 +1,5 @@ import pym from './services/PymConnection'; -import I18n from './modules/i18n/i18n'; +import I18n from '../coral-i18n/modules/i18n/i18n'; import actions from './actions'; // TODO (bc): Deprecate old actions. Spreading actions is now needed. diff --git a/client/coral-i18n/modules/i18n/i18n.js b/client/coral-i18n/modules/i18n/i18n.js index 3d750111f..749e06a5e 100644 --- a/client/coral-i18n/modules/i18n/i18n.js +++ b/client/coral-i18n/modules/i18n/i18n.js @@ -3,89 +3,92 @@ import esTA from '../../../../node_modules/timeago.js/locales/es'; import has from 'lodash/has'; import get from 'lodash/get'; -// To Do -// check on how to load the translations from YML file - -// Look at other i18n work in express/node +const yaml = require('node-yaml'); /** * Default locales, this should be overriden by config file */ class i18n { - constructor (translations) { + constructor(translations) { /** * Register locales */ - - this.locales = {'en': 'locales/en.yml', 'es': 'locales/es.yml'}; - timeago.register('es_ES', esTA); this.timeagoInstance = new timeago(); - /** - * Load translations - */ - // To Do : get all the yml from locales - let trans = translations || {en: {}}; - try { - const locale = localStorage.getItem('locale') || navigator.language; - localStorage.setItem('locale', locale); + const locale = this.getLocale(); + this.setLocale(locale); - const lang = this.locales[locale.split('-')[0]] || 'en'; - this.translations = trans[lang]; + this.language = this.locales[locale.split('-')[0]] || 'en'; + + this.loadTranslations(translations); } catch (err) { - - // To Do: get configuration for default translation - this.translations = trans['en']; + console.error(err); } - - this.setLocale = (locale) => { - try { - localStorage.setItem('locale', locale); - } catch (err) { - console.error(err); - } - }; - - this.getLocale = () => ( - localStorage.getItem('locale') || navigator.locale || 'en-US' - ); - - /** - * Expose the translation function - * - * it takes a string with the translation key and returns - * the translation value or the key itself if not found - * it works with nested translations (my.page.title) - * - * any extra parameters are optional and replace a variable marked by {0}, {1}, etc in the translation. - */ - - this.t = (key, ...replacements) => { - if (has(this.translations, key)) { - let translation = get(this.translations, key); - - // replace any {n} with the arguments passed to this method - replacements.forEach((str, i) => { - translation = translation.replace(new RegExp(`\\{${i}\\}`, 'g'), str); - }); - return translation; - } else { - console.warn(`${key} language key not set`); - return key; - } - }; - - this.timeago = (time) => { - return this.timeagoInstance.format(new Date(time)); - }; - } + loadTranslations = (translations) => { + const localesFiles = {'en': 'locales/en.yml', 'es': 'locales/es.yml'}; + + yaml.readPromise(localesFiles[this.language]) + .then((data) => { + + // Translations need to be loaded from translations or localesFiles. + this.translations = translations[this.language] || data; + + }) + .catch(() => { + + // To Do: get configuration for default translation + this.translations = translations['en']; + }); + } + + setLocale = (locale) => { + try { + localStorage.setItem('locale', locale); + } catch (err) { + console.error(err); + } + }; + + getLocale = () => ( + localStorage.getItem('locale') || navigator.language || 'en-US' + ); + + /** + * Expose the translation function + * + * it takes a string with the translation key and returns + * the translation value or the key itself if not found + * it works with nested translations (my.page.title) + * + * any extra parameters are optional and replace a variable marked by {0}, {1}, etc in the translation. + */ + + t = (key, ...replacements) => { + if (has(this.translations, key)) { + let translation = get(this.translations, key); + + // replace any {n} with the arguments passed to this method + replacements.forEach((str, i) => { + translation = translation.replace(new RegExp(`\\{${i}\\}`, 'g'), str); + }); + return translation; + } else { + console.warn(`${key} language key not set`); + return key; + } + }; + + timeago = (time) => { + return this.timeagoInstance.format(new Date(time)); + }; + } export default i18n; diff --git a/client/coral-plugin-permalinks/PermalinkButton.js b/client/coral-plugin-permalinks/PermalinkButton.js index 464155b2e..9474d1b32 100644 --- a/client/coral-plugin-permalinks/PermalinkButton.js +++ b/client/coral-plugin-permalinks/PermalinkButton.js @@ -1,5 +1,5 @@ import React, {PropTypes} from 'react'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from './translations'; import onClickOutside from 'react-onclickoutside'; const name = 'coral-plugin-permalinks'; diff --git a/client/coral-sign-in/components/CreateUsernameDialog.js b/client/coral-sign-in/components/CreateUsernameDialog.js index b94b47c42..045462413 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../translations'; const lang = new I18n(translations); diff --git a/client/coral-sign-in/components/FakeComment.js b/client/coral-sign-in/components/FakeComment.js index f5926852c..5e715f7ac 100644 --- a/client/coral-sign-in/components/FakeComment.js +++ b/client/coral-sign-in/components/FakeComment.js @@ -6,7 +6,7 @@ import Content from 'coral-plugin-commentcontent/CommentContent'; import PubDate from 'coral-plugin-pubdate/PubDate'; import {ReplyButton} from 'coral-plugin-replies'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../translations'; const lang = new I18n(translations); diff --git a/client/coral-sign-in/components/ForgotContent.js b/client/coral-sign-in/components/ForgotContent.js index 307a32b6e..e2eb29d51 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../translations'; const lang = new I18n(translations); diff --git a/client/coral-sign-in/components/SignInContent.js b/client/coral-sign-in/components/SignInContent.js index 7460efb97..2f4ed6c7e 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../translations'; const lang = new I18n(translations); diff --git a/client/coral-sign-in/components/SignUpContent.js b/client/coral-sign-in/components/SignUpContent.js index 921f045be..aac8d4937 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../translations'; const lang = new I18n(translations); diff --git a/client/coral-sign-in/components/UserBox.js b/client/coral-sign-in/components/UserBox.js index 8e718614b..15432258a 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../translations'; const lang = new I18n(translations); diff --git a/client/coral-sign-in/containers/ChangeUsernameContainer.js b/client/coral-sign-in/containers/ChangeUsernameContainer.js index a3b4b969d..e94c956b8 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 I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../translations'; const lang = new I18n(translations); diff --git a/client/coral-sign-in/containers/SignInContainer.js b/client/coral-sign-in/containers/SignInContainer.js index 868ef8456..e027acb31 100644 --- a/client/coral-sign-in/containers/SignInContainer.js +++ b/client/coral-sign-in/containers/SignInContainer.js @@ -3,7 +3,7 @@ import {connect} from 'react-redux'; import SignDialog from '../components/SignDialog'; import validate from 'coral-framework/helpers/validate'; import errorMsj from 'coral-framework/helpers/error'; -import I18n from 'coral-framework/modules/i18n/i18n'; +import I18n from 'coral-i18n/modules/i18n/i18n'; import translations from '../translations'; import {pym} from 'coral-framework'; const lang = new I18n(translations);