diff --git a/client/coral-admin/src/components/Comment.js b/client/coral-admin/src/components/Comment.js index 2b0b7561b..c115bcf61 100644 --- a/client/coral-admin/src/components/Comment.js +++ b/client/coral-admin/src/components/Comment.js @@ -4,7 +4,7 @@ import {Button, Icon} from 'react-mdl'; import timeago from 'timeago.js'; import styles from './CommentList.css'; import I18n from 'coral-framework/i18n/i18n'; -import translations from '../translations'; +import translations from '../translations.json'; // Render a single comment for the list export default props => ( diff --git a/client/coral-admin/src/components/Header.js b/client/coral-admin/src/components/Header.js index 1a89da513..b2bee0a44 100644 --- a/client/coral-admin/src/components/Header.js +++ b/client/coral-admin/src/components/Header.js @@ -2,22 +2,26 @@ import React from 'react'; import {Layout, Navigation, Drawer, Header} from 'react-mdl'; import {Link} from 'react-router'; import styles from './Header.css'; +import I18n from 'coral-framework/i18n/i18n'; +import translations from '../translations.json'; // App header. If we add a navbar it should be here export default (props) => (
- Moderate - Configure + {lang.t('configure.moderate')} + {lang.t('Configure')}
- Moderate - Configure + {lang.t('configure.moderate')} + {lang.t('configure.Configure')} {props.children}
); + +const lang = new I18n(translations); diff --git a/client/coral-admin/src/components/ModerationKeysModal.js b/client/coral-admin/src/components/ModerationKeysModal.js index 5cf9fe17e..d350c74e0 100644 --- a/client/coral-admin/src/components/ModerationKeysModal.js +++ b/client/coral-admin/src/components/ModerationKeysModal.js @@ -1,5 +1,5 @@ import I18n from 'coral-framework/i18n/i18n'; -import translations from '../translations'; +import translations from '../translations.json'; import React from 'react'; import Modal from 'components/Modal'; import styles from './ModerationKeysModal.css'; diff --git a/client/coral-admin/src/components/ui/Drawer.js b/client/coral-admin/src/components/ui/Drawer.js index 9ea727911..12bf7c1d2 100644 --- a/client/coral-admin/src/components/ui/Drawer.js +++ b/client/coral-admin/src/components/ui/Drawer.js @@ -2,13 +2,17 @@ import React from 'react'; import {Navigation, Drawer} from 'react-mdl'; import {Link} from 'react-router'; import styles from './Header.css'; +import I18n from 'coral-framework/i18n/i18n'; +import translations from '../../translations.json'; export default () => ( - Moderate - Community - Configure + {lang.t('configure.moderate')} + {lang.t('configure.community')} + {lang.t('configure.configure')} ); + +const lang = new I18n(translations); diff --git a/client/coral-admin/src/components/ui/Header.js b/client/coral-admin/src/components/ui/Header.js index 86e622672..d85a91744 100644 --- a/client/coral-admin/src/components/ui/Header.js +++ b/client/coral-admin/src/components/ui/Header.js @@ -2,16 +2,20 @@ import React from 'react'; import {Navigation, Header} from 'react-mdl'; import {Link} from 'react-router'; import styles from './Header.css'; +import I18n from 'coral-framework/i18n/i18n'; +import translations from '../../translations.json'; export default () => (
- Moderate - Community - Configure + {lang.t('configure.moderate')} + {lang.t('configure.community')} + {lang.t('configure.configure')} {`v${process.env.VERSION}`}
); + +const lang = new I18n(translations); diff --git a/client/coral-admin/src/containers/Community/Community.js b/client/coral-admin/src/containers/Community/Community.js index fb6f5df8c..fdb542811 100644 --- a/client/coral-admin/src/containers/Community/Community.js +++ b/client/coral-admin/src/containers/Community/Community.js @@ -1,6 +1,6 @@ import React from 'react'; import I18n from 'coral-framework/i18n/i18n'; -import translations from '../../translations'; +import translations from '../../translations.json'; import {Grid, Cell} from 'react-mdl'; import styles from './Community.css'; diff --git a/client/coral-admin/src/containers/Configure.css b/client/coral-admin/src/containers/Configure.css index 98cb0e254..8d1fc49a2 100644 --- a/client/coral-admin/src/containers/Configure.css +++ b/client/coral-admin/src/containers/Configure.css @@ -23,6 +23,21 @@ cursor: pointer; } +.configSettingInfoBox { + border: 1px solid #ccc; + border-radius: 4px; + margin-bottom: 10px; + cursor: pointer; + width: auto; + height: auto; + text-align: left; +} + +.configSettingInfoBox p { + font-size: 12px; + bottom: 0; +} + .configSettingEmbed { border: 1px solid #ccc; border-radius: 4px; @@ -53,3 +68,7 @@ font-size: 14px; letter-spacing: 0.03em; } + +.hidden { + display: none; +} diff --git a/client/coral-admin/src/containers/Configure.js b/client/coral-admin/src/containers/Configure.js index 229c4e948..7d057eacc 100644 --- a/client/coral-admin/src/containers/Configure.js +++ b/client/coral-admin/src/containers/Configure.js @@ -7,14 +7,14 @@ import { ListItem, ListItemContent, ListItemAction, - //Textfield, + Textfield, Checkbox, Button, Icon } from 'react-mdl'; import styles from './Configure.css'; import I18n from 'coral-framework/i18n/i18n'; -import translations from '../translations'; +import translations from '../translations.json'; class Configure extends React.Component { constructor (props) { @@ -24,6 +24,8 @@ class Configure extends React.Component { this.copyToClipBoard = this.copyToClipBoard.bind(this); this.updateModeration = this.updateModeration.bind(this); + this.updateInfoBoxEnable = this.updateInfoBoxEnable.bind(this); + this.updateInfoBoxContent = this.updateInfoBoxContent.bind(this); this.saveSettings = this.saveSettings.bind(this); } @@ -36,6 +38,16 @@ class Configure extends React.Component { this.props.dispatch(updateSettings({moderation})); } + updateInfoBoxEnable () { + const infoBoxEnable = !this.props.settings.infoBoxEnable; + this.props.dispatch(updateSettings({infoBoxEnable})); + } + + updateInfoBoxContent (event) { + const infoBoxContent = event.target.value; + this.props.dispatch(updateSettings({infoBoxContent})); + } + saveSettings () { this.props.dispatch(saveSettingsToServer()); } @@ -48,22 +60,30 @@ class Configure extends React.Component { onClick={this.updateModeration} checked={this.props.settings.moderation === 'pre'} /> - Enable pre-moderation + {lang.t('configure.enable-pre-moderation')} - {/* - - - Include Comment Stream Description for Readers + + + + + + {lang.t('configure.include-comment-stream')} +

+ {lang.t('configure.include-comment-stream-desc')} +

+
- - - Limit Comment Length - + + + + - */} ; } @@ -84,7 +104,7 @@ class Configure extends React.Component { return -

Copy and paste code below into your CMS to embed your comment box in your articles

+

{lang.t('configure.copy-and-paste')}