From 399ba72e0e24ee4a353897290406db16f3abf2a9 Mon Sep 17 00:00:00 2001 From: gaba Date: Tue, 15 Nov 2016 15:15:41 -0800 Subject: [PATCH] It changes translations to json file. It adds infobox setting. --- client/coral-admin/src/components/Comment.js | 2 +- .../src/components/ModerationKeysModal.js | 2 +- .../src/containers/Community/Community.js | 2 +- .../coral-admin/src/containers/Configure.css | 2 + .../coral-admin/src/containers/Configure.js | 21 ++++++--- .../src/containers/ModerationQueue.js | 4 +- client/coral-admin/src/translations.js | 47 ------------------- client/coral-admin/src/translations.json | 47 +++++++++++++++++++ 8 files changed, 69 insertions(+), 58 deletions(-) delete mode 100644 client/coral-admin/src/translations.js create mode 100644 client/coral-admin/src/translations.json 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/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/containers/Community/Community.js b/client/coral-admin/src/containers/Community/Community.js index 8e0b955a4..1f009429b 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 c832e96c1..a70e68746 100644 --- a/client/coral-admin/src/containers/Configure.css +++ b/client/coral-admin/src/containers/Configure.css @@ -27,6 +27,8 @@ border: 1px solid #ccc; border-radius: 4px; margin-bottom: 10px; + cursor: pointer; + width: auto; } .configSettingEmbed { diff --git a/client/coral-admin/src/containers/Configure.js b/client/coral-admin/src/containers/Configure.js index 416ef8f7b..bafe335ab 100644 --- a/client/coral-admin/src/containers/Configure.js +++ b/client/coral-admin/src/containers/Configure.js @@ -14,7 +14,7 @@ import { } 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); } @@ -41,8 +43,8 @@ class Configure extends React.Component { this.props.dispatch(updateSettings({infoBoxEnable})); } - updateInfoBoxContent () { - const infoBoxContent = this.props.settings.infoBoxContent; + updateInfoBoxContent (event) { + const infoBoxContent = event.target.value; this.props.dispatch(updateSettings({infoBoxContent})); } @@ -60,17 +62,24 @@ class Configure extends React.Component { Enable pre-moderation - + + Include Comment Stream Description for Readers. + Write a message to be added to the top of your comment stream. Pose a topic, include community guidelines, etc. + + + + rows={3} + style={{width: '100%'}}/> {/* diff --git a/client/coral-admin/src/containers/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue.js index 9178bda57..cfc48ae6b 100644 --- a/client/coral-admin/src/containers/ModerationQueue.js +++ b/client/coral-admin/src/containers/ModerationQueue.js @@ -6,7 +6,7 @@ import {updateStatus} from 'actions/comments'; import styles from './ModerationQueue.css'; import key from 'keymaster'; import I18n from 'coral-framework/i18n/i18n'; -import translations from '../translations'; +import translations from '../translations.json'; /* * Renders the moderation queue as a tabbed layout with 3 moderation @@ -91,7 +91,7 @@ class ModerationQueue extends React.Component { commentIds={ comments .get('ids') - .filter(id => + .filter(id => comments .get('byId') .get(id) diff --git a/client/coral-admin/src/translations.js b/client/coral-admin/src/translations.js deleted file mode 100644 index 67a8142fd..000000000 --- a/client/coral-admin/src/translations.js +++ /dev/null @@ -1,47 +0,0 @@ -export default { - en: { - 'community': { - username_and_email: 'Username and Email', - account_creation_date: 'Account Creation Date' - }, - 'modqueue': { - 'pending': 'pending', - 'rejected': 'rejected', - 'flagged': 'flagged', - 'shortcuts': 'Shortcuts', - 'close': 'Close', - 'actions': 'Actions', - 'navigation': 'Navigation', - 'approve': 'Approve comment', - 'reject': 'Reject comment', - 'nextcomment': 'Go to the next comment', - 'prevcomment': 'Go to the previous comment', - 'singleview': 'Toggle single comment edit view', - 'thismenu': 'Open this menu' - }, - 'comment': { - 'flagged': 'flagged', - 'anon': 'Anonymous' - }, - 'embedlink': { - 'copy': 'Copy to Clipboard' - } - }, - es: { - 'community': { - username_and_email: 'Usuario y E-mail', - account_creation_date: 'Fecha de creación de la cuenta' - }, - 'modqueue': { - 'pending': 'pendiente', - 'rejected': 'rechazado', - 'flagged': 'marcado', - 'shortcuts': 'Atajos de teclado', - 'close': 'Cerrar' - }, - 'comment': { - 'flagged': 'marcado', - 'anon': 'Anónimo' - } - } -}; diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json new file mode 100644 index 000000000..43d0939e0 --- /dev/null +++ b/client/coral-admin/src/translations.json @@ -0,0 +1,47 @@ +{ + "en": { + "community": { + "username_and_email": "Username and Email", + "account_creation_date": "Account Creation Date" + }, + "modqueue": { + "pending": "pending", + "rejected": "rejected", + "flagged": "flagged", + "shortcuts": "Shortcuts", + "close": "Close", + "actions": "Actions", + "navigation": "Navigation", + "approve": "Approve comment", + "reject": "Reject comment", + "nextcomment": "Go to the next comment", + "prevcomment": "Go to the previous comment", + "singleview": "Toggle single comment edit view", + "thismenu": "Open this menu" + }, + "comment": { + "flagged": "flagged", + "anon": "Anonymous" + }, + "embedlink": { + "copy": "Copy to Clipboard" + } + }, + "es": { + "community": { + "username_and_email": "Usuario y E-mail", + "account_creation_date": "Fecha de creación de la cuenta" + }, + "modqueue": { + "pending": "pendiente", + "rejected": "rechazado", + "flagged": "marcado", + "shortcuts": "Atajos de teclado", + "close": "Cerrar" + }, + "comment": { + "flagged": "marcado", + "anon": "Anónimo" + } + } +}