diff --git a/.eslintignore b/.eslintignore index 1521c8b76..53c37a166 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1 +1 @@ -dist +dist \ No newline at end of file diff --git a/.eslintrc.json b/.eslintrc.json index 23bdea410..6ac5a08e6 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -59,6 +59,7 @@ "no-multiple-empty-lines": [ "error", {"max": 1} - ] + ], + "newline-per-chained-call": ["error", { "ignoreChainWithDepth": 2 }] } } diff --git a/bin/cli-settings b/bin/cli-settings index 0920473da..cff6c04ed 100755 --- a/bin/cli-settings +++ b/bin/cli-settings @@ -24,11 +24,13 @@ program const Setting = require('../models/setting'); const defaults = {id: '1', moderation: 'pre'}; - Setting.update({id: '1'}, {$setOnInsert: defaults}, {upsert: true}) + Setting + .update({id: '1'}, {$setOnInsert: defaults}, {upsert: true}) .then(() => { console.log('Created settings object.'); mongoose.disconnect(); - }).catch((err) => { + }) + .catch((err) => { console.error(`failed to create the settings object ${JSON.stringify(err)}`); throw new Error(err); // just to be safe }); diff --git a/bin/cli-users b/bin/cli-users index 74aa902eb..b27c41e14 100755 --- a/bin/cli-users +++ b/bin/cli-users @@ -71,10 +71,12 @@ function createUser(options) { }) .then((result) => { return User.createLocalUser(result.email.trim(), result.password.trim(), result.displayName.trim()); - }).then((user) => { + }) + .then((user) => { console.log(`Created user ${user.id}.`); mongoose.disconnect(); - }).catch((err) => { + }) + .catch((err) => { console.error(err); mongoose.disconnect(); }); @@ -249,7 +251,8 @@ function mergeUsers(dstUserID, srcUserID) { .then(() => { console.log(`User ${srcUserID} was merged into user ${dstUserID}.`); mongoose.disconnect(); - }).catch((err) => { + }) + .catch((err) => { console.error(err); mongoose.disconnect(); }); diff --git a/client/coral-admin/public/translations/en.json b/client/coral-admin/public/translations/en.json deleted file mode 100644 index 591de1754..000000000 --- a/client/coral-admin/public/translations/en.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "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" - } -} diff --git a/client/coral-admin/public/translations/es.json b/client/coral-admin/public/translations/es.json deleted file mode 100644 index d151cf13c..000000000 --- a/client/coral-admin/public/translations/es.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "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/AppRouter.js b/client/coral-admin/src/AppRouter.js index d1b25d0f1..5d21fc819 100644 --- a/client/coral-admin/src/AppRouter.js +++ b/client/coral-admin/src/AppRouter.js @@ -4,7 +4,7 @@ import {Router, Route, IndexRoute, browserHistory} from 'react-router'; import ModerationQueue from 'containers/ModerationQueue'; import CommentStream from 'containers/CommentStream'; import Configure from 'containers/Configure'; -import CommunityContainer from 'containers/CommunityContainer'; +import CommunityContainer from 'containers/Community/CommunityContainer'; import LayoutContainer from 'containers/LayoutContainer'; const routes = ( diff --git a/client/coral-admin/src/actions/community.js b/client/coral-admin/src/actions/community.js new file mode 100644 index 000000000..06c8ab0f6 --- /dev/null +++ b/client/coral-admin/src/actions/community.js @@ -0,0 +1,42 @@ +import qs from 'qs'; + +import { + FETCH_COMMENTERS_REQUEST, + FETCH_COMMENTERS_SUCCESS, + FETCH_COMMENTERS_FAILURE, + SORT_UPDATE, + COMMENTERS_NEW_PAGE +} from '../constants/community'; + +import {base, getInit, handleResp} from '../helpers/response'; + +export const fetchCommenters = (query = {}) => dispatch => { + dispatch(requestFetchCommenters()); + fetch(`${base}/user?${qs.stringify(query)}`, getInit('GET')) + .then(handleResp) + .then(({result, page, count, limit, totalPages}) => + dispatch({ + type: FETCH_COMMENTERS_SUCCESS, + commenters: result, + page, + count, + limit, + totalPages + }) + ) + .catch(error => dispatch({type: FETCH_COMMENTERS_FAILURE, error})); +}; + +const requestFetchCommenters = () => ({ + type: FETCH_COMMENTERS_REQUEST +}); + +export const updateSorting = sort => ({ + type: SORT_UPDATE, + sort +}); + +export const newPage = () => ({ + type: COMMENTERS_NEW_PAGE +}); + diff --git a/client/coral-admin/src/components/Page.js b/client/coral-admin/src/components/Page.js deleted file mode 100644 index 845c10cb8..000000000 --- a/client/coral-admin/src/components/Page.js +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react'; -import {Layout} from 'react-mdl'; -import 'material-design-lite'; -import Header from 'components/Header'; - -export default (props) => ( - -
- {props.children} -
- -); diff --git a/client/coral-admin/src/components/ui/Header.js b/client/coral-admin/src/components/ui/Header.js index b7c654bd4..86e622672 100644 --- a/client/coral-admin/src/components/ui/Header.js +++ b/client/coral-admin/src/components/ui/Header.js @@ -9,6 +9,9 @@ export default () => ( Moderate Community Configure + + {`v${process.env.VERSION}`} + ); diff --git a/client/coral-admin/src/components/ui/Layout.css b/client/coral-admin/src/components/ui/Layout.css new file mode 100644 index 000000000..779dec8b9 --- /dev/null +++ b/client/coral-admin/src/components/ui/Layout.css @@ -0,0 +1,4 @@ +.layout { + max-width: 1170px; + margin: 0 auto; +} \ No newline at end of file diff --git a/client/coral-admin/src/components/ui/Layout.js b/client/coral-admin/src/components/ui/Layout.js index e80d55c30..3e1b9cf2d 100644 --- a/client/coral-admin/src/components/ui/Layout.js +++ b/client/coral-admin/src/components/ui/Layout.js @@ -2,11 +2,14 @@ import React from 'react'; import {Layout as LayoutMDL} from 'react-mdl'; import Header from './Header'; import Drawer from './Drawer'; +import styles from './Layout.css'; export const Layout = ({children}) => (
- {children} +
+ {children} +
); diff --git a/client/coral-admin/src/constants/community.js b/client/coral-admin/src/constants/community.js new file mode 100644 index 000000000..e628a14d6 --- /dev/null +++ b/client/coral-admin/src/constants/community.js @@ -0,0 +1,5 @@ +export const FETCH_COMMENTERS_REQUEST = 'FETCH_COMMENTERS_REQUEST'; +export const FETCH_COMMENTERS_SUCCESS = 'FETCH_COMMENTERS_SUCCESS'; +export const FETCH_COMMENTERS_FAILURE = 'FETCH_COMMENTERS_FAILURE'; +export const SORT_UPDATE = 'SORT_UPDATE'; +export const COMMENTERS_NEW_PAGE = 'COMMENTERS_NEW_PAGE'; diff --git a/client/coral-admin/src/containers/Community/Community.css b/client/coral-admin/src/containers/Community/Community.css new file mode 100644 index 000000000..63148da7e --- /dev/null +++ b/client/coral-admin/src/containers/Community/Community.css @@ -0,0 +1,22 @@ +.dataTable { + width: 100%; +} + +.roleButton { + display: block; +} + +.searchInput { + display: block; + padding-left: 40px; + /*border: none;*/ +} + +.searchBox { + /*border: 1px solid rgba(0,0,0,.12);*/ + background: white; +} + +.email { + display: block; +} \ No newline at end of file diff --git a/client/coral-admin/src/containers/Community/Community.js b/client/coral-admin/src/containers/Community/Community.js new file mode 100644 index 000000000..8e0b955a4 --- /dev/null +++ b/client/coral-admin/src/containers/Community/Community.js @@ -0,0 +1,68 @@ +import React from 'react'; +import I18n from 'coral-framework/i18n/i18n'; +import translations from '../../translations'; +import {Grid, Cell} from 'react-mdl'; + +import styles from './Community.css'; +import Table from './Table'; +import Loading from './Loading'; +import NoResults from './NoResults'; +import Pager from './Pager'; + +const lang = new I18n(translations); + +const tableHeaders = [ + { + title: lang.t('community.username_and_email'), + field: 'displayName' + }, + { + title: lang.t('community.account_creation_date'), + field: 'created_at' + } +]; + +const Community = ({isFetching, commenters, ...props}) => { + const hasResults = !isFetching && !!commenters.length; + return ( + + +
+
+ +
+ +
+
+
+ + + { isFetching && } + { !hasResults && } + { hasResults && + + } + + + + ); +}; + +export default Community; diff --git a/client/coral-admin/src/containers/Community/CommunityContainer.js b/client/coral-admin/src/containers/Community/CommunityContainer.js new file mode 100644 index 000000000..cf67dba4d --- /dev/null +++ b/client/coral-admin/src/containers/Community/CommunityContainer.js @@ -0,0 +1,80 @@ +import React, {Component} from 'react'; +import {connect} from 'react-redux'; +import { + fetchCommenters, + updateSorting, + newPage, +} from '../../actions/community'; + +import Community from './Community'; + +class CommunityContainer extends Component { + constructor(props) { + super(props); + + this.state = { + searchValue: '' + }; + + this.onKeyDownHandler = this.onKeyDownHandler.bind(this); + this.onChangeHandler = this.onChangeHandler.bind(this); + this.onHeaderClickHandler = this.onHeaderClickHandler.bind(this); + this.onNewPageHandler = this.onNewPageHandler.bind(this); + } + + onKeyDownHandler(e) { + if (e.key === 'Enter') { + e.preventDefault(); + this.search(); + } + } + + onChangeHandler(e) { + this.setState({ + searchValue: e.target.value + }); + } + + search(query = {}) { + const {community} = this.props; + + this.props.dispatch(fetchCommenters({ + value: this.state.searchValue, + field: community.get('field'), + asc: community.get('asc'), + ...query + })); + } + + componentDidMount() { + this.search(); + } + + onHeaderClickHandler(sort) { + this.props.dispatch(updateSorting(sort)); + this.search(); + } + + onNewPageHandler(page) { + this.props.dispatch(newPage(page)); + this.search({page}); + } + + render() { + const {searchValue} = this.state; + const {community} = this.props; + return ( + + ); + } +} + +export default connect(({community}) => ({community}))(CommunityContainer); diff --git a/client/coral-admin/src/containers/Community/Loading.js b/client/coral-admin/src/containers/Community/Loading.js new file mode 100644 index 000000000..beda271eb --- /dev/null +++ b/client/coral-admin/src/containers/Community/Loading.js @@ -0,0 +1,7 @@ +import React from 'react'; + +const Loading = () => ( +

Loading results

+); + +export default Loading; diff --git a/client/coral-admin/src/containers/Community/NoResults.js b/client/coral-admin/src/containers/Community/NoResults.js new file mode 100644 index 000000000..9e0663960 --- /dev/null +++ b/client/coral-admin/src/containers/Community/NoResults.js @@ -0,0 +1,9 @@ +import React from 'react'; + +const NoResults = () => ( +
+ No users found with that user name or email address +
+); + +export default NoResults; diff --git a/client/coral-admin/src/containers/Community/Pager.css b/client/coral-admin/src/containers/Community/Pager.css new file mode 100644 index 000000000..82e96f727 --- /dev/null +++ b/client/coral-admin/src/containers/Community/Pager.css @@ -0,0 +1,10 @@ +.li { + display: inline-block; + margin-right: 5px; + padding: 0; + min-width: 30px; +} + +.current { + background: #e3edf3; +} \ No newline at end of file diff --git a/client/coral-admin/src/containers/Community/Pager.js b/client/coral-admin/src/containers/Community/Pager.js new file mode 100644 index 000000000..3184cfca0 --- /dev/null +++ b/client/coral-admin/src/containers/Community/Pager.js @@ -0,0 +1,45 @@ +import React, {PropTypes} from 'react'; +import styles from './Pager.css'; + +const Rows = (curr, total, onClickHandler) => Array.from(Array(total)).map((e, i) => +
  • onClickHandler(i + 1)}> + {i + 1} +
    • +); + +const Pager = ({totalPages, page, onNewPageHandler}) => ( +
    +
      + { + (totalPages > page) ? +
    • onNewPageHandler(page - 1)}> + Prev +
      • + : + null + } + {Rows(page, totalPages, onNewPageHandler)} + { + (page < totalPages) ? +
    • onNewPageHandler(page + 1)}> + Next +
      • + : + null + } +
    +
    +); + +Pager.propTypes = { + totalPages: PropTypes.number.isRequired, + page: PropTypes.number.isRequired, +}; + +export default Pager; + diff --git a/client/coral-admin/src/containers/Community/Table.js b/client/coral-admin/src/containers/Community/Table.js new file mode 100644 index 000000000..a15a88723 --- /dev/null +++ b/client/coral-admin/src/containers/Community/Table.js @@ -0,0 +1,34 @@ +import React from 'react'; +import styles from './Community.css'; + +const Table = ({headers, data, onHeaderClickHandler}) => ( +
    + + + {headers.map((header, i) =>( + + ))} + + + + {data.map((row, i)=> ( + + + + + ))} + +
    onHeaderClickHandler({field: header.field})}> + {header.title} +
    + {row.displayName} + {row.profiles.map(({id}) => id)} + + {row.created_at} +
    +); + +export default Table; diff --git a/client/coral-admin/src/containers/CommunityContainer.js b/client/coral-admin/src/containers/CommunityContainer.js deleted file mode 100644 index b936edcec..000000000 --- a/client/coral-admin/src/containers/CommunityContainer.js +++ /dev/null @@ -1,11 +0,0 @@ -import React, {Component} from 'react'; - -export default class CommunityContainer extends Component { - render() { - return ( -
    -

    Community

    -
    - ); - } -} diff --git a/client/coral-admin/src/containers/LayoutContainer.js b/client/coral-admin/src/containers/LayoutContainer.js index 50f54a631..921af251d 100644 --- a/client/coral-admin/src/containers/LayoutContainer.js +++ b/client/coral-admin/src/containers/LayoutContainer.js @@ -1,18 +1,19 @@ -import React, {Component}from 'react'; +import React, {Component} from 'react'; import {connect} from 'react-redux'; import {Layout} from '../components/ui/Layout'; class LayoutContainer extends Component { render () { - return ; + return ; } } LayoutContainer.propTypes = {}; -const mapStateToProps = () => ({data: {}}); +const mapStateToProps = () => ({}); const mapDispatchToProps = (dispatch) => ({dispatch}); export default connect(mapStateToProps, mapDispatchToProps)(LayoutContainer); + diff --git a/client/coral-admin/src/containers/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue.js index 6cd9f46fc..9178bda57 100644 --- a/client/coral-admin/src/containers/ModerationQueue.js +++ b/client/coral-admin/src/containers/ModerationQueue.js @@ -73,7 +73,12 @@ class ModerationQueue extends React.Component { !comments.get('byId').get(id).get('status'))} + commentIds={ + comments.get('ids') + .filter(id => !comments.get('byId') + .get(id) + .get('status')) + } comments={comments.get('byId')} onClickAction={(action, id) => this.onCommentAction(action, id)} actions={['reject', 'approve']} @@ -83,7 +88,15 @@ class ModerationQueue extends React.Component { comments.get('byId').get(id).get('status') === 'rejected')} + commentIds={ + comments + .get('ids') + .filter(id => + comments + .get('byId') + .get(id) + .get('status') === 'rejected') + } comments={comments.get('byId')} onClickAction={(action, id) => this.onCommentAction(action, id)} actions={['approve']} diff --git a/client/coral-admin/src/helpers/response.js b/client/coral-admin/src/helpers/response.js new file mode 100644 index 000000000..439ba5a8a --- /dev/null +++ b/client/coral-admin/src/helpers/response.js @@ -0,0 +1,27 @@ +export const base = '/api/v1'; + +export const getInit = (method, body) => { + const headers = new Headers({ + 'Content-Type': 'application/json', + 'Accept': 'application/json' + }); + + const init = {method, headers}; + if (method.toLowerCase() !== 'get') { + init.body = JSON.stringify(body); + } + + return init; +}; + +export const handleResp = res => { + if (res.status === 401) { + throw new Error('Not Authorized to make this request'); + } else if (res.status > 399) { + throw new Error('Error! Status ', res.status); + } else if (res.status === 204) { + return res.text(); + } else { + return res.json(); + } +}; diff --git a/client/coral-admin/src/index.js b/client/coral-admin/src/index.js index aed9d5748..84d1b84ad 100644 --- a/client/coral-admin/src/index.js +++ b/client/coral-admin/src/index.js @@ -1,4 +1,3 @@ - import React from 'react'; import ReactDOM from 'react-dom'; import App from './components/App'; diff --git a/client/coral-admin/src/reducers/community.js b/client/coral-admin/src/reducers/community.js new file mode 100644 index 000000000..8d5dfd2c3 --- /dev/null +++ b/client/coral-admin/src/reducers/community.js @@ -0,0 +1,47 @@ +import {Map} from 'immutable'; + +import { + FETCH_COMMENTERS_REQUEST, + FETCH_COMMENTERS_FAILURE, + FETCH_COMMENTERS_SUCCESS, + SORT_UPDATE +} from '../constants/community'; + +const initialState = Map({ + community: Map(), + isFetching: false, + error: '', + commenters: [], + field: 'created_at', + asc: false, + totalPages: 0, + page: 0 +}); + +export default function community (state = initialState, action) { + switch (action.type) { + case FETCH_COMMENTERS_REQUEST : + return state + .set('isFetching', true); + case FETCH_COMMENTERS_FAILURE : + return state + .set('isFetching', false) + .set('error', action.error); + case FETCH_COMMENTERS_SUCCESS : { + const {commenters, type, ...rest} = action; // eslint-disable-line + return state + .merge({ + isFetching: false, + error: '', + ...rest + }) + .set('commenters', commenters); // Sets to normal array + } + case SORT_UPDATE : + return state + .set('field', action.sort.field) + .set('asc', !state.get('asc')); + default : + return state; + } +} diff --git a/client/coral-admin/src/reducers/index.js b/client/coral-admin/src/reducers/index.js index 63176ca3b..1b29ced69 100644 --- a/client/coral-admin/src/reducers/index.js +++ b/client/coral-admin/src/reducers/index.js @@ -1,10 +1,12 @@ - import {combineReducers} from 'redux'; import comments from 'reducers/comments'; import settings from 'reducers/settings'; +import community from 'reducers/community'; // Combine all reducers into a main one export default combineReducers({ settings, - comments + comments, + community }); + diff --git a/client/coral-admin/src/translations.js b/client/coral-admin/src/translations.js index 5302c1221..67a8142fd 100644 --- a/client/coral-admin/src/translations.js +++ b/client/coral-admin/src/translations.js @@ -1,5 +1,9 @@ export default { en: { + 'community': { + username_and_email: 'Username and Email', + account_creation_date: 'Account Creation Date' + }, 'modqueue': { 'pending': 'pending', 'rejected': 'rejected', @@ -24,6 +28,10 @@ export default { } }, es: { + 'community': { + username_and_email: 'Usuario y E-mail', + account_creation_date: 'Fecha de creación de la cuenta' + }, 'modqueue': { 'pending': 'pendiente', 'rejected': 'rechazado', diff --git a/client/coral-embed-stream/src/CommentStream.js b/client/coral-embed-stream/src/CommentStream.js index 28b70841f..d6edfddda 100644 --- a/client/coral-embed-stream/src/CommentStream.js +++ b/client/coral-embed-stream/src/CommentStream.js @@ -108,6 +108,7 @@ class CommentStream extends Component { appendItemArray={this.props.appendItemArray} updateItem={this.props.updateItem} id={rootItemId} + premod={this.props.config.moderation} reply={false}/> { @@ -138,6 +139,7 @@ class CommentStream extends Component { updateItem={this.props.updateItem} id={rootItemId} parent_id={commentId} + premod={this.props.config.moderation} showReply={comment.showReply}/> { comment.children && @@ -168,7 +170,7 @@ class CommentStream extends Component { }) } diff --git a/client/coral-framework/store/actions/config.js b/client/coral-framework/store/actions/config.js index 7eb82d428..f131b8c82 100644 --- a/client/coral-framework/store/actions/config.js +++ b/client/coral-framework/store/actions/config.js @@ -14,17 +14,24 @@ export const FETCH_CONFIG_SUCCESS = 'FETCH_CONFIG_SUCCESS'; * Action creators */ -export const fetchConfig = () => async (dispatch) => { - dispatch({type: FETCH_CONFIG_REQUEST}); +export function fetchConfig () { + return (dispatch) => { + + dispatch({type: FETCH_CONFIG_REQUEST}); - try { - //TODO: Replace with fetching config from backend - // const response = await fetch(`./talk.config.json`) - // const json = await response.json() - dispatch({type: FETCH_CONFIG_SUCCESS, config: fromJS({ - notifLength: 4500 - })}); - } catch (error) { - dispatch({type: FETCH_CONFIG_FAILED}); - } -}; + return fetch('/api/v1/settings') + .then( + response => { + return response.ok ? response.json() + : Promise.reject(`${response.status} ${response.statusText}`); + } + ) + .then((json) => { + return dispatch({type: FETCH_CONFIG_SUCCESS, config: fromJS(json)}); + }) + .catch((error) => { + dispatch({type: FETCH_CONFIG_FAILED, error}); + }); + + }; +} diff --git a/client/coral-framework/store/actions/items.js b/client/coral-framework/store/actions/items.js index b690c6f0a..07f8e54af 100644 --- a/client/coral-framework/store/actions/items.js +++ b/client/coral-framework/store/actions/items.js @@ -148,7 +148,7 @@ export function getStream (assetId) { export function getItemsArray (ids) { return (dispatch) => { - return fetch(`/v1/item/${ ids}`) + return fetch(`/v1/item/${ids}`) .then( response => { return response.ok ? response.json() @@ -241,7 +241,8 @@ export function postAction (item_id, action_type, user_id, item_type) { return response.ok ? response.json() : Promise.reject(`${response.status} ${response.statusText}`); } - ).then((json)=>{ + ) + .then((json)=>{ return json; }); }; diff --git a/client/coral-plugin-author-name/AuthorName.js b/client/coral-plugin-author-name/AuthorName.js index ddfd40ccf..585c1c07d 100644 --- a/client/coral-plugin-author-name/AuthorName.js +++ b/client/coral-plugin-author-name/AuthorName.js @@ -2,7 +2,7 @@ import React from 'react'; const packagename = 'coral-plugin-author-name'; const AuthorName = ({name}) => -
    +
    {name}
    ; diff --git a/client/coral-plugin-comment-count/CommentCount.js b/client/coral-plugin-comment-count/CommentCount.js index b0d7312e2..47f00ffb5 100644 --- a/client/coral-plugin-comment-count/CommentCount.js +++ b/client/coral-plugin-comment-count/CommentCount.js @@ -1,5 +1,6 @@ import React from 'react'; - +import {I18n} from '../coral-framework'; +import translations from './translations.json'; const name = 'coral-plugin-comment-count'; const CommentCount = ({items, id}) => { @@ -15,9 +16,11 @@ const CommentCount = ({items, id}) => { } } - return
    - {`${count } ${ count === 1 ? 'Comment' : 'Comments'}`} + return
    + {`${count} ${count === 1 ? lang.t('comment') : lang.t('comment-plural')}`}
    ; }; export default CommentCount; + +const lang = new I18n(translations); diff --git a/client/coral-plugin-comment-count/translations.json b/client/coral-plugin-comment-count/translations.json new file mode 100644 index 000000000..f212810e9 --- /dev/null +++ b/client/coral-plugin-comment-count/translations.json @@ -0,0 +1,10 @@ +{ + "en": { + "comment": "Comment", + "comment-plural": "Comments" + }, + "es": { + "comment": "Comentario", + "comment-plural": "Comentarios" + } +} diff --git a/client/coral-plugin-commentbox/CommentBox.js b/client/coral-plugin-commentbox/CommentBox.js index a4e32d73b..9032ad328 100644 --- a/client/coral-plugin-commentbox/CommentBox.js +++ b/client/coral-plugin-commentbox/CommentBox.js @@ -1,5 +1,6 @@ import React, {Component, PropTypes} from 'react'; import {I18n} from '../coral-framework'; +import translations from './translations.json'; const name = 'coral-plugin-commentbox'; @@ -19,7 +20,7 @@ class CommentBox extends Component { } postComment = () => { - const {postItem, updateItem, id, parent_id, addNotification, appendItemArray} = this.props; + const {postItem, updateItem, id, parent_id, addNotification, appendItemArray, premod} = this.props; let comment = { body: this.state.body, asset_id: id, @@ -38,9 +39,14 @@ class CommentBox extends Component { updateItem(parent_id, 'showReply', false, 'comments'); postItem(comment, 'comments') .then((comment_id) => { - appendItemArray(parent_id || id, related, comment_id, !parent_id, parent_type); - addNotification('success', 'Your comment has been posted.'); - }).catch((err) => console.error(err)); + if (premod === 'pre') { + addNotification('success', lang.t('comment-post-notif-premod')); + } else { + appendItemArray(parent_id || id, related, comment_id, !parent_id, parent_type); + addNotification('success', 'Your comment has been posted.'); + } + }) + .catch((err) => console.error(err)); this.setState({body: ''}); } @@ -54,7 +60,7 @@ class CommentBox extends Component { style={styles && styles.textarea} value={this.state.username} id={reply ? 'replyUser' : 'commentUser'} - placeholder='Name' + placeholder={lang.t('name')} onChange={(e) => this.setState({username: e.target.value})}/>
    this.setState({body: e.target.value})} rows={3}/> @@ -88,15 +94,4 @@ class CommentBox extends Component { export default CommentBox; -const lang = new I18n({ - en: { - post: 'Post', - reply: 'Reply', - comment: 'Comment', - }, - es: { - post: 'Publicar', - reply: 'Respuesta', - comment: 'Comentario' - } -}); +const lang = new I18n(translations); diff --git a/client/coral-plugin-commentbox/translations.json b/client/coral-plugin-commentbox/translations.json new file mode 100644 index 000000000..e8eb8ad52 --- /dev/null +++ b/client/coral-plugin-commentbox/translations.json @@ -0,0 +1,18 @@ +{ + "en": { + "post": "Post", + "reply": "Reply", + "comment": "Comment", + "name": "Name", + "comment-post-notif": "Your comment has been posted.", + "comment-post-notif-premod": "Thank you for reporting this comment. Our moderation team has been notified and will review it shortly." + }, + "es": { + "post": "Publicar", + "reply": "Respuesta", + "comment": "Comentario", + "name": "Nombre", + "comment-post-notif": "¡traduceme!", + "comment-post-notif-premod": "¡traduceme!" + } +} diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js index eeeb5e3f5..4f90dfb7c 100644 --- a/client/coral-plugin-flags/FlagButton.js +++ b/client/coral-plugin-flags/FlagButton.js @@ -1,4 +1,6 @@ import React from 'react'; +import {I18n} from '../coral-framework'; +import translations from './translations.json'; const name = 'coral-plugin-flags'; @@ -10,7 +12,7 @@ const FlagButton = ({flag, id, postAction, addItem, updateItem, addNotification} addItem({...action, current_user:true}, 'actions'); updateItem(action.item_id, action.action_type, action.id, 'comments'); }); - addNotification('success', 'Thank you for reporting this comment. Our moderation team has been notified and will review it shortly.'); + addNotification('success', lang.t('flag-notif')); }; return
    @@ -20,8 +22,8 @@ const FlagButton = ({flag, id, postAction, addItem, updateItem, addNotification} aria-hidden={true}>flag { flagged - ? Flagged - : Flag + ? {lang.t('flag')} + : {lang.t('flagged')} }
    ; @@ -37,3 +39,5 @@ const styles = { color: 'inherit' } }; + +const lang = new I18n(translations); diff --git a/client/coral-plugin-flags/translations.json b/client/coral-plugin-flags/translations.json new file mode 100644 index 000000000..28eb9f8cb --- /dev/null +++ b/client/coral-plugin-flags/translations.json @@ -0,0 +1,12 @@ +{ + "en": { + "flag": "Flag", + "flagged": "Flagged", + "flag-notif": "Thank you for reporting this comment. Our moderation team has been notified and will review it shortly." + }, + "es": { + "flag": "Marcar", + "flagged": "Marcado", + "flag-notif": "Gracias por marcar este comentario. Nuestro equipo de moderación ha sido notificado y muy pronto lo va a revisar." + } +} diff --git a/client/coral-plugin-replies/ReplyBox.js b/client/coral-plugin-replies/ReplyBox.js index cd226181b..6614aed72 100644 --- a/client/coral-plugin-replies/ReplyBox.js +++ b/client/coral-plugin-replies/ReplyBox.js @@ -4,16 +4,11 @@ import CommentBox from '../coral-plugin-commentbox/CommentBox'; const name = 'coral-plugin-replies'; const ReplyBox = (props) =>
    { props.showReply && } diff --git a/client/coral-plugin-replies/ReplyButton.js b/client/coral-plugin-replies/ReplyButton.js index 82c379e86..44213c2f7 100644 --- a/client/coral-plugin-replies/ReplyButton.js +++ b/client/coral-plugin-replies/ReplyButton.js @@ -1,5 +1,6 @@ import React from 'react'; import {I18n} from '../coral-framework'; +import translations from './translations.json'; const name = 'coral-plugin-replies'; @@ -13,11 +14,4 @@ const ReplyButton = (props) =>