diff --git a/.eslintignore b/.eslintignore index 588708bfc..50c6db9f9 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,34 +1,39 @@ +**/*.html dist docs -**/*.html +node_modules plugins/* -!plugins/talk-plugin-facebook-auth +public + +!plugins/talk-plugin-akismet !plugins/talk-plugin-auth -!plugins/talk-plugin-respect -!plugins/talk-plugin-offtopic -!plugins/talk-plugin-like -!plugins/talk-plugin-mod -!plugins/talk-plugin-love -!plugins/talk-plugin-viewing-options -!plugins/talk-plugin-comment-content -!plugins/talk-plugin-permalink -!plugins/talk-plugin-featured-comments -!plugins/talk-plugin-sort-newest -!plugins/talk-plugin-sort-oldest -!plugins/talk-plugin-sort-most-replied -!plugins/talk-plugin-sort-most-liked -!plugins/talk-plugin-sort-most-loved -!plugins/talk-plugin-sort-most-respected !plugins/talk-plugin-author-menu -!plugins/talk-plugin-member-since -!plugins/talk-plugin-ignore-user -!plugins/talk-plugin-moderation-actions -!plugins/talk-plugin-toxic-comments -!plugins/talk-plugin-remember-sort +!plugins/talk-plugin-comment-content !plugins/talk-plugin-deep-reply-count -!plugins/talk-plugin-subscriber +!plugins/talk-plugin-facebook-auth +!plugins/talk-plugin-featured-comments !plugins/talk-plugin-flag-details +!plugins/talk-plugin-ignore-user +!plugins/talk-plugin-like +!plugins/talk-plugin-love +!plugins/talk-plugin-member-since +!plugins/talk-plugin-mod +!plugins/talk-plugin-moderation-actions !plugins/talk-plugin-notifications !plugins/talk-plugin-notifications-reply +!plugins/talk-plugin-offtopic +!plugins/talk-plugin-permalink +!plugins/talk-plugin-remember-sort +!plugins/talk-plugin-respect +!plugins/talk-plugin-sort-most-liked +!plugins/talk-plugin-sort-most-loved +!plugins/talk-plugin-sort-most-replied +!plugins/talk-plugin-sort-most-respected +!plugins/talk-plugin-sort-newest +!plugins/talk-plugin-sort-oldest +!plugins/talk-plugin-subscriber +!plugins/talk-plugin-toxic-comments +!plugins/talk-plugin-viewing-options + public -node_modules +node_modules \ No newline at end of file diff --git a/.gitignore b/.gitignore index 0aeffcaf4..d6fe0880c 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ browserstack.err plugins.json plugins/* +!plugins/talk-plugin-akismet !plugins/talk-plugin-facebook-auth !plugins/talk-plugin-auth !plugins/talk-plugin-respect diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js index 71d2ed1a3..b1f68bac2 100644 --- a/client/coral-admin/src/components/UserDetail.js +++ b/client/coral-admin/src/components/UserDetail.js @@ -25,6 +25,7 @@ import { import ActionsMenu from 'coral-admin/src/components/ActionsMenu'; import ActionsMenuItem from 'coral-admin/src/components/ActionsMenuItem'; import UserInfoTooltip from './UserInfoTooltip'; +import t from 'coral-framework/services/i18n'; class UserDetail extends React.Component { rejectThenReload = async info => { @@ -152,27 +153,27 @@ class UserDetail extends React.Component { > {suspended ? ( unsuspendUser({ id: user.id })}> - Remove Suspension + {t('user_detail.remove_suspension')} ) : ( - Suspend User + {t('user_detail.suspend')} )} {banned ? ( unbanUser({ id: user.id })}> - Remove Ban + {t('user_detail.remove_ban')} ) : ( - Ban User + {t('user_detail.ban')} )} @@ -190,14 +191,18 @@ class UserDetail extends React.Component {