Merge branch 'slots-debug' of github.com:coralproject/talk into slots-debug

* 'slots-debug' of github.com:coralproject/talk: (78 commits)
  added translations
  lint
  improved db query support, added tests
  added .vscode to gitignore
  Disallow logout from unauthenticated requests
  parse env json the same as the rest, with hjson
  Slack plugin fix
  disabled firefox local integration tests :(
  re-enabled headless support
  added logs to artifacts
  disable headless tests, run with full browsers
  applied fix to allow local run with firefox
  store test results as artifacts every time
  replaced circleci image with ours temp
  Update Comment.js
  Update UserDetailComment.js
  Update Comment.js
  Update UserDetailComment.js
  Remove curly quote
  Update sidebar
  ...
This commit is contained in:
okbel
2018-03-14 23:22:24 -03:00
227 changed files with 5039 additions and 1337 deletions
@@ -76,7 +76,8 @@ class UserDetailComment extends React.Component {
</div>
</div>
<div className={styles.story}>
Story: {comment.asset.title}
{t('common.story')}:{' '}
{comment.asset.title ? comment.asset.title : comment.asset.url}
{
<Link to={`/admin/moderate/${comment.asset.id}`}>
{t('modqueue.moderate')}
@@ -109,6 +110,7 @@ class UserDetailComment extends React.Component {
<div className={styles.sideActions}>
<IfHasLink text={comment.body}>
<span className={styles.hasLinks}>
{/* TODO: translate string */}
<Icon name="error_outline" /> Contains Link
</span>
</IfHasLink>
@@ -122,7 +122,8 @@ class Comment extends React.Component {
</div>
<div className={styles.moderateArticle}>
Story: {comment.asset.title}
{t('common.story')}:{' '}
{comment.asset.title ? comment.asset.title : comment.asset.url}
{!currentAsset && (
<Link to={`/admin/moderate/${comment.asset.id}`}>
{t('modqueue.moderate')}
@@ -156,6 +157,7 @@ class Comment extends React.Component {
<div className={styles.sideActions}>
<IfHasLink text={comment.body}>
<span className={styles.hasLinks}>
{/* TODO: translate string */}
<Icon name="error_outline" /> Contains Link
</span>
</IfHasLink>
+5
View File
@@ -4,6 +4,7 @@ import get from 'lodash/get';
import merge from 'lodash/merge';
import moment from 'moment';
import 'moment/locale/ar';
import 'moment/locale/da';
import 'moment/locale/de';
import 'moment/locale/es';
@@ -12,6 +13,7 @@ import 'moment/locale/pt-br';
import { createStorage } from 'coral-framework/services/storage';
import arTA from 'timeago.js/locales/ar';
import daTA from 'timeago.js/locales/da';
import deTA from 'timeago.js/locales/de';
import esTA from 'timeago.js/locales/es';
@@ -21,6 +23,7 @@ import zh_CNTA from 'timeago.js/locales/zh_CN';
import zh_TWTA from 'timeago.js/locales/zh_TW';
import nl from 'timeago.js/locales/nl';
import ar from '../../../locales/ar.yml';
import en from '../../../locales/en.yml';
import da from '../../../locales/da.yml';
import de from '../../../locales/de.yml';
@@ -33,6 +36,7 @@ import nl_NL from '../../../locales/nl_NL.yml';
const defaultLanguage = process.env.TALK_DEFAULT_LANG;
const translations = {
...ar,
...en,
...da,
...de,
@@ -88,6 +92,7 @@ export function setupTranslations() {
lang = defaultLanguage;
}
ta.register('ar', arTA);
ta.register('es', esTA);
ta.register('da', daTA);
ta.register('de', deTA);