From 91060537bbbbdaf8888d0109b475c55dd6b7ad73 Mon Sep 17 00:00:00 2001 From: okbel Date: Wed, 16 May 2018 11:51:28 -0300 Subject: [PATCH 01/32] displaying multiple provider ids --- .../coral-admin/src/components/UserDetail.js | 19 ++++++++++++++++--- .../coral-admin/src/containers/UserDetail.js | 1 + .../src/routes/Community/components/People.js | 9 ++++++++- locales/en.yml | 1 + 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js index 5dabc5b6f..de69f8a93 100644 --- a/client/coral-admin/src/components/UserDetail.js +++ b/client/coral-admin/src/components/UserDetail.js @@ -185,11 +185,24 @@ class UserDetail extends React.Component { {new Date(user.created_at).toLocaleString()} - {user.profiles.map(({ id }) => ( +
  • + + + {t('user_detail.email')}: + + {user.email}{' '} + +
    • + + {user.profiles.map(({ provider, id }) => (
  • - + - {t('user_detail.email')}: + {capitalize(provider)} {t('user_detail.id')}: {id}{' '} - {user.profiles.map(({ id }) => id)} + {user.email + ? user.email + : user.profiles.map(({ id }, i) => { + if (i === user.profiles.length - 1) { + return id; + } + return `${id}, `; + })} diff --git a/locales/en.yml b/locales/en.yml index 36cf956b4..0c25c2c94 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -467,6 +467,7 @@ en: all: "All" rejected: "Rejected" user_history: "User History" + id: "ID" user_history: user_banned: "User banned" ban_removed: "Ban removed" From 2524004e2a5e50cf7eeb6a5ab90d5c6482ea3926 Mon Sep 17 00:00:00 2001 From: okbel Date: Wed, 16 May 2018 11:55:05 -0300 Subject: [PATCH 02/32] Styling --- client/coral-admin/src/components/UserDetail.css | 4 ++++ client/coral-admin/src/components/UserDetail.js | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/client/coral-admin/src/components/UserDetail.css b/client/coral-admin/src/components/UserDetail.css index 58faee5c4..389971b32 100644 --- a/client/coral-admin/src/components/UserDetail.css +++ b/client/coral-admin/src/components/UserDetail.css @@ -143,3 +143,7 @@ border-color: #E45241; color: white; } + +.userDetailItem { + padding: 2px 0; +} diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js index de69f8a93..a61ee81ec 100644 --- a/client/coral-admin/src/components/UserDetail.js +++ b/client/coral-admin/src/components/UserDetail.js @@ -177,7 +177,7 @@ class UserDetail extends React.Component {
      -
    • +
    • {t('user_detail.member_since')}: @@ -185,7 +185,7 @@ class UserDetail extends React.Component { {new Date(user.created_at).toLocaleString()}
      • -
    • +
    • {t('user_detail.email')}: @@ -199,7 +199,7 @@ class UserDetail extends React.Component {
      • {user.profiles.map(({ provider, id }) => ( -
    • +
    • {capitalize(provider)} {t('user_detail.id')}: From 2eac8f48d623d717c4e5331ef79fe1b8d9061dfd Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Wed, 16 May 2018 21:37:35 +0200 Subject: [PATCH 03/32] Workaround IOS focus bug when clicking on buttons --- .../client/components/rte/components/Button.js | 11 ++--------- .../client/components/rte/factories/createToggle.js | 12 ++++++++++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/plugins/talk-plugin-rich-text/client/components/rte/components/Button.js b/plugins/talk-plugin-rich-text/client/components/rte/components/Button.js index f99648cb7..fd5d451a1 100644 --- a/plugins/talk-plugin-rich-text/client/components/rte/components/Button.js +++ b/plugins/talk-plugin-rich-text/client/components/rte/components/Button.js @@ -7,21 +7,17 @@ class Button extends React.Component { render() { const { className, - title, - onClick, children, active, activeClassName, - disabled, + ...rest } = this.props; return ( @@ -32,11 +28,8 @@ class Button extends React.Component { Button.propTypes = { className: PropTypes.string, activeClassName: PropTypes.string, - title: PropTypes.string, - onClick: PropTypes.func, children: PropTypes.node, active: PropTypes.bool, - disabled: PropTypes.bool, }; export default Button; diff --git a/plugins/talk-plugin-rich-text/client/components/rte/factories/createToggle.js b/plugins/talk-plugin-rich-text/client/components/rte/factories/createToggle.js index 028757222..59b75fdf2 100644 --- a/plugins/talk-plugin-rich-text/client/components/rte/factories/createToggle.js +++ b/plugins/talk-plugin-rich-text/client/components/rte/factories/createToggle.js @@ -1,6 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import Button from '../components/Button'; +import bowser from 'bowser'; /** * createToggle creates a button that can be active, inactive or disabled @@ -32,7 +33,17 @@ const createToggle = ( this.execCommand(); }; + // Detect whether there was focus on the RTE before the click. + hadFocusBeforeClick = false; + handleMouseDown = () => (this.hadFocusBeforeClick = this.props.api.focused); + handleClick = () => { + // Skip IOS when the focus was not there before. + // IOS fails to focus to the RTE correctly and scrolls to nirvana. + // See https://www.pivotaltracker.com/story/show/157607216 + if (!this.hadFocusBeforeClick && bowser.ios) { + return; + } this.props.api.focus(); this.formatToggle(); this.props.api.focus(); @@ -62,6 +73,7 @@ const createToggle = ( - -
    - - - - \ No newline at end of file diff --git a/plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.njk b/plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.njk new file mode 100644 index 000000000..f8191d525 --- /dev/null +++ b/plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.njk @@ -0,0 +1,61 @@ +{% extends "templates/account.njk" %} + +{% block title %}{{ t('talk-plugin-notifications.unsubscribe_page.unsubscribe') }}{% endblock %} + +{% block html %} +
    +
    {{ t('talk-plugin-notifications.unsubscribe_page.token_invalid') }}
    + +
    + {{ t('talk-plugin-notifications.unsubscribe_page.click_to_confirm') }} + +
    +
    +{% endblock %} + +{% block js %} + + +{% endblock %} diff --git a/plugins/talk-plugin-profile-data/server/router.js b/plugins/talk-plugin-profile-data/server/router.js index 6d8f47d03..6bd165e64 100644 --- a/plugins/talk-plugin-profile-data/server/router.js +++ b/plugins/talk-plugin-profile-data/server/router.js @@ -102,7 +102,7 @@ async function loadComments(ctx, userID, archive, latestContentDate) { module.exports = router => { // /account/download will render the download page. router.get('/account/download', (req, res) => { - res.render(path.join(__dirname, 'views', 'download')); + res.render(path.join(__dirname, 'views', 'download.njk')); }); // /api/v1/account/download will send back a zipped archive of the users diff --git a/plugins/talk-plugin-profile-data/server/views/download.ejs b/plugins/talk-plugin-profile-data/server/views/download.ejs deleted file mode 100644 index 260badf3a..000000000 --- a/plugins/talk-plugin-profile-data/server/views/download.ejs +++ /dev/null @@ -1,56 +0,0 @@ - - - - <%= t('download_landing.download_your_account') %> - <%- include(root + '/partials/account') %> - - -
    -
    -

    <%= t('download_landing.download_your_account') %>

    -

    <%= t('download_landing.download_details') %>

    -

    <%= t('download_landing.all_information_included') %>

    -
      -
    • <%= t('download_landing.information_included.date') %>
      • -
    • <%= t('download_landing.information_included.url') %>
      • -
    • <%= t('download_landing.information_included.body') %>
      • -
    • <%= t('download_landing.information_included.asset_url') %>
      • -
    -
    -
    - -
    -
    -
    - - - - diff --git a/plugins/talk-plugin-profile-data/server/views/download.njk b/plugins/talk-plugin-profile-data/server/views/download.njk new file mode 100644 index 000000000..5527473bc --- /dev/null +++ b/plugins/talk-plugin-profile-data/server/views/download.njk @@ -0,0 +1,56 @@ +{% extends "templates/account.njk" %} + +{% block title %}{{ t('download_landing.download_your_account') }}{% endblock %} + +{% block html %} +
    +
    +

    {{ t('download_landing.download_your_account') }}

    +

    {{ t('download_landing.download_details') }}

    +

    {{ t('download_landing.all_information_included') }}

    +
      +
    • {{ t('download_landing.information_included.date') }}
      • +
    • {{ t('download_landing.information_included.url') }}
      • +
    • {{ t('download_landing.information_included.body') }}
      • +
    • {{ t('download_landing.information_included.asset_url') }}
      • +
    +
    +
    + +
    +
    +
    +{% endblock %} + +{% block js %} + + +{% endblock %} diff --git a/routes/account/index.js b/routes/account/index.js index 70e62accc..37b26e344 100644 --- a/routes/account/index.js +++ b/routes/account/index.js @@ -2,11 +2,11 @@ const express = require('express'); const router = express.Router(); router.get('/email/confirm', (req, res) => { - res.render('account/email/confirm'); + res.render('account/email/confirm.njk'); }); router.get('/password/reset', (req, res) => { - res.render('account/password/reset'); + res.render('account/password/reset.njk'); }); module.exports = router; diff --git a/routes/admin/index.js b/routes/admin/index.js index d00ef8642..1a9993cfd 100644 --- a/routes/admin/index.js +++ b/routes/admin/index.js @@ -2,7 +2,7 @@ const express = require('express'); const router = express.Router(); router.get('*', (req, res) => { - res.render('admin'); + res.render('admin.njk'); }); module.exports = router; diff --git a/routes/api/v1/graph.js b/routes/api/v1/graph.js index 40e87415b..0660755ea 100644 --- a/routes/api/v1/graph.js +++ b/routes/api/v1/graph.js @@ -10,7 +10,7 @@ router.use('/ql', apollo.graphqlExpress(createGraphOptions)); if (process.env.NODE_ENV !== 'production') { // Interactive graphiql interface. router.use('/iql', staticTemplate, (req, res) => { - res.render('api/graphiql', { + res.render('api/graphiql.njk', { endpointURL: 'api/v1/graph/ql', }); }); diff --git a/routes/dev/assets.js b/routes/dev/assets.js index aea0628e3..df59f21a0 100644 --- a/routes/dev/assets.js +++ b/routes/dev/assets.js @@ -11,7 +11,7 @@ router.get('/id/:asset_id', async (req, res, next) => { throw new ErrNotFound(); } - res.render('dev/article', { + res.render('dev/article.njk', { title: asset.title, asset_id: asset.id, asset_url: asset.url, @@ -28,7 +28,7 @@ router.get('/random', (req, res) => { }); router.get('/title/:asset_title', (req, res) => { - res.render('dev/article', { + res.render('dev/article.njk', { title: req.params.asset_title.split('-').join(' '), asset_url: '', asset_id: null, @@ -48,7 +48,7 @@ router.get('/', async (req, res, next) => { Asset.count(), ]); - res.render('dev/articles', { + res.render('dev/articles.njk', { skip, limit, count, diff --git a/routes/dev/index.js b/routes/dev/index.js index 58daca583..580e702fd 100644 --- a/routes/dev/index.js +++ b/routes/dev/index.js @@ -12,7 +12,7 @@ router.get('/', staticTemplate, async (req, res) => { await SetupService.isAvailable(); return res.redirect(url.resolve(MOUNT_PATH, 'admin/install')); } catch (e) { - return res.render('dev/article', { + return res.render('dev/article.njk', { title: 'Coral Talk', asset_url: '', asset_id: '', diff --git a/routes/embed/index.js b/routes/embed/index.js index 695ffe609..7456a5b71 100644 --- a/routes/embed/index.js +++ b/routes/embed/index.js @@ -2,7 +2,7 @@ const express = require('express'); const router = express.Router(); router.use('/stream', (req, res) => { - res.render('embed/stream'); + res.render('embed/stream.njk'); }); module.exports = router; diff --git a/routes/login/index.js b/routes/login/index.js index b69cb7f5c..e03690dd0 100644 --- a/routes/login/index.js +++ b/routes/login/index.js @@ -2,7 +2,7 @@ const express = require('express'); const router = express.Router(); router.get('*', (req, res) => { - res.render('login'); + res.render('login.njk'); }); module.exports = router; diff --git a/services/passport.js b/services/passport.js index e4813e419..4b96d2352 100644 --- a/services/passport.js +++ b/services/passport.js @@ -115,13 +115,13 @@ const HandleAuthPopupCallback = (req, res, next) => (err, user) => { res.locals.encodeJSONForHTML = encodeJSONForHTML; if (err) { - return res.render('auth-callback', { + return res.render('auth-callback.njk', { auth: { err, data: null }, }); } if (!user) { - return res.render('auth-callback', { + return res.render('auth-callback.njk', { auth: { err: new ErrNotAuthorized(), data: null }, }); } @@ -132,7 +132,7 @@ const HandleAuthPopupCallback = (req, res, next) => (err, user) => { SetTokenForSafari(req, res, token); // We logged in the user! Let's send back the user data. - res.render('auth-callback', { + res.render('auth-callback.njk', { auth: { err: null, data: { user, token } }, }); }; diff --git a/views/account/email/confirm.ejs b/views/account/email/confirm.ejs deleted file mode 100644 index 47bc7773b..000000000 --- a/views/account/email/confirm.ejs +++ /dev/null @@ -1,63 +0,0 @@ - - - - <%= t('confirm_email.email_confirmation') %> - <%- include ../../partials/account %> - - -
    -
    -

    <%= t('confirm_email.email_confirmation') %>

    -

    <%= t('confirm_email.click_to_confirm') %>

    -
    -
    - -
    -
    -
    - - - - diff --git a/views/account/email/confirm.njk b/views/account/email/confirm.njk new file mode 100644 index 000000000..6111cb21e --- /dev/null +++ b/views/account/email/confirm.njk @@ -0,0 +1,63 @@ +{% extends "templates/account.njk" %} + +{% block title %}{{ t('confirm_email.email_confirmation') }}{% endblock %} + +{% block html %} +
    +
    +

    {{ t('confirm_email.email_confirmation') }}

    +

    {{ t('confirm_email.click_to_confirm') }}

    +
    +
    + +
    +
    +
    +{% endblock %} + +{% block js %} + + +{% endblock %} diff --git a/views/account/password/reset.ejs b/views/account/password/reset.ejs deleted file mode 100644 index c8b106139..000000000 --- a/views/account/password/reset.ejs +++ /dev/null @@ -1,85 +0,0 @@ - - - - <%= t('password_reset.set_new_password') %> - <%- include ../../partials/account %> - - -
    -
    -

    <%= t('password_reset.set_new_password') %>

    -

    <%= t('password_reset.change_password_help') %>

    -
    -
    - - - -
    -
    -
    - - - - diff --git a/views/account/password/reset.njk b/views/account/password/reset.njk new file mode 100644 index 000000000..b6f227dea --- /dev/null +++ b/views/account/password/reset.njk @@ -0,0 +1,85 @@ +{% extends "templates/account.njk" %} + +{% block title %}{{ t('password_reset.set_new_password') }}{% endblock %} + +{% block html %} +
    +
    +

    {{ t('password_reset.set_new_password') }}

    +

    {{ t('password_reset.change_password_help') }}

    +
    +
    + + + +
    +
    +
    +{% endblock %} + +{% block js %} + + +{% endblock %} diff --git a/views/admin.ejs b/views/admin.ejs deleted file mode 100644 index 89cc150f7..000000000 --- a/views/admin.ejs +++ /dev/null @@ -1,17 +0,0 @@ - - - - - Talk - Coral Admin - <%- include partials/head %> - - - - <%- include partials/custom-css %> - - -
    - - - - diff --git a/views/admin.njk b/views/admin.njk new file mode 100644 index 000000000..4b5236424 --- /dev/null +++ b/views/admin.njk @@ -0,0 +1,14 @@ +{% extends "templates/base.njk" %} + +{% block title %}Talk Admin{% endblock %} + +{% block css %} + + + +{% endblock %} + +{% block js %} + + +{% endblock %} diff --git a/views/api/graphiql.ejs b/views/api/graphiql.ejs deleted file mode 100644 index 8007569b3..000000000 --- a/views/api/graphiql.ejs +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - GraphiQL - - <%- include ../partials/dev %> - - - - - - - - - <%- include ../partials/dev-nav %> -
    - - - diff --git a/views/api/graphiql.njk b/views/api/graphiql.njk new file mode 100644 index 000000000..b726918f3 --- /dev/null +++ b/views/api/graphiql.njk @@ -0,0 +1,126 @@ +{% extends "templates/development.njk" %} + +{% block title %}GraphiQL{% endblock %} + +{% block css %} +{# Include the base development pieces #} +{{ super() }} + + +{% endblock %} + +{% block js %} + + + + + +{% endblock %} + +{% block html %} +
    +{% endblock %} diff --git a/views/auth-callback.ejs b/views/auth-callback.ejs deleted file mode 100644 index e4d2387b7..000000000 --- a/views/auth-callback.ejs +++ /dev/null @@ -1,10 +0,0 @@ - - - - <%- include partials/data %> - - - - - - diff --git a/views/auth-callback.njk b/views/auth-callback.njk new file mode 100644 index 000000000..7119a6255 --- /dev/null +++ b/views/auth-callback.njk @@ -0,0 +1,10 @@ + + + + {% include "partials/data.njk" %} + + + + + + diff --git a/views/dev/article.ejs b/views/dev/article.ejs deleted file mode 100644 index 008d3989e..000000000 --- a/views/dev/article.ejs +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - <%= title %> - <%- include ../partials/dev %> - - - <%- include ../partials/dev-nav %> -
    -

    <%= title %>

    -
    - - -
    - - diff --git a/views/dev/article.njk b/views/dev/article.njk new file mode 100644 index 000000000..2fb8b3724 --- /dev/null +++ b/views/dev/article.njk @@ -0,0 +1,55 @@ +{% extends "templates/development.njk" %} + +{% block title %}{{ title }}{% endblock %} + +{% block meta %} + + + + + + + + +{% endblock %} + +{% block html %} +
    +

    {{ title }}

    +
    +
    +{% endblock %} + +{% block js %} + + +{% endblock %} diff --git a/views/dev/articles.ejs b/views/dev/articles.ejs deleted file mode 100644 index 1b07ed116..000000000 --- a/views/dev/articles.ejs +++ /dev/null @@ -1,40 +0,0 @@ - - - All Assets - <%- include ../partials/dev %> - - - <%- include ../partials/dev-nav %> -
    -
    -

    All Assets

    - <%= skip + 1 %> - <%= skip + assets.length %> of <%= count %> Assets -
    -
    - <% if (skip === 0) { %> Create a random article<% } %> - <% assets.forEach(function (asset) { %> - -
    -
    <%= asset.title %>
    - Created <%= asset.created_at.toLocaleString('en-US') %> -
    - <%= asset.url %> -     - <% }) %> -
    - <% if (count !== assets.length) { %> - - <% } %> -
    - - diff --git a/views/dev/articles.njk b/views/dev/articles.njk new file mode 100644 index 000000000..e204c39fc --- /dev/null +++ b/views/dev/articles.njk @@ -0,0 +1,37 @@ +{% extends "templates/development.njk" %} + +{% block title %}All Assets{% endblock %} + +{% block html %} +
    +
    +

    All Assets

    + {{ skip + 1 }} - {{ skip + assets.length }} of {{ count }} Assets +
    +
    + {% if skip === 0 %} Create a random article{% endif %} + {% for asset in assets %} + +
    +
    {{ asset.title }}
    + Created {{ asset.created_at.toLocaleString('en-US') }} +
    + {{ asset.url }} +     + {% endfor %} +
    + {% if count !== assets.length %} + + {% endif %} +
    +{% endblock %} diff --git a/views/embed/stream.ejs b/views/embed/stream.ejs deleted file mode 100644 index a1c708b55..000000000 --- a/views/embed/stream.ejs +++ /dev/null @@ -1,14 +0,0 @@ - - - - - <%- include ../partials/head %> - - - <%- include ../partials/custom-css %> - - -
    - - - diff --git a/views/embed/stream.njk b/views/embed/stream.njk new file mode 100644 index 000000000..ddc620f8e --- /dev/null +++ b/views/embed/stream.njk @@ -0,0 +1,16 @@ +{% extends "templates/base.njk" %} + +{% block title %}Talk{% endblock %} + +{% block css %} + + +{% endblock %} + +{% block html %} +
    +{% endblock %} + +{% block js %} + +{% endblock %} diff --git a/views/login.ejs b/views/login.ejs deleted file mode 100644 index 671b25c83..000000000 --- a/views/login.ejs +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - <%- include partials/head %> - - <%- include partials/custom-css %> - - -
    - - - - diff --git a/views/login.njk b/views/login.njk new file mode 100644 index 000000000..2288898c7 --- /dev/null +++ b/views/login.njk @@ -0,0 +1,16 @@ +{% extends "templates/base.njk" %} + +{% block title %}Talk - Login{% endblock %} + +{% block css %} + +{% endblock %} + +{% block html %} +
    +{% endblock %} + +{% block js %} + + +{% endblock %} diff --git a/views/partials/account.ejs b/views/partials/account.ejs deleted file mode 100644 index ff2166816..000000000 --- a/views/partials/account.ejs +++ /dev/null @@ -1,4 +0,0 @@ -<%- include head %> - - -<%- include custom-css %> diff --git a/views/partials/custom-css.ejs b/views/partials/custom-css.ejs deleted file mode 100644 index d453c37e1..000000000 --- a/views/partials/custom-css.ejs +++ /dev/null @@ -1 +0,0 @@ -<% if (locals.customCssUrl) { %><% } %> diff --git a/views/partials/custom-css.njk b/views/partials/custom-css.njk new file mode 100644 index 000000000..6d725e31e --- /dev/null +++ b/views/partials/custom-css.njk @@ -0,0 +1,3 @@ +{% if customCssUrl %} + +{% endif %} diff --git a/views/partials/data.ejs b/views/partials/data.ejs deleted file mode 100644 index f0bbf5925..000000000 --- a/views/partials/data.ejs +++ /dev/null @@ -1,3 +0,0 @@ -<%_ if (data != null) { _%> - -<%_ } _%> \ No newline at end of file diff --git a/views/partials/data.njk b/views/partials/data.njk new file mode 100644 index 000000000..4edaf2e2e --- /dev/null +++ b/views/partials/data.njk @@ -0,0 +1,3 @@ +{% if data %} + +{% endif %} diff --git a/views/partials/dev-nav.ejs b/views/partials/dev-nav.ejs deleted file mode 100644 index 088c52c20..000000000 --- a/views/partials/dev-nav.ejs +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/views/partials/favicon.njk b/views/partials/favicon.njk new file mode 100644 index 000000000..5ec2aad8a --- /dev/null +++ b/views/partials/favicon.njk @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/views/partials/head.ejs b/views/partials/head.ejs deleted file mode 100644 index dc3df7103..000000000 --- a/views/partials/head.ejs +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - -<%- include data %> - - diff --git a/views/partials/nav.njk b/views/partials/nav.njk new file mode 100644 index 000000000..ecea9018d --- /dev/null +++ b/views/partials/nav.njk @@ -0,0 +1,8 @@ + diff --git a/views/templates/account.njk b/views/templates/account.njk new file mode 100644 index 000000000..7e1b6e6c9 --- /dev/null +++ b/views/templates/account.njk @@ -0,0 +1,6 @@ +{% extends "templates/base.njk" %} + +{% block css %} + + +{% endblock %} diff --git a/views/templates/base.njk b/views/templates/base.njk new file mode 100644 index 000000000..23048151e --- /dev/null +++ b/views/templates/base.njk @@ -0,0 +1,39 @@ + + + + {# Meta tags #} + + + {% block meta %}{% endblock %} + + {# Favicon Configuration #} + {% include "partials/favicon.njk" %} + + {# CSP and security headers #} + {% block security %}{% endblock %} + + {# Title #} + {% block title %}{% endblock %} + + {# CSS #} + + + + {% include "partials/custom-css.njk" %} + {% block css %}{% endblock %} + + {# Static data injection #} + {% include "partials/data.njk" %} + + {# Configuration #} + + + + {% block body %} + {% block html %} +
    + {% endblock %} + {% endblock %} + {% block js %}{% endblock %} + + diff --git a/views/partials/dev.ejs b/views/templates/development.njk similarity index 54% rename from views/partials/dev.ejs rename to views/templates/development.njk index 691b548e5..f7fab6682 100644 --- a/views/partials/dev.ejs +++ b/views/templates/development.njk @@ -1,5 +1,17 @@ - +{% extends "templates/base.njk" %} + +{# Null out the security block, we don't want/need that in development #} +{% block security %}{% endblock %} + +{% block css %} - + +{% endblock %} + +{% block body %} + {% include "partials/nav.njk" %} + + {% block html %}{% endblock %} +{% endblock %} diff --git a/yarn.lock b/yarn.lock index f0da6d006..770dcc7ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2392,6 +2392,12 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" +consolidate@0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.14.0.tgz#b03acd566a2565ca96e99f44fd1417486b4df88d" + dependencies: + bluebird "^3.1.1" + constantinople@^3.0.1: version "3.1.0" resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-3.1.0.tgz#7569caa8aa3f8d5935d62e1fa96f9f702cd81c79" From d83c2fd566e53d00350bac570c5a8177628d4b4c Mon Sep 17 00:00:00 2001 From: Mendel Konikov Date: Thu, 17 May 2018 20:03:12 -0400 Subject: [PATCH 06/32] Only display paragraph if delete requested --- .../client/components/DeleteMyAccount.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js b/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js index 179fa0193..6eae91043 100644 --- a/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js +++ b/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js @@ -63,14 +63,13 @@ class DeleteMyAccount extends React.Component {

    {t('delete_request.delete_my_account_description')}

    -

    - {scheduledDeletionDate && - t( - 'delete_request.already_submitted_request_description', - moment(scheduledDeletionDate).format('MMM Do YYYY, h:mm:ss a') - )} -

    {scheduledDeletionDate ? ( +

    + {t( + 'delete_request.already_submitted_request_description', + moment(scheduledDeletionDate).format('MMM Do YYYY, h:mm:ss a') + )} +

    From c84a9716a11ccdcc2942f92a0e00b66aa7c4747b Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Thu, 17 May 2018 18:37:50 -0600 Subject: [PATCH 07/32] added support for csp --- middleware/contentSecurityPolicy.js | 49 +++++++++++++++++++ middleware/nonce.js | 9 ++++ .../views/unsubscribe-notifications.njk | 11 ++++- .../server/views/download.njk | 2 +- routes/api/v1/csp.js | 33 +++++++++++++ routes/api/v1/index.js | 1 + routes/index.js | 16 +++--- routes/plugins.js | 10 ++-- views/account/email/confirm.njk | 2 +- views/account/password/reset.njk | 2 +- views/admin.njk | 2 +- views/login.njk | 2 +- 12 files changed, 120 insertions(+), 19 deletions(-) create mode 100644 middleware/contentSecurityPolicy.js create mode 100644 middleware/nonce.js create mode 100644 routes/api/v1/csp.js diff --git a/middleware/contentSecurityPolicy.js b/middleware/contentSecurityPolicy.js new file mode 100644 index 000000000..992e41e36 --- /dev/null +++ b/middleware/contentSecurityPolicy.js @@ -0,0 +1,49 @@ +const helmet = require('helmet'); +const { WEBSOCKET_LIVE_URI } = require('../config'); +const { BASE_PATH, BASE_URL, STATIC_URL } = require('../url'); +const { URL } = require('url'); + +// websocketSrc represents the host where we can connect for websocket requests. +const websocketSrc = new URL(WEBSOCKET_LIVE_URI || BASE_URL).host; + +// staticSrc represents any static asset hosted on the static host. +const staticSrc = new URL(STATIC_URL).host; + +// nonceSrc represents the nonce source that is used to indicate a safe resource +// to load. +const nonceSrc = (req, res) => `'nonce-${res.locals.nonce}'`; + +module.exports = helmet.contentSecurityPolicy({ + directives: { + reportUri: `${BASE_PATH}api/v1/csp`, // report all policy violations to our reporting uri + defaultSrc: ["'none'"], // by default, do not allow anything at all + scriptSrc: [ + "'self'", + 'https://ajax.googleapis.com', // for jquery + staticSrc, // for any static files loaded from a cdn + nonceSrc, + ], + styleSrc: [ + "'self'", + 'https://maxcdn.bootstrapcdn.com', // for bootstrap css + 'https://fonts.googleapis.com', // for google fonts + 'https://code.getmdl.io', // for mdl css + staticSrc, // for any static files loaded from a cdn + nonceSrc, + ], + connectSrc: ["'self'", websocketSrc], + fontSrc: [ + "'self'", + 'https://maxcdn.bootstrapcdn.com', // for font-awesome + 'https://fonts.gstatic.com', // for google fonts + staticSrc, // for any static files loaded from a cdn + nonceSrc, + ], + imgSrc: [ + "'self'", + staticSrc, // for any static files loaded from a cdn + nonceSrc, + ], + }, + browserSniff: false, +}); diff --git a/middleware/nonce.js b/middleware/nonce.js new file mode 100644 index 000000000..1181fac85 --- /dev/null +++ b/middleware/nonce.js @@ -0,0 +1,9 @@ +const uuid = require('uuid/v4'); + +// nonce is designed to create a random value that can be used in conjunction +// with the csp middleware. +module.exports = (req, res, next) => { + res.locals.nonce = uuid(); + + next(); +}; diff --git a/plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.njk b/plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.njk index f8191d525..5080277f0 100644 --- a/plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.njk +++ b/plugins/talk-plugin-notifications/server/views/unsubscribe-notifications.njk @@ -2,10 +2,17 @@ {% block title %}{{ t('talk-plugin-notifications.unsubscribe_page.unsubscribe') }}{% endblock %} +{% block css %} +{{ super() }} + +{% endblock %} + {% block html %}
    {{ t('talk-plugin-notifications.unsubscribe_page.token_invalid') }}
    - +
    {{ t('talk-plugin-notifications.unsubscribe_page.are_unsubscribed') }}
    {{ t('talk-plugin-notifications.unsubscribe_page.click_to_confirm') }} @@ -15,7 +22,7 @@ {% block js %} - - - - + {% endblock %} diff --git a/views/login.njk b/views/login.njk index 2288898c7..6a3c1112f 100644 --- a/views/login.njk +++ b/views/login.njk @@ -11,6 +11,6 @@ {% endblock %} {% block js %} - + {% endblock %} From 5f410276c6ace553e5821b1edf1579445ab60ef9 Mon Sep 17 00:00:00 2001 From: Mendel Konikov Date: Thu, 17 May 2018 20:41:59 -0400 Subject: [PATCH 08/32] Show overflow text on download comments button when disabled --- .../client/components/DownloadCommentHistory.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.css b/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.css index 55ea39969..cd523a0cd 100644 --- a/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.css +++ b/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.css @@ -1,6 +1,9 @@ .button { margin: 0; - + &:disabled { + overflow: visible; + height: auto; + } i { font-size: inherit; vertical-align: sub; @@ -9,4 +12,4 @@ .most_recent { color: #808080; -} +} \ No newline at end of file From 8ee90387f689b5eba29cc1ed24a2304a8c100e8e Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Mon, 7 May 2018 12:33:47 +0200 Subject: [PATCH 09/32] German translations for v4.4.1 --- locales/de.yml | 60 ++++++++++++---- .../talk-plugin-local-auth/translations.yml | 70 +++++++++++++++++++ .../client/translations.yml | 51 ++++++++++++++ .../talk-plugin-profile-data/translations.yml | 37 ++++++++++ 4 files changed, 206 insertions(+), 12 deletions(-) diff --git a/locales/de.yml b/locales/de.yml index d2b247fbc..94ecfc1f3 100644 --- a/locales/de.yml +++ b/locales/de.yml @@ -20,10 +20,13 @@ de: bio_offensive: "Diese Biographie ist unangemessen" cancel: "Abbrechen" confirm_email: + email_confirmation: "E-Mail-Bestätigung" click_to_confirm: "Unten klicken, um E-Mail-Adresse zu bestätigen" confirm: "Bestätigen" password_reset: + mail_sent: 'Falls Sie eine registriertes Konto haben, wurde Ihnen ein Zurücksetzen-Link an diese E-Mail-Adresse geschickt' set_new_password: "Passwort ändern" + change_password_help: "Bitte geben Sie ein neues Passwort ein. Benutzen Sie ein sicheres!" new_password: "Neues Passwort" new_password_help: "Das Passwort benötigt mindestens 8 Zeichen" confirm_new_password: "Neues Passwort bestätigen" @@ -120,9 +123,10 @@ de: custom_css_url: "Benutzerdefinierte CSS-URL" custom_css_url_desc: "URL eines CSS-Stylesheets zum Überschreiben des Standard-Designs" days: Tage - description: "Als Administrator können Sie die Einstellungen für den Kommentarbereich dieses Artikels anpassen:" + description: "Ändern Sie die Einstellungen für den Kommentarbereich dieses Artikels." domain_list_text: "Geben Sie Domains an, für die diese Talk-Instanz freigegeben werden soll, z.B. für lokale Test- oder Produktionsumgebungen (Bsp.: localhost:3000 staging.domain.com domain.com)." domain_list_title: "Zugelassene Domains" + edit_info: "Information bearbeiten" edit_comment_timeframe_heading: "Zeitlimit zur Bearbeitung von Kommentaren" edit_comment_timeframe_text_pre: "Kommentatoren haben" edit_comment_timeframe_text_post: "Sekunden Zeit, um ihre Kommentare zu bearbeiten." @@ -148,17 +152,31 @@ de: open_stream_configuration: "Dieser Kommentarbereich ist momentan geöffnet. Nach dem Schließen dieses Kommentarbereich wird es nicht mehr möglich sein, zu kommentieren. Bestehende Kommentare bleiben sichtbar." require_email_verification: "E-Mail-Bestätigung erforderlich" require_email_verification_text: "Neue Nutzer müssen ihre E-Mail-Adresse bestätigen." + save: "Speichern" save_changes: "Änderungen speichern" shortcuts: Tastaturkürzel sign_out: "Abmelden" stories: Artikel stream_settings: "Einstellungen Kommentarbereich" + access_message: "Sie müssen Administrator sein, um auf die Einstellungen zuzugreifen. Fragen Sie ggf. einen Administrator, der Ihnen mehr Recht zuweisen kann!" suspect_word_title: "Liste verdächtiger Wörter" suspect_word_text: "Kommentare, die diese Wörter oder Phrasen enthalten (unabhängig von Groß-/Kleinschreibung), werden im Kommentarbereich markiert. Geben Sie ein Wort ein und bestätigen Sie mit Eingabetaste oder Tab. Es ist auch möglich, einen komma-separierten Text einzufügen." tech_settings: "Technische Einstellungen" + organization_information: "Über die Organisation" + organization_info_copy: "Wir verwenden diese Informationen in automatisierten E-Mail-Benachrichtigungen, die Talk versendet. Damit können Nutzer Ihre Organisation identifizieren und sie haben die Möglichkeit bei Problemen in Kontakt mit Ihnen zu treten." + organization_info_copy_2: "Wir empfehlen, einee generische E-Mail-Adresse (z.B. community@yournewsroom.com) für diesen Zweck einzurichten. Die kann über die Zeit gleich bleiben, und gibt nach außen keine Namen preis, die von Nutzern im Fall von Konflikten für persönliche Angriffe missbraucht werden könnten." + organization_details: "Details zur Organisation" + organization_name: "Name der Organisation" + organization_contact_email: "E-Mail-Adresse der Organisation" title: "Kommentarbereich konfigurieren" weeks: Wochen wordlist: "Gesperrte Wörter" + save_changes_dialog: + unsaved_changes: "Ungespeicherte Änderungen" + copy: "Sie haben einen oder mehrere Änderungen vorgenommen, ohne zu speichern. Möchten Sie jetzt speichern oder die Änderungen verwerfen?" + save_settings: "Einstellungen speichern" + discard: "Verwerfen" + cancel: "Abbrechen" continue: "Fortfahren" createdisplay: check_the_form: "Ungültige Eingabe. Bitte prüfen Sie die Felder." @@ -200,11 +218,17 @@ de: we_received_a_request: "Wir haben eine Anfrage erhalten, Ihr Passwort zurückzusetzen. Sollten Sie dies nicht angefordert haben, können Sie diese Nachricht ignorieren." if_you_did: "Falls doch," please_click: "klicken Sie bitte hier zum Zurücksetzen" + subject: "Passwort zurücksetzen" + password_change: + subject: "{0} Passwort-Änderung" + body: "Das Passwort Ihres Benutzerkontos wurde geändert.\n\nFalls Sie diese Änderung nicht angefordert haben, kontaktieren Sie uns bitte unter {0}." embedlink: copy: "In die Zwischenablage kopieren" error: + PASSWORD_INCORRECT: "Ihr bestehendes Passwort wurde falsch eingegeben" COMMENT_PARENT_NOT_VISIBLE: "Der Kommentar, auf den Sie antworten möchten, wurde entfernt oder existiert nicht." EMAIL_VERIFICATION_TOKEN_INVALID: "Code zur E-Mail-Bestätigung ist ungültig." + EMAIL_ALREADY_VERIFIED: "E-Mail-Adresse ist bereits bestätigt." PASSWORD_RESET_TOKEN_INVALID: "Ihr Link zum Passwort zurücksetzen ist ungültig." COMMENT_TOO_SHORT: "Kommentare sollten mehr als ein Zeichen enthalten, bitte überprüfen Sie Ihren Kommentar und probieren Sie es erneut." NOT_AUTHORIZED: "Sie sind nicht berechtigt, diese Aktion auszuführen." @@ -227,15 +251,20 @@ de: ALREADY_EXISTS: "Ressource existiert bereits" INVALID_ASSET_URL: "Asset-URL ist ungültig" CANNOT_IGNORE_STAFF: "Mitarbeiter können nicht ignoriert werden." - email: "E-Mail-Adresse ungültig" + INCORRECT_PASSWORD: "Falsches Passwort" + email: "Bitte geben Sie eine gültige E-Mail-Adresse ein." + DELETION_NOT_SCHEDULED: "Löschvorgang wurde nicht geplant" confirm_password: "Passwörter nicht identisch. Bitte erneut überprüfen" network_error: "Server-Verbindung fehlgeschlagen. Bitte überprüfen Sie ihre Internetverbindung und versuchen Sie es erneut." email_not_verified: "E-Mail-Adresse {0} nicht bestätigt." email_password: "E-Mail und/oder Passwort inkorrekt." organization_name: "Namen von Organisationen dürfen nur Buchstaben und Zahlen enthalten." + organization_contact_email: "E-Mail-Adresse der Organisation ist ungültig." password: "Passwort muss mindestens 8 Zeichen enthalten" username: "Nutzernamen dürfen nur Buchstaben, Zahlen und _ enthalten" unexpected: "Unerwarteter Fehler aufgetreten. Es tut uns leid!" + required_field: "Dieses Feld ist erforderlich" + temporarily_suspended: "Ihr Konto ist vorübergehend gesperrt. Es wird wieder aktiviert am {0}. Bei Fragen setzen Sie sich mit uns in Kontakt." flag_comment: "Kommentar melden" flag_reason: "Grund der Meldung (optional)" flag_username: "Nutzername melden" @@ -245,6 +274,7 @@ de: comment: Kommentar comment_is_ignored: "Dieser Kommentar ist nicht sichtbar, da Sie den Nutzer ignorieren." comment_is_rejected: "Sie haben diesen Kommentar abgelehnt." + comment_is_deleted: "Der Kommentar wurde vom Nutzer gelöscht." comment_is_hidden: "Dieser Kommentar ist nicht verfügbar." comments: Kommentare configure_stream: "Konfigurieren" @@ -333,6 +363,7 @@ de: sort: "Sortieren" show_shortcuts: "Tastaturkürzel anzeigen" singleview: "Zen-Modus" + system_withheld: "System Withheld" thismenu: "Dieses Menü öffnen" jump_to_queue: "Zu bestimmter Liste springen" thousand: T @@ -355,6 +386,9 @@ de: report_notif: "Vielen Dank für Ihre Meldung. Unsere Moderatoren wurden informiert und werden sich in Kürze darum kümmern." report_notif_remove: "Ihre Meldung wurde entfernt." reported: Gemeldet + comment_history_blank: + title: Sie haben noch keine Kommentare verfasst + info: Hier wird ein Verlauf Ihrer verfassten Kommentare erscheinen settings: from_settings_page: "Sie können auf Ihrer Profilseite Ihren Kommentarverlauf einsehen." my_comment_history: "Mein Kommentarverlauf" @@ -366,7 +400,7 @@ de: stream: all_comments: "Alle Kommentare" temporarily_suspended: "Entsprechend der Community-Regeln von {0} wurde Ihr Konto vorübergehend gesperrt. Nehmen Sie {1} wieder an der Diskussion teil." - comment_not_found: "Kommentar nicht gefunden" + comment_not_found: "Dieser Kommentar wurde entfernt oder existiert nicht." no_comments: "Es gibt noch keine Kommentare. Schreiben Sie doch einen..." no_comments_and_closed: "Es gab zu diesem Artikel keine Kommentare." step_1_header: "Ein Problem melden" @@ -393,6 +427,8 @@ de: one_hour: "1 Stunde" hours: "{0} Stunden" days: "{0} Tage" + hour: "{0} hours" + day: "{0} days" cancel: "Abbrechen" suspend_user: "Nutzer vorübergehend sperren" email_message_suspend: "Sehr geehrte/r {0}, entsprechend der Community-Richtlinien von {1} wurde Ihr Konto vorübergehend gesperrt. Während der Sperrung können Sie weder kommentieren noch andere Aktionen ausführen. Nehmen Sie {2} wieder an der Diskussion teil." @@ -432,15 +468,15 @@ de: rejected: "Abgelehnte" user_history: "Konto-Verlauf" user_history: - user_banned: "User banned" - ban_removed: "Ban removed" - username_status: "Username {0}" - suspended: "Suspended, {0}" - suspension_removed: "Suspension removed" + user_banned: "Nutzer gesperrt" + ban_removed: "Sperrung aufgehoben" + username_status: "Nutzername {0}" + suspended: "Vorübergehend gesperrt, {0}" + suspension_removed: "Vorübergehende Sperrung aufgehoben" system: "System" - date: "Date" - action: "Action" - taken_by: "Taken By" + date: "Datum" + action: "Aktion" + taken_by: "Durch" user_impersonating: "Gibt sich für jemand anderen aus" user_no_comment: "Sie haben noch keinen Kommentar abgegeben. Teilen Sie Ihre Meinung mit uns!" username_offensive: "Dieser Nutzername ist unangemessen" @@ -458,7 +494,7 @@ de: username: "Nutzername" password: "Passwort" confirm_password: "Passwort bestätigen" - organization_contact_email: "Organization Contact Email" + organization_contact_email: "Kontakt-Adresse der Organisation" save: "Speichern" permitted_domains: title: "Zugelassene Domains" diff --git a/plugins/talk-plugin-local-auth/translations.yml b/plugins/talk-plugin-local-auth/translations.yml index 7f67e33bd..4e6486c08 100644 --- a/plugins/talk-plugin-local-auth/translations.yml +++ b/plugins/talk-plugin-local-auth/translations.yml @@ -68,6 +68,76 @@ en: description_2: "You can change your account settings by visiting" path: "My Profile > Settings" alert: "Email Added!" +de: + email: + email_change_original: + subject: Änderung Ihrer E-Mail-Adresse + body: Ihre E-Mail-Adresse wurde von {0} zu {1} geändert. Falls Sie diese Änderung nicht selbst vorgenommen haben, kontaktieren Sie bitte zur Sicherheit {2}. + error: + NO_LOCAL_PROFILE: Mit diesem Benutzerkonto ist keine E-Mail-Adresse verbunden. + LOCAL_PROFILE: Es ist bereits eine bestätigte E-Mail-Adresse mit diesem Benutzerkonto verbunden. + INCORRECT_PASSWORD: Das Passwort war nicht korrekt. + talk-plugin-local-auth: + change_password: + change_password: "Passwort ändern" + passwords_dont_match: "Die Passwörter stimmen nicht überein" + required_field: "Diese Angabe ist erforderlich" + forgot_password: "Passwort vergessen?" + save: "Speichern" + cancel: "Abbrechen" + edit: "Ändern" + changed_password_msg: "Passwort geändert - Ihr Passwort wurde erfolgreich geändert" + forgot_password_sent: "Passwort vergessen - Wir haben Ihnen eine E-Mail zum Zurücksetzen des Passwortes geschickt" + change_username: + change_username_note: "Nutzernamen können nur alle 14 Tage geändert werden. Ihr Nutzername ist zur Zeit nicht editierbar." + save: "Speichern" + edit_profile: "Profil ändern" + cancel: "Abbrechen" + confirm_username_change: "Änderung des Nutzernamens bestätigen" + description: "Sie möchten Ihren Nutzernamen ändern: der neue Nutzername wird an allen alten und neuen Kommentaren erscheinen." + old_username: "Alter Nutzername" + new_username: "Neuer Nutzername" + bottom_note: "Achtung: die nächste Änderung des Nutzernamens ist erst nach 14 Tagen möglich" + confirm_changes: "Änderung bestätigen" + username_does_not_match: "Die Nutzernamen stimmen nicht überein" + cant_be_equal: "Der neue Nutzername {0} muss sich vom alten unterscheiden." + changed_username_success_msg: "Nutzername geändert - Ihr Nutzername wurde erfolgreich aktualisiert. Die nächste Änderung des Nutzernamens ist erst nach 14 Tagen möglich." + change_username_attempt: "Der Nutzername kann zur Zeit nicht aktualisiert werden. Änderungen sind nur nach jeweils 14 Tagen möglich." + change_email: + confirm_email_change: "Änderung der E-Mail-Adresse bestätigen" + description: "Sie versuchen, Ihre E-Mail-Adresse ändern: die neue E-Mail-Adresse wird zum Login sowie für Benachrichtigungen bzgl. Ihres Benutzerkontos verwendet." + old_email: "Alte E-Mail-Adresse" + new_email: "Neue E-Mail-Adresse" + enter_password: "Passwort" + incorrect_password: "Passwort nicht korrekt" + confirm_change: "Änderung bestätigen" + cancel: "Abbrechen" + change_email_msg: "E-Mail-Adresse erfolgreich aktualisiert - die neue E-Mail-Adresse ab sofort zum Anmelden und für Benachrichtigungen verwendet." + add_email: + add_email_address: "E-Mail-Adresse hinzufügen" + enter_email_address: "E-Mail-Adresse:" + invalid_email_address: "Ungültige E-Mail-Adresse" + confirm_email_address: "Bestätigung der E-Mail-Adresse:" + email_does_not_match: "Die E-Mail-Adressen stimmen nicht überein" + insert_password: "Passwort auswählen:" + required_field: "Dieses Feld ist erforderlich" + done: "Fertig" + content: + title: "E-Mail-Adresse hinzufügen" + description: "Aus Sicherheitsgründen benötigen wir eine E-Mail-Adresse zu jedem Benutzerkonto. Ihre E-Mail-Adresse wird für folgendes verwendet:" + item_1: "Benachrichtigungen über Änderungen am Benutzerkonto (Nutzername, E-Mail-Adresse, Passwort)" + item_2: "Ermöglicht den Download des eigenen Kommentar-Archivs" + item_3: "Kommentar-Benachrichtigungen erhalten, die Sie explizit angefordert haben" + verify: + title: "E-Mail-Adresse bestätigen" + description: "Wir haben einen E-Mail an {0} geschickt. Bitte bestätigen Sie Ihre E-Mail-Adresse, um damit Benachrichtigungen über Änderungen am Benutzerkonto zu erhalten." + added: + title: "E-Mail-Adresse hinzugefügt" + description: "Ihre E-Mail-Adresse wurde dem Benutzerkonto hinzugefügt." + subtitle: "Sie möchten Ihre E-Mail-Adresse ändern?" + description_2: "Sie können Ihre Konto-Einstellugen ändern unter" + path: "Mein Profil > Profil-Einstellungen" + alert: "E-Mail-Adresse hinzugefügt!" es: talk-plugin-local-auth: change_password: diff --git a/plugins/talk-plugin-profile-data/client/translations.yml b/plugins/talk-plugin-profile-data/client/translations.yml index d1fdccb73..046c3c3b3 100644 --- a/plugins/talk-plugin-profile-data/client/translations.yml +++ b/plugins/talk-plugin-profile-data/client/translations.yml @@ -49,3 +49,54 @@ en: subtitle: "Are you sure you want to delete your account?" description: "To confirm you would like to delete your account please type in the following phrase into the text box below:" type_to_confirm: "Type phrase below to confirm" +de: + download_request: + section_title: "Mein Kommentar-Archiv herunterladen" + you_will_get_a_copy: "Sie werden eine E-Mail mit einem Download-Link erhalten. Sie können" + download_rate: "eine Download-Anfrage alle {0} Tage stellen" + most_recent_request: "Ihre letzte Anfrage" + request: "Kommentar-Archiv anfordern" + rate_limit: "Sie können die nächste Anfrage stellen in {0}" + hours: "{0} Stunden" + days: "{0} Tagen" + hour: "{0} Stunde" + day: "{0} Tag" + download_preparing: "Bereite Konto-Download vor - Überprüfen Sie Ihr E-Mail-Postfach, sie sollten den Download-Link demnächst erhalten" + delete_request: + account_deletion_cancelled: 'Konto-Löschung abgebrochen - Ihre Anfrage, Ihr Konto zu löschen wurde abgebrochen.' + account_deletion_requested: 'Konto-Löschung angefordert' + received_on: "Die Anfrage, Ihr Konto zu löschen haben wir erhalten am " + cancel_request_description: "Fall Sie ihr Konto wieder aktivieren möchten, können Sie die Lösch-Anfrage hier abbrechen" + before: "vorher" + cancel_account_deletion_request: "Konto-Lösch-Anfrage abbrechen" + delete_my_account: "Mein Benutzerkonto löschen" + delete_my_account_description: "Mit dem Löschen Ihres Kontos werden Ihr Profil sowie alle Ihre Kommentare dauerhaft von dieser Website entfernt." + already_submitted_request_description: "Sie haben bereits eine Lösch-Anfrage gestellt. Ihr Konto wird nach dem {0} gelöscht. Bis zu diesem Zeitpunkt können Sie die Anfrage noch abbrechen" + your_request_submitted_description: "Ihre Lösch-Anfrage wurde übermittelt und eine Bestätigungsanfrage an die dem Konto zugehörige E-Mail-Adresse geschickt." + your_account_deletion_scheduled: "Ihr Benutzerkonto wird gelöscht nach dem:" + changed_your_mind: "Haben Sie Ihre Meinung geändert?" + simply_go_to: "Gehen Sie einfach vor dem Zeitpunkt zu Ihrem Konto und klicken Sie" + tell_us_why: "Sagen Sie uns warum" + feedback_copy: "Wir würden gern erfahren, warum Sie sich entschieden haben, Ihr Konto zu löschen. Schicken Sie uns eine E-Mail mit Feedback an" + done: "Fertig" + cancel: "Abbrechen" + proceed: "Fortfahren" + input_is_not_correct: "Die Eingabe ist nicht korrekt" + step_0: + you_are_attempting: "Sie versuchen Ihr Konto zu löschen. Das bedeutet:" + item_1: "Alle Ihre Kommentare werden von der Website entfernt" + item_2: "Alle Ihre Kommentare werden aus unserer Datenbank gelöscht" + item_3: "Ihr Nutzername und Ihre E-Mail-Adresse werden aus unserem System gelöscht" + step_1: + subtitle: "Wann wird mein Benutzerkonto entfernt?" + description: "Ihr Konto wird {0} Stunden nachdem Sie die Anfrage gestellt haben gelöscht." + subtitle_2: "Kann ich weiterhin Kommentare schreiben, bis mein Konto gelöscht wird?" + description_2: "Ja, Sie können kommentieren, antworten usw. bis die {0} Stunden abgelaufen sind." + step_2: + description: "Bevor Ihr Konto gelöscht wird, empfehlen wir Ihnen, Ihr Kommentar-Archiv herunterzuladen. Nach der Konto-Löschung ist dies nicht mehr möglich." + to_download: "Um Ihr Konto-Archiv herunterzuladen gehen sie zu:" + path: "Profil > Mein Kommentar-Archiv herunterladen" + step_3: + subtitle: "Sind Sie sicher, dass Sie Ihr Benutzerkonto löschen möchten?" + description: "Um zu bestätigen, dass Sie Ihr Konto löschen möchten, geben Sie bitte folgende Zeichen in das Textfeld ein:" + type_to_confirm: "Zur Bestätigung Zeichenfolge eingeben" diff --git a/plugins/talk-plugin-profile-data/translations.yml b/plugins/talk-plugin-profile-data/translations.yml index 51555d305..c3b7e40ca 100644 --- a/plugins/talk-plugin-profile-data/translations.yml +++ b/plugins/talk-plugin-profile-data/translations.yml @@ -35,3 +35,40 @@ en: body: "You have cancelled your account deletion request for {0}. Your account is now reactivated." error: DOWNLOAD_TOKEN_INVALID: "Your download link is not valid." +de: + download_landing: + download_your_account: "Mein Kommentar-Archiv herunterladen" + download_details: "Ihr Kommentar-Archiv wird als ZIP-Datei bereitgestellt. Nach dem Entpacken erhalten Sie eine CSV-Datei, die einfach in ein Tabellenkalkulationsprogramm importiert werden kann." + all_information_included: "Für jeden Ihrer Kommentare sind folgende Informationen enthalten:" + information_included: + date: "Wann Sie den Kommentar geschrieben haben" + url: "Die dauerhafte URL (Internetadresse) des Kommentars" + body: "Der Kommentar-Text" + asset_url: "Die URL (Internetadresse) des Artikels an dem der Kommentar erscheint" + confirm: "Kommentar-Archiv herunterladen" + email: + download: + subject: "Ihre Kommentare sind zum Download bereit: {0}" + download_link_ready: "Hier klicken, um Ihre Kommentare von {0} bis {1} herunterzuladen:" + download_archive: "Archiv herunterladen" + delete: + subject: "Ihr Benutzerkonto bei {0} ist zur Löschung vorgesehen" + body: | + Wir haben eine Anfrage erhalten, Ihr Benutzerkonto zu löschen. Die Löschung ist geplant für den {1}. + + Nach diesem Zeitpunkt werden alle Ihre Kommentare von der Website und aus unserer Datenbank gelöscht. Außerdem werden Ihr Nutzername und Ihre E-Mail-Adresse aus unserem System enfernt. + + Falls Sie es sich noch anders überlegen, können Sie sich bis spätestens zum angegebenen Lösch-Zeitpunkt einloggen und die Lösch-Anfrage abbrechen. + deleted: + subject: "Ihre Benutzerkonto bei {0} wurde gelöscht" + body: | + Ihr Kommentar-Konto bei {0} ist nun gelöscht. Schade, auf Wiedersehen! + + Falls Sie sich in Zukunft erneut an der Diskussion beteiligen möchten, können Sie jederzeit ein neues Benutzerkonto einrichten. + + Wenn Sie Lust haben, schreiben Sie uns doch eine Rückmeldung, Feedback, oder Kritik an {1}, damit wir unsere Community verbessern können. Vielen Dank! + cancelDelete: + subject: "Die Lösch-Anfrage für Ihr Benutzerkonto bei {0} wurde abgebrochen" + body: "Sie haben die Lösch-Anfrage für Ihr Benutzerkonto bei {0} abgebrochen. Das Konto ist nun wieder aktiv." + error: + DOWNLOAD_TOKEN_INVALID: "Der Download-Link ist ungültig." From 1f40d6b7bbf79a81c678157f18f67ecc232c71db Mon Sep 17 00:00:00 2001 From: okbel Date: Fri, 18 May 2018 13:05:46 -0300 Subject: [PATCH 10/32] replacing by a one liner :) --- .../coral-admin/src/routes/Community/components/People.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/client/coral-admin/src/routes/Community/components/People.js b/client/coral-admin/src/routes/Community/components/People.js index 6d1457cb8..ce9a8b75a 100644 --- a/client/coral-admin/src/routes/Community/components/People.js +++ b/client/coral-admin/src/routes/Community/components/People.js @@ -132,12 +132,7 @@ class People extends React.Component { {user.email ? user.email - : user.profiles.map(({ id }, i) => { - if (i === user.profiles.length - 1) { - return id; - } - return `${id}, `; - })} + : user.profiles.map(p => p.id).join(', ')} From ffa6b99d09aadc14e4c6109cdce3148cad5ff0ac Mon Sep 17 00:00:00 2001 From: Mendel Konikov Date: Fri, 18 May 2018 12:32:24 -0400 Subject: [PATCH 11/32] Wrap els in div --- .../client/components/DeleteMyAccount.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js b/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js index 6eae91043..c2055a16e 100644 --- a/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js +++ b/plugins/talk-plugin-profile-data/client/components/DeleteMyAccount.js @@ -64,15 +64,17 @@ class DeleteMyAccount extends React.Component { {t('delete_request.delete_my_account_description')}

    {scheduledDeletionDate ? ( -

    - {t( +

    +

    + {t( 'delete_request.already_submitted_request_description', moment(scheduledDeletionDate).format('MMM Do YYYY, h:mm:ss a') )} -

    - +

    + +
    ) : (
    diff --git a/client/coral-admin/src/containers/UserDetail.js b/client/coral-admin/src/containers/UserDetail.js index 666e6c8f2..1664e7cae 100644 --- a/client/coral-admin/src/containers/UserDetail.js +++ b/client/coral-admin/src/containers/UserDetail.js @@ -187,7 +187,7 @@ export const withUserDetailQuery = withQuery( reliable { flagger commenter - commenterScore + commenterKarma } state { status { diff --git a/client/coral-admin/src/graphql/index.js b/client/coral-admin/src/graphql/index.js index bb4b35b74..d1bbf501b 100644 --- a/client/coral-admin/src/graphql/index.js +++ b/client/coral-admin/src/graphql/index.js @@ -322,11 +322,11 @@ export default { reliable: { commenter: { $set: calculateReliability( - prev.user.reliable.commenterScore - 1, + prev.user.reliable.commenterKarma - 1, prev.settings.karma.comment ), }, - commenterScore: { + commenterKarma: { $apply: count => count - 1, }, }, @@ -341,11 +341,11 @@ export default { reliable: { commenter: { $set: calculateReliability( - prev.user.reliable.commenterScore + 1, + prev.user.reliable.commenterKarma + 1, prev.settings.karma.comment ), }, - commenterScore: { + commenterKarma: { $apply: count => count + 1, }, }, diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql index 1f3016a18..5bc102736 100644 --- a/graph/typeDefs.graphql +++ b/graph/typeDefs.graphql @@ -20,17 +20,17 @@ type Reliability { # `null` if the reliability cannot be determined. flagger: Boolean - # flaggerScore will contains the number of agreed flags vs disagred flag + # flaggerKarma will contains the number of agreed flags vs disagred flag # count. - flaggerScore: Int! + flaggerKarma: Int! # Commenter will be `true` when the commenter is reliable, `false` if not, or # `null` if the reliability cannot be determined. commenter: Boolean - # commenterScore the number of approved comments (not untouched) subtracted by + # commenterKarma the number of approved comments (not untouched) subtracted by # the number of rejected comments. - commenterScore: Int! + commenterKarma: Int! } ################################################################################ diff --git a/services/karma.js b/services/karma.js index e255e3b14..0437ad98a 100644 --- a/services/karma.js +++ b/services/karma.js @@ -84,7 +84,7 @@ class KarmaModel { return KarmaService.isReliable('flag', this.model); } - get flaggerScore() { + get flaggerKarma() { return get(this.model, 'flag.karma', 0); } @@ -92,7 +92,7 @@ class KarmaModel { return KarmaService.isReliable('comment', this.model); } - get commenterScore() { + get commenterKarma() { return get(this.model, 'comment.karma', 0); } } From 97416d421b3355ded1d782d275d807b33f0a1e44 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 23 May 2018 16:17:38 -0600 Subject: [PATCH 30/32] adjusted karma tooltip --- .../src/components/KarmaTooltip.css | 30 ++++++++++++++++++- .../src/components/KarmaTooltip.js | 29 ++++++++++++++++++ .../coral-admin/src/components/UserDetail.js | 24 ++------------- .../coral-admin/src/containers/UserDetail.js | 1 - locales/en.yml | 2 +- 5 files changed, 62 insertions(+), 24 deletions(-) diff --git a/client/coral-admin/src/components/KarmaTooltip.css b/client/coral-admin/src/components/KarmaTooltip.css index dc766c5f0..ff6f8b742 100644 --- a/client/coral-admin/src/components/KarmaTooltip.css +++ b/client/coral-admin/src/components/KarmaTooltip.css @@ -59,6 +59,34 @@ transform: rotate(180deg); } +.menu ul { + list-style: none; + padding: 0; + + li { + display: flex; + justify-content: space-between; + margin: 5px 0; + } +} + +.label { + padding: 4px 5px; + border-radius: 3px; + color: #fff; + font-weight: 400; + text-align: center; + font-size: .9em; + line-height: normal; + letter-spacing: .4px; + min-width: 25px; + display: block; + + /* &.reliable { background-color: #03AB61; } */ + /* &.neutral { background-color: #616161; } */ + &.unreliable { background-color: #F44336; } +} + .descriptionList { padding: 0; margin: 0; @@ -77,4 +105,4 @@ color: #2B7EB5; text-decoration: underline; display: block; -} \ No newline at end of file +} diff --git a/client/coral-admin/src/components/KarmaTooltip.js b/client/coral-admin/src/components/KarmaTooltip.js index 370856f1f..772b119e9 100644 --- a/client/coral-admin/src/components/KarmaTooltip.js +++ b/client/coral-admin/src/components/KarmaTooltip.js @@ -1,4 +1,5 @@ import React from 'react'; +import PropTypes from 'prop-types'; import cn from 'classnames'; import { Icon } from 'coral-ui'; import styles from './KarmaTooltip.css'; @@ -8,6 +9,13 @@ import t from 'coral-framework/services/i18n'; const initialState = { menuVisible: false }; class KarmaTooltip extends React.Component { + static propTypes = { + settings: PropTypes.shape({ + reliable: PropTypes.number.isRequired, + unreliable: PropTypes.number.isRequired, + }).isRequired, + }; + state = initialState; toogleMenu = () => { @@ -19,6 +27,7 @@ class KarmaTooltip extends React.Component { }; render() { + const { settings: { unreliable } } = this.props; const { menuVisible } = this.state; return ( @@ -34,6 +43,26 @@ class KarmaTooltip extends React.Component { {menuVisible && (
    {t('user_detail.user_karma_score')} +
      + {/*
    • + Reliable{' '} + + ≥ {reliable} + +
      • +
    • + Neutral{' '} + + < {reliable}, > {unreliable} + +
      • */} +
    • + {t('user_detail.unreliable')}{' '} + + ≤ {unreliable} + +
      • +
    • -
  • - - {t('user_detail.reports')} - - - {capitalize(getReliability(user.reliable.flagger))} - -
  • @@ -258,7 +240,7 @@ class UserDetail extends React.Component { {user.reliable.commenterKarma}
    - +
    • diff --git a/client/coral-admin/src/containers/UserDetail.js b/client/coral-admin/src/containers/UserDetail.js index 1664e7cae..f12b26b30 100644 --- a/client/coral-admin/src/containers/UserDetail.js +++ b/client/coral-admin/src/containers/UserDetail.js @@ -185,7 +185,6 @@ export const withUserDetailQuery = withQuery( provider } reliable { - flagger commenter commenterKarma } diff --git a/locales/en.yml b/locales/en.yml index 273a6d423..9b38c833f 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -466,10 +466,10 @@ en: email: "Email" total_comments: "Total Comments" reject_rate: "Reject Rate" - reports: "Reports" all: "All" rejected: "Rejected" user_history: "User History" + unreliable: "Unreliable" karma: "Karma" learn_more: "Learn More" user_karma_score: "User Karma Score" From 9a73c6db59ebde11429bc96a2e62013d115bfb44 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 23 May 2018 16:18:10 -0600 Subject: [PATCH 31/32] "Trust" flag to "Karma" and updated translations --- locales/ar.yml | 149 +--------------------------------------------- locales/da.yml | 3 - locales/de.yml | 1 - locales/en.yml | 2 +- locales/es.yml | 1 - locales/fi_FI.yml | 1 - locales/fr.yml | 1 - locales/nl_NL.yml | 1 - locales/pt_BR.yml | 49 --------------- locales/zh_CN.yml | 68 +-------------------- locales/zh_TW.yml | 70 ---------------------- 11 files changed, 3 insertions(+), 343 deletions(-) diff --git a/locales/ar.yml b/locales/ar.yml index 852b9ac1b..2b320a621 100644 --- a/locales/ar.yml +++ b/locales/ar.yml @@ -292,55 +292,7 @@ ar: suspect_word: "كلمة مشتبهة" banned_word: "كلمة محظورة" body_count: "يتجاوز النص الحد الأقصى للطول المسموح" - trust: "ثقة" links: "رابط" - modqueue: - account: "account flags" - actions: Actions - all: all - all_streams: "All Streams" - notify_edited: '{0} edited comment "{1}"' - notify_accepted: '{0} accepted comment "{1}"' - notify_rejected: '{0} rejected comment "{1}"' - notify_flagged: '{0} flagged comment "{1}"' - notify_reset: '{0} reset status of comment "{1}"' - approve: "Approve" - approved: "Approved" - ban_user: "Ban" - billion: B - close: Close - empty_queue: "No more comments to moderate! You're all caught up. Go have some ☕️" - flagged: flagged - reported: reported - less_detail: "Less detail" - likes: likes - million: M - mod_faster: "Moderate faster with keyboard shortcuts" - moderate: "Moderate →" - more_detail: "More detail" - new: New - newest_first: "Newest First" - navigation: Navigation - next_comment: "Go to the next comment" - toggle_search: "Open search" - next_queue: "Switch queues" - oldest_first: "Oldest First" - premod: pre-mod - prev_comment: "Go to the previous comment" - reject: "Reject" - rejected: "Rejected" - reply: "Reply" - select_stream: "Select Stream" - shift_key: "⇧" - shortcuts: "Shortcuts" - sort: "Sort" - show_shortcuts: "Show Shortcuts" - singleview: "Zen mode" - thismenu: "Open this menu" - jump_to_queue: "Jump to specific queue" - thousand: k - try_these: "Try these" - view_more_shortcuts: "View more shortcuts" my_comment_history: "سجل التعليقات" name: اسم no_agree_comment: "لا أوافق على هذا التعليق" @@ -358,9 +310,6 @@ ar: report_notif: "شكرا على الإبلاغ عن هذا التعليق. تم إبلاغ فريق الإشراف لدينا وسيراجعه قريبًا." report_notif_remove: "لقد تمت إزالة بلاغك." reported: بلغ عنه - comment_history_blank: - title: You have not written any comments - info: A history of your comments will appear here settings: from_settings_page: "من صفحة الملف الشخصي يمكنك مشاهدة سجل التعليقات." my_comment_history: "سجل التعليقات" @@ -378,104 +327,8 @@ ar: step_1_header: "بلغ عن مشكلة" step_2_header: "ساعدنا على الفهم" step_3_header: "شكرا لك على المساهمة الخاصة بك" - streams: - all: All - article: Story - closed: Closed - empty_result: "No assets match this search. Maybe try widening your search?" - filter_streams: "Filter Streams" - newest: Newest - oldest: Oldest - open: Open - pubdate: "Publication Date" - search: Search - sort_by: "Sort By" - status: "Stream Status" - stream_status: "Stream Status" - suspenduser: - title_suspend: "Suspend User" - description_suspend: "You are suspending {0}. This comment will go to the Rejected queue, and {0} will not be allowed to like, report, reply or post until the suspension time is complete." - select_duration: "Select suspension duration" - one_hour: "1 hour" - hours: "{0} hours" - days: "{0} days" - hour: "{0} hours" - day: "{0} days" - cancel: "Cancel" - suspend_user: "Suspend User" - email_message_suspend: "Dear {0},\n\nIn accordance with {1}’s community guidelines, your account has been temporarily suspended. During the suspension, you will be unable to comment, flag or engage with fellow commenters. Please rejoin the conversation {2}." - title_notify: "Notify the user of their temporary suspension" - notify_suspend_until: "User {0} has been temporarily suspended. This suspension will automatically end {1}." - description_notify: "Suspending this user will temporarily disable their account." - write_message: "Write a message" - send: Send - reject_username: - username: username - no_cancel: "No cancel" - description_reject: "Would you like to temporarily ban this user because of their {0}? Doing so will temporarily suspend this user until they rewrite their {0}." - title_notify: "Notify the user of their temporary suspension" - description_notify: "Suspending this user will temporarily disable their account." - title_reject: "We noticed you rejected a username" - suspend_user: "Suspend User" - yes_suspend: "Yes suspend" - email_message_reject: "Another member of the community recently flagged your username for review. Because of its content your user was rejected. This means you can no longer comment, like, or flag content until you rewrite your username. Please e-mail us if you have any questions or concerns." - write_message: "Write a message" - send: Send thank_you: "نحن نقدر سلامتك وردود الفعل. سيراجع المشرف التقرير الخاص بك" - user: - bio_flags: "flags for this bio" - user_bio: "User Bio" - username_flags: "flags for this username" - user_detail: - remove_suspension: "Remove Suspension" - suspend: "Suspend User" - remove_ban: "Remove Ban" - ban: "Ban User" - member_since: "Member Since" - email: "Email" - total_comments: "Total Comments" - reject_rate: "Reject Rate" - reports: "Reports" - all: "All" - rejected: "Rejected" - user_history: "User History" - user_history: - user_banned: "User banned" - ban_removed: "Ban removed" - username_status: "Username {0}" - suspended: "Suspended, {0}" - suspension_removed: "Suspension removed" - system: "System" - date: "Date" - action: "Action" - taken_by: "Taken By" user_impersonating: "هذا المستخدم ينتحل شخصية" user_no_comment: "لم تترك تعليقا مطلقا. إنضم إلى المحادثة!" username_offensive: "اسم المستخدم هذا مسيء" - view_conversation: "عرض المحادثة" - install: - initial: - description: "Let's set up your Talk community in just a few short steps." - submit: "Get Started" - add_organization: - description: "Please tell us the name of your organization. This will appear in emails when inviting new team members." - label: "Organization Name" - save: "Save" - create: - email: "Email address" - username: "Username" - password: "Password" - confirm_password: "Confirm Password" - organization_contact_email: "Organization Contact Email" - save: "Save" - permitted_domains: - title: "Permitted domains" - description: "Enter the domains you would like to permit for Talk, e.g. your local, staging and production environments (ex. localhost:3000, staging.domain.com, domain.com)." - submit: "Finish install" - final: - description: "Thanks for installing Talk! We sent an email to verify your email address. While you finish setting up the account, you can start engaging with your readers now." - launch: "Launch Talk" - close: "Close this Installer" - admin_sidebar: - view_options: "View Options" - sort_comments: "Sort Comments" + view_conversation: "عرض المحادثة" \ No newline at end of file diff --git a/locales/da.yml b/locales/da.yml index 4bcb3bb1d..d21a1aee6 100644 --- a/locales/da.yml +++ b/locales/da.yml @@ -211,7 +211,6 @@ da: NO_SPECIAL_CHARACTERS: "Brugernavne kan kun indeholder bogstaver og _" PASSWORD_LENGTH: "Adgangskoden er for kort" PROFANITY_ERROR: "Brugernavne må ikke inholde stødende indhold. Kontakt venligst administratoren, hvis du mener at dette er en fejl." - RATE_LIMIT_EXCEEDED: "Rate limit exceeded" USERNAME_IN_USE: "Brugernavnet er allerede i brug" USERNAME_REQUIRED: "Du skal indtaste et brugernavn" EMAIL_NOT_VERIFIED: "E-mail address not verified" @@ -287,10 +286,8 @@ da: comment_spam: "Spam" comment_noagree: "Uenig" comment_other: "Andre" - suspect_word: "Suspect Word" banned_word: "Forbudt ord" body_count: "Body overstiger max længde" - trust: "Stol" links: "Link" modqueue: account: "konto flag" diff --git a/locales/de.yml b/locales/de.yml index bec73fa5d..2bf137991 100644 --- a/locales/de.yml +++ b/locales/de.yml @@ -322,7 +322,6 @@ de: suspect_word: "Verdächtiges Wort" banned_word: "Unzulässiges Wort" body_count: "Text überschreitet Zeichenlimit" - trust: "Vertrauen" links: "Link" modqueue: account: "Konto-Markierungen" diff --git a/locales/en.yml b/locales/en.yml index 9b38c833f..32399fd9d 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -322,7 +322,7 @@ en: suspect_word: "Suspect Word" banned_word: "Banned Word" body_count: "Body exceeds max length" - trust: "Trust" + trust: "Karma" links: "Link" modqueue: account: "account flags" diff --git a/locales/es.yml b/locales/es.yml index ff2777c41..fc9b93b36 100644 --- a/locales/es.yml +++ b/locales/es.yml @@ -310,7 +310,6 @@ es: suspect_word: "Palabra sospechosa" banned_word: "Palabra prohibida" body_count: "El texto exede el límite permitido" - trust: "Trust" links: "Link" modqueue: account: "reportes de cuentas" diff --git a/locales/fi_FI.yml b/locales/fi_FI.yml index 494a48cdb..4758a2920 100644 --- a/locales/fi_FI.yml +++ b/locales/fi_FI.yml @@ -292,7 +292,6 @@ fi_FI: suspect_word: "Epäilyttävä sana" banned_word: "Kielletty sana" body_count: "Liian pitkä viesti" - trust: "Luotettava" links: "Linkki" modqueue: account: "Liputuksia" diff --git a/locales/fr.yml b/locales/fr.yml index 1e9e0e496..4e32cf66c 100644 --- a/locales/fr.yml +++ b/locales/fr.yml @@ -300,7 +300,6 @@ fr: suspect_word: "Mot suspect" banned_word: "Mot banni" body_count: "Le texte dépasse la longueur maximale" - trust: "Trust" links: "Lien" modqueue: account: "Signalements du compte" diff --git a/locales/nl_NL.yml b/locales/nl_NL.yml index 9d4057065..297917c9e 100644 --- a/locales/nl_NL.yml +++ b/locales/nl_NL.yml @@ -290,7 +290,6 @@ nl_NL: suspect_word: "Verdacht woord" banned_word: "Geblokeerd woord" body_count: "Tekst is te lang" - trust: "Vertrouwen" links: "Link" modqueue: account: "account meldingen" diff --git a/locales/pt_BR.yml b/locales/pt_BR.yml index 4b7b5c3e3..c464480e0 100644 --- a/locales/pt_BR.yml +++ b/locales/pt_BR.yml @@ -61,11 +61,6 @@ pt_BR: reaction: 'Reação' reactions: 'Reações' story: 'Conversas' - flagged_usernames: - notify_approved: '{0} approved username {1}' - notify_rejected: '{0} rejected username {1}' - notify_flagged: '{0} reported username {1}' - notify_changed: 'user {0} changed their username to {1}' community: account_creation_date: "Data de criação da conta" active: Ativo @@ -273,24 +268,6 @@ pt_BR: loading_results: "Carregando resultados" marketing: "Isso parece um anúncio/marketing" moderate_this_stream: "Moderar comentários" - flags: - reasons: - user: - username_offensive: "Offensive" - username_nolike: "Dislike" - username_impersonating: "Impersonation" - username_spam: "Spam" - username_other: "Other" - comment: - comment_offensive: "Offensive" - comment_spam: "Spam" - comment_noagree: "Disagree" - comment_other: "Other" - suspect_word: "Suspect Word" - banned_word: "Banned Word" - body_count: "Body exceeds max length" - trust: "Trust" - links: "Link" modqueue: account: "contas marcadas" actions: Ações @@ -418,29 +395,6 @@ pt_BR: bio_flags: "Marcadas para este perfil" user_bio: "Perfil do usuário" username_flags: "Marcadas para este usuário" - user_detail: - remove_suspension: "Remove Suspension" - suspend: "Suspend User" - remove_ban: "Remove Ban" - ban: "Ban User" - member_since: "Member Since" - email: "Email" - total_comments: "Total Comments" - reject_rate: "Reject Rate" - reports: "Reports" - all: "All" - rejected: "Rejected" - user_history: "User History" - user_history: - user_banned: "User banned" - ban_removed: "Ban removed" - username_status: "Username {0}" - suspended: "Suspended, {0}" - suspension_removed: "Suspension removed" - system: "System" - date: "Date" - action: "Action" - taken_by: "Taken By" user_impersonating: "Este usuário está representando" user_no_comment: "Você nunca deixou um comentário. Participe da conversa!" username_offensive: "Esse nome de usuário é ofensivo" @@ -468,6 +422,3 @@ pt_BR: description: "Obrigado por instalar o Talk! Enviamos um e-mail para verificar seu endereço de e-mail. Enquanto você terminar de configurar a conta, você pode começar a se envolver com seus leitores agora." launch: "Iniciar Talk" close: "Feche este instalador" - admin_sidebar: - view_options: "View Options" - sort_comments: "Sort Comments" diff --git a/locales/zh_CN.yml b/locales/zh_CN.yml index b3307a886..c70f5b779 100644 --- a/locales/zh_CN.yml +++ b/locales/zh_CN.yml @@ -12,22 +12,11 @@ zh_CN: note_reject_comment: "封禁该用户将使这条评论被移入“被拒”队列。" note_ban_user: "封禁该用户将使其无法编辑或删除评论。" yes_ban_user: "是的，封禁该用户" - write_a_message: "Write a message" - send: "Send" - notify_ban_headline: "Notify the user of ban" - notify_ban_description: "This will notify the user by email that they have been banned from the community" - email_message_ban: "Dear {0},\n\nSomeone with access to your account has violated our community guidelines. As a result, your account has been banned. You will no longer be able to comment, like or report comments. if you think this has been done in error, please contact our community team." bio_offensive: "该简介含有冒犯言语" cancel: "取消" confirm_email: click_to_confirm: "Click below to confirm your email address" confirm: "Confirm" - password_reset: - set_new_password: "Change Your Password" - new_password: "New Password" - new_password_help: "Password must be at least 8 characters" - confirm_new_password: "Confirm New Password" - change_password: "Change Password" characters_remaining: "字符剩余可用" comment: anon: "匿名" @@ -61,11 +50,6 @@ zh_CN: reaction: '回应' reactions: '回应' story: '文章' - flagged_usernames: - notify_approved: '{0} approved username {1}' - notify_rejected: '{0} rejected username {1}' - notify_flagged: '{0} reported username {1}' - notify_changed: 'user {0} changed their username to {1}' community: account_creation_date: "账户创建日期" active: "活动中" @@ -203,9 +187,6 @@ zh_CN: embedlink: copy: "复制到粘贴板" error: - COMMENT_PARENT_NOT_VISIBLE: "The comment that you're replying to has been removed or doesn't exist." - EMAIL_VERIFICATION_TOKEN_INVALID: "Email verification token is invalid." - PASSWORD_RESET_TOKEN_INVALID: "Your password reset link is invalid." COMMENT_TOO_SHORT: "评论至少应有一个字符。请修改您的评论，再度尝试。" NOT_AUTHORIZED: "您没有权限进行该操作" NO_SPECIAL_CHARACTERS: "用户名只能包含字母、数字跟下划线" @@ -237,7 +218,6 @@ zh_CN: username: "用户名只能包含字母、数字跟下划线" unexpected: "发生了异常错误。对不起！" required_field: "该字段必填" - temporarily_suspended: "Your account is currently suspended. It will be reactivated {0}. Please contact us if you have any questions." flag_comment: "举报评论" flag_reason: "举报理由（可选）" flag_username: "举报用户名" @@ -256,8 +236,6 @@ zh_CN: error: "用户名只能包含字母、数字跟下划线" label: "新用户名" msg: "由于您的用户名不当，您的帐号目前被暂停使用。如要恢复您的帐户，请输入一个新的用户名。如有任何疑问，请与我们联系。" - changed_name: - msg: "Your username change is under review by our moderation team." my_comments: "我的评论" my_profile: "我的资料" new_count: "查看 {0} 更多 {1}" @@ -275,24 +253,6 @@ zh_CN: loading_results: "加载结果中" marketing: "这看起来像是广告" moderate_this_stream: "审查该流" - flags: - reasons: - user: - username_offensive: "Offensive" - username_nolike: "Dislike" - username_impersonating: "Impersonation" - username_spam: "Spam" - username_other: "Other" - comment: - comment_offensive: "Offensive" - comment_spam: "Spam" - comment_noagree: "Disagree" - comment_other: "Other" - suspect_word: "Suspect Word" - banned_word: "Banned Word" - body_count: "Body exceeds max length" - trust: "Trust" - links: "Link" modqueue: account: "帐户标记" actions: "操作" @@ -420,29 +380,6 @@ zh_CN: bio_flags: "对简介的举报" user_bio: "用户简介" username_flags: "对用户名的举报" - user_detail: - remove_suspension: "Remove Suspension" - suspend: "Suspend User" - remove_ban: "Remove Ban" - ban: "Ban User" - member_since: "Member Since" - email: "Email" - total_comments: "Total Comments" - reject_rate: "Reject Rate" - reports: "Reports" - all: "All" - rejected: "Rejected" - user_history: "User History" - user_history: - user_banned: "User banned" - ban_removed: "Ban removed" - username_status: "Username {0}" - suspended: "Suspended, {0}" - suspension_removed: "Suspension removed" - system: "System" - date: "Date" - action: "Action" - taken_by: "Taken By" user_impersonating: "冒名用户" user_no_comment: "您未曾发表评论。现在就来加入对话吧！" username_offensive: "用户名有冒犯性" @@ -468,7 +405,4 @@ zh_CN: final: description: "感谢您安装 Talk！我们已向您的邮箱发送一封验证邮件。当您进行帐号设置时，您可以开始跟您的读者开始互动。" launch: "启动 Talk" - close: "关闭安装程序" - admin_sidebar: - view_options: "View Options" - sort_comments: "Sort Comments" + close: "关闭安装程序" \ No newline at end of file diff --git a/locales/zh_TW.yml b/locales/zh_TW.yml index c186a667f..2b5db5d44 100644 --- a/locales/zh_TW.yml +++ b/locales/zh_TW.yml @@ -12,22 +12,8 @@ zh_TW: note_reject_comment: "封禁該用戶將使這條評論被移入“被拒”列表。" note_ban_user: "封禁該用戶將使其無法編輯或刪除評論。" yes_ban_user: "是的，封禁該用戶" - write_a_message: "Write a message" - send: "Send" - notify_ban_headline: "Notify the user of ban" - notify_ban_description: "This will notify the user by email that they have been banned from the community" - email_message_ban: "Dear {0},\n\nSomeone with access to your account has violated our community guidelines. As a result, your account has been banned. You will no longer be able to comment, like or report comments. if you think this has been done in error, please contact our community team." bio_offensive: "該介紹包含具有攻擊性的內容。" cancel: "取消" - confirm_email: - click_to_confirm: "Click below to confirm your email address" - confirm: "Confirm" - password_reset: - set_new_password: "Change Your Password" - new_password: "New Password" - new_password_help: "Password must be at least 8 characters" - confirm_new_password: "Confirm New Password" - change_password: "Change Password" characters_remaining: "剩餘字符數" comment: anon: "匿名用戶" @@ -61,11 +47,6 @@ zh_TW: reaction: '回應' reactions: '回應' story: '故事' - flagged_usernames: - notify_approved: '{0} approved username {1}' - notify_rejected: '{0} rejected username {1}' - notify_flagged: '{0} reported username {1}' - notify_changed: 'user {0} changed their username to {1}' community: account_creation_date: "賬戶創建日期" active: 激活 @@ -203,9 +184,6 @@ zh_TW: embedlink: copy: "覆制到剪貼板" error: - COMMENT_PARENT_NOT_VISIBLE: "The comment that you're replying to has been removed or doesn't exist." - EMAIL_VERIFICATION_TOKEN_INVALID: "Email verification token is invalid." - PASSWORD_RESET_TOKEN_INVALID: "Your password reset link is invalid." COMMENT_TOO_SHORT: "評論長度必須超過一個字符，請您修改評論後重試。" NOT_AUTHORIZED: "您無權執行該操作。" NO_SPECIAL_CHARACTERS: "用戶名只能包含字母、數字和下劃線" @@ -237,7 +215,6 @@ zh_TW: username: "用戶名只能包含字母、數字和下劃線。" unexpected: "發生了意外錯誤。抱歉!" required_field: "該字段必填" - temporarily_suspended: "Your account is currently suspended. It will be reactivated {0}. Please contact us if you have any questions." flag_comment: "舉報評論" flag_reason: "舉報原因（可選）" flag_username: "舉報用戶名" @@ -256,8 +233,6 @@ zh_TW: error: "用戶名只能包含字母、數字和下劃線。" label: "新用戶名" msg: "由於您的用戶名不當，您的帳號目前已被暫停使用。如要恢復您的帳戶，請輸入一個新的用戶名。如有任何疑問，請與我們聯繫。" - changed_name: - msg: "Your username change is under review by our moderation team." my_comments: "我的評論" my_profile: "我的概況" new_count: "查看{0}更多{1}" @@ -275,24 +250,6 @@ zh_TW: loading_results: "加載結果" marketing: "這看起來像是廣告/營銷" moderate_this_stream: "審核這個流" - flags: - reasons: - user: - username_offensive: "Offensive" - username_nolike: "Dislike" - username_impersonating: "Impersonation" - username_spam: "Spam" - username_other: "Other" - comment: - comment_offensive: "Offensive" - comment_spam: "Spam" - comment_noagree: "Disagree" - comment_other: "Other" - suspect_word: "Suspect Word" - banned_word: "Banned Word" - body_count: "Body exceeds max length" - trust: "Trust" - links: "Link" modqueue: account: "帳戶標記" actions: 操作 @@ -345,7 +302,6 @@ zh_TW: no_agree_comment: "我不同意這個評論" no_like_bio: "我不喜歡這個個人簡介" no_like_username: "我不喜歡這個用戶名" - already_flagged_username: "You have already flagged this username." other: 其他 permalink: 分享 personal_info: "該評論洩露了個人身份資訊" @@ -420,29 +376,6 @@ zh_TW: bio_flags: "該簡介的標記" user_bio: "用戶簡介" username_flags: "該用戶名的標記" - user_detail: - remove_suspension: "Remove Suspension" - suspend: "Suspend User" - remove_ban: "Remove Ban" - ban: "Ban User" - member_since: "Member Since" - email: "Email" - total_comments: "Total Comments" - reject_rate: "Reject Rate" - reports: "Reports" - all: "All" - rejected: "Rejected" - user_history: "User History" - user_history: - user_banned: "User banned" - ban_removed: "Ban removed" - username_status: "Username {0}" - suspended: "Suspended, {0}" - suspension_removed: "Suspension removed" - system: "System" - date: "Date" - action: "Action" - taken_by: "Taken By" user_impersonating: "此用戶正在冒充" user_no_comment: "您尚未評論過。加入對話吧！" username_offensive: "這個用戶名有冒犯性" @@ -469,6 +402,3 @@ zh_TW: description: "感謝安裝Talk！我們給您發送了一封郵件以驗證您的電子郵箱地址。在完成帳戶設置後，您即可開始與您的讀者互動。" launch: "啟動Talk" close: "關閉安裝程序" - admin_sidebar: - view_options: "View Options" - sort_comments: "Sort Comments" From 0835f3f32163cbdf0ee3766f2e93d38ec9cadbb6 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 23 May 2018 17:16:51 -0600 Subject: [PATCH 32/32] fixed translations --- client/coral-admin/src/components/CommentLabels.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/client/coral-admin/src/components/CommentLabels.js b/client/coral-admin/src/components/CommentLabels.js index 1f71d9771..5c7da08c7 100644 --- a/client/coral-admin/src/components/CommentLabels.js +++ b/client/coral-admin/src/components/CommentLabels.js @@ -2,6 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import Label from 'coral-ui/components/Label'; import Slot from 'coral-framework/components/Slot'; +import { t } from 'coral-framework/services/i18n'; import FlagLabel from 'coral-ui/components/FlagLabel'; import cn from 'classnames'; import styles from './CommentLabels.css'; @@ -63,10 +64,14 @@ const CommentLabels = ({ {getUserFlaggedType(actions)} )} {hasSuspectedWords(actions) && ( - Suspect + + {t('flags.reasons.comment.suspect_word')} + )} {hasHistoryFlag(actions) && ( - History + + {t('flags.reasons.comment.trust')} + )}