Skip to content

Conversation

@cvle
Copy link
Contributor

@cvle cvle commented Jan 6, 2021

What does this PR do?

How do I test this PR?

  • Set LOCALE to another language e.g. (fr-FR)
  • Ban user and see localized version of the custom message

@cvle cvle requested a review from tessalt January 6, 2021 16:14
Copy link
Contributor

@tessalt tessalt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

verified locally 👍

@cvle cvle merged commit 5fee638 into develop Jan 6, 2021
@cvle cvle deleted the bug/CORL-1584 branch January 6, 2021 17:13
@wyattjoh wyattjoh added this to the v6.7.0 milestone Jan 6, 2021
wyattjoh pushed a commit that referenced this pull request Jan 27, 2021
* fix: getMessage

* fix: tanslation bug in fr

* feat: introduce FALLBACK_LOCALE env variable
wyattjoh added a commit that referenced this pull request Jan 27, 2021
* [CORL-1365] Site Banning (#3244)

* Implement site specific banning

CORL-1365

* Reduce memo usage where possible

CORL-1365

* Use safer toggle set lambda for setShowSites

CORL-1365

* Return null if props are unavailable in query

CORL-1365

* Simplify ban resolver

CORL-1365

* Store current banned site IDs on ban status

CORL-1365

* Make siteIDs of type ID on schema

CORL-1365

* Filter ban sites list based on scope visibility

CORL-1365

* Show in-stream site specific ban descriptions

CORL-1365

* Show number of banned sites in community tab

CORL-1471

* Allow filtering by site-banned in the community tab

CORL-1472

* Set sites in optimistic responses

CORL-1472

* Fix up optimistic responses and banned state calculation

Resolves the failing tests in previous commit.

CORL-1472

* Show "Suspend/Warn everywhere" when mod scopes enabled

CORL-1365

* Remove duplicate settings fragments

CORL-1365

* Float current ban status to top of account history

CORL-1474

* Show red colouring on floated account history bans

CORL-1474

* Handle admin, mod, site mod flows in ban modal

CORL-1475

* Check modScopes siteIDs property correctly

There was a case where the null coalescing operator
would cause the ban user flow in the back-end to
think an org mod was a site mod.

CORL-1365

* fix: adapted to work without auth directive

* fix: add support for parsing site details from referer header

* feat: added helper to abstract check logic

Co-authored-by: Wyatt Johnson <accounts+github@wyattjoh.ca>

* add fallback for when Domparser.parseFromString fails to return body (#3361)

* [CORL-1584] Fix i18n getMessage bug (#3362)

* fix: getMessage

* fix: tanslation bug in fr

* feat: introduce FALLBACK_LOCALE env variable

* fix: removed unused route (#3364)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* fix: added headers to upload request (#3359)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* chore(deps): bump axios from 0.19.2 to 0.21.1 (#3360)

Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](axios/axios@v0.19.2...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* chore: upgrade sentry (#3363)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* fix: move `experimental-tag` translation from server to client (#3365)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* feat: added ratings and reviews to featured comments (#3366)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* feat: added immutable tag (#3367)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* fix: perspective api suggest score using model (#3370)

* Add new translations of version 6.6.2 for PT-BR (#3368)

Co-authored-by: hector.melo <hector.melo@corp.globo.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* [CORL-1598] Prevent duplicate ratings (#3374)

* fix: prevent duplicate ratings on stories

* 6.7.0

Co-authored-by: Nick Funk <nick.funk@outlook.com>
Co-authored-by: Tessa Thornton <tessathornton@gmail.com>
Co-authored-by: Vinh <vinh@vinh.tech>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Cristian Dean <cristian.dean@corp.globo.com>
Co-authored-by: Hector Nieva <hectornmelo@gmail.com>
Co-authored-by: hector.melo <hector.melo@corp.globo.com>
kodiakhq bot added a commit that referenced this pull request Feb 2, 2021
* chore(deps): bump dompurify from 2.0.8 to 2.0.17 (#3352)

Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.0.8 to 2.0.17.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](cure53/DOMPurify@2.0.8...2.0.17)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [CORL-1586] My Comments Fix (#3353)

* fix: display footer even without reactions

* chore: version bump

* [CORL-1365] Site Banning (#3244)

* Implement site specific banning

CORL-1365

* Reduce memo usage where possible

CORL-1365

* Use safer toggle set lambda for setShowSites

CORL-1365

* Return null if props are unavailable in query

CORL-1365

* Simplify ban resolver

CORL-1365

* Store current banned site IDs on ban status

CORL-1365

* Make siteIDs of type ID on schema

CORL-1365

* Filter ban sites list based on scope visibility

CORL-1365

* Show in-stream site specific ban descriptions

CORL-1365

* Show number of banned sites in community tab

CORL-1471

* Allow filtering by site-banned in the community tab

CORL-1472

* Set sites in optimistic responses

CORL-1472

* Fix up optimistic responses and banned state calculation

Resolves the failing tests in previous commit.

CORL-1472

* Show "Suspend/Warn everywhere" when mod scopes enabled

CORL-1365

* Remove duplicate settings fragments

CORL-1365

* Float current ban status to top of account history

CORL-1474

* Show red colouring on floated account history bans

CORL-1474

* Handle admin, mod, site mod flows in ban modal

CORL-1475

* Check modScopes siteIDs property correctly

There was a case where the null coalescing operator
would cause the ban user flow in the back-end to
think an org mod was a site mod.

CORL-1365

* fix: adapted to work without auth directive

* fix: add support for parsing site details from referer header

* feat: added helper to abstract check logic

Co-authored-by: Wyatt Johnson <accounts+github@wyattjoh.ca>

* add fallback for when Domparser.parseFromString fails to return body (#3361)

* [CORL-1584] Fix i18n getMessage bug (#3362)

* fix: getMessage

* fix: tanslation bug in fr

* feat: introduce FALLBACK_LOCALE env variable

* fix: removed unused route (#3364)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* fix: added headers to upload request (#3359)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* chore(deps): bump axios from 0.19.2 to 0.21.1 (#3360)

Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](axios/axios@v0.19.2...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* chore: upgrade sentry (#3363)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* fix: move `experimental-tag` translation from server to client (#3365)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* feat: added ratings and reviews to featured comments (#3366)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* feat: added immutable tag (#3367)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* fix: perspective api suggest score using model (#3370)

* Add new translations of version 6.6.2 for PT-BR (#3368)

Co-authored-by: hector.melo <hector.melo@corp.globo.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* [CORL-1598] Prevent duplicate ratings (#3374)

* fix: prevent duplicate ratings on stories

* 6.7.0

* [CORL-1518] Show rejected comments as removed for staff in single conversation view (#3371)

* Show rejected comments as removed for staff in single conversation view

CORL-1518

* Use isPublished to determine comment visibility

CORL-1518

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* [CORL-1355] Place comment form at bottom when sorting by oldest on featured tab (#3372)

* Place comment form at bottom when sorting by oldest on featured tab

CORL-1355

* Show links at bottom of featured tab when sorting by oldest

CORL-1355

* Remove unnecessary memo

CORL-1355

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* [CORL-1526] Allow sorting moderation queues (#3351)

* Plumb sort order prop through mod queue routes

CORL-1526

* Store mod queue sort order in local storage

CORL-1526

* Load the sort order from localStorage for now

CORL-1526

* Add View New to bottom of mod queue for oldest sort order

CORL-1526

* Preliminarily hook up sorted mod queue subscriptions

CORL-1526

* Remove unnecessary await after rebase

CORL-1526

* Make refresh work for sorted mod queue

CORL-1526

* Convert RejectedQueueRoute to FunctionComponent

CORL-1526

* Convert ApprovedQueueRoute to FunctionComponent

CORL-1526

* Preliminarily hook up approve, rejected sorting

CORL-1526

* Fix connection filtering on cached queue data, update tests

CORL-1526

* fix: add orderBy to cache key in QueueRoute

* feat+chore: upgrade found packages and type matchContext

* fix: don't use localStorage directly but from local state

* fix: implement initialOrderBy for approved and rejected

* fix: remove unused

* Update queue comment entered subscr to show load more

Instead of showing view new at both top and bottom of queue,
just let the pagination load in more at the bottom.

CORL-1526

* Remove unnecessary logger call

CORL-1526

* Replace ternary with defaultTo in Comments loader

CORL-1526

* Conditionally subscribe to comment entered/left in queues

CORL-1526

* Always subscribe to comment left in QueueRoute

CORL-1526

* Break queue subscriptions into two effects

CORL-1526

Co-authored-by: Chi Vinh Le <vinh@vinh.tech>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* feat: add tenantID to logs for job processing (#3379)

* chore(deps): bump socket.io from 2.3.0 to 2.4.1 (#3381)

Bumps [socket.io](https://github.com/socketio/socket.io) from 2.3.0 to 2.4.1.
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/2.4.1/CHANGELOG.md)
- [Commits](socketio/socket.io@2.3.0...2.4.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [CORL-1564] Add link to reply for flattened replies (#3369)

* Add link to reply for flattened replies

CORL-1564

* Use pym to scroll down to reply

CORL-1564

* Update src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyCommentFormContainer.tsx

* Update src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyCommentFormContainer.tsx

* Remove the old unit tests in favour of integration tests

The integration tests can be found in postReply.spec.tsx

CORL-1564

* Fix linting errors

CORL-1564

Co-authored-by: Wyatt Johnson <wyattjoh@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* fix: pagination counts (#3373)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* Add permalink translation keys (#3386)

CORL-1625

* Add stable classnames for ratings and review (#3387)

CORL-1597

* chore: add support for dependabot (#3382)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* Send front end analytics to rudderstack if available (#3383)

CORL-1615

Co-authored-by: Tessa Thornton <tessathornton@gmail.com>

* Updated French translations : stream.ftl, account.ftl and framework.ftl (#3388)

* Updated French translations : stream.ftl, account.ftl and framework.ftl

* Update stream.ftl

Fixing typos

Co-authored-by: Tessa Thornton <tessathornton@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* chore(deps-dev): bump eslint-plugin-jsx-a11y from 6.3.1 to 6.4.1 (#3396)

Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y) from 6.3.1 to 6.4.1.
- [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases)
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md)
- [Commits](infofarmer/eslint-plugin-jsx-a11y@v6.3.1...v6.4.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* chore(deps-dev): bump eventemitter2 from 6.3.1 to 6.4.3 (#3395)

Bumps [eventemitter2](https://github.com/hij1nx/EventEmitter2) from 6.3.1 to 6.4.3.
- [Release notes](https://github.com/hij1nx/EventEmitter2/releases)
- [Changelog](https://github.com/EventEmitter2/EventEmitter2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hij1nx/EventEmitter2/commits/v6.4.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* feat: implement `npm run build:withProfiler` (#3375)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* chore(deps-dev): bump @types/source-map-support from 0.5.1 to 0.5.3 (#3393)

Bumps [@types/source-map-support](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/source-map-support) from 0.5.1 to 0.5.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/source-map-support)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Post-Hotfix 6.7.1 into develop from main

fix: router fix
chore: bump 6.7.1

* Post-Hotfix 6.7.2 - French translations (#3406)

* Add permalink translation keys (#3386)

CORL-1625

* Updated French translations : stream.ftl, account.ftl and framework.ftl (#3388)

* Updated French translations : stream.ftl, account.ftl and framework.ftl

* Update stream.ftl

Fixing typos

Co-authored-by: Tessa Thornton <tessathornton@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* update to 6.7.2

* bump package-lock

Co-authored-by: Nick Funk <nick.funk@outlook.com>
Co-authored-by: ant1 <antoine@claude.im>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* Set dependabot update cycle to weekly instead of daily (#3415)

* chore: remove hideForwardRef (#3405)

Co-authored-by: Wyatt Johnson <wyattjoh@gmail.com>

* [CHORE] Provide a hook version of withStyles called useStyles (#3409)

* chore: provide a hook version of withStyles called useStyles

* chore: ...

Co-authored-by: Wyatt Johnson <wyattjoh@gmail.com>

* fix: mark lastIssuedAt as optional (#3420)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* Add feature flag to disable live updates at tenant level (#3389)

CORL-1131

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* [CORL-1607] Optimize Rendering Performance of Lists (#3397)

* perf: optimize stream top-level pagination

* perf: optimize moderation queues and reply lists

* fix: version

* fix: typo, mismatch package.json version, and updated patched version

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* [CORL-1616/18/28] Fix typo-ed or missing translation keys in admin/stream.ftl (#3414)

* Fix typo in stream.ftl

CORL-1616

* Add missing conversation modal localization keys

CORL-1618

* Further translation key fixes

CORL-1616

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* Catch errors in external media same as other oEmbed handlers (#3417)

CORL-1620

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* [CORL-1603] On small screens, bump the select sort text size (#3407)

* On small screens, bump the select sort text size

CORL-1603

* Use breakpoints-mobile instead of 500px for media query

CORL-1603

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* Add recent 6.7.1 translations for PT-BR (#3404)

Co-authored-by: hector.melo <hector.melo@corp.globo.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* bump to 6.8.0 (#3421)

* Updated RU translation: added permalink copy text (#3390)

* added permalink copy RU translation

* added comments-permalink-linkCopied RU translation

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* german (de-CH) translations (none formal (du) version) (#3403)

* german translations (none formal (du) version)

* rename de to de-ch

* readded original de locales

* added missing translations

* rename to uppercase

* register new de-CH locale

* fixed typo and added updated snapshot

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Wyatt Johnson <wyattjoh@gmail.com>
Co-authored-by: Nick Funk <nick.funk@outlook.com>
Co-authored-by: Wyatt Johnson <accounts+github@wyattjoh.ca>
Co-authored-by: Vinh <vinh@vinh.tech>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Cristian Dean <cristian.dean@corp.globo.com>
Co-authored-by: Hector Nieva <hectornmelo@gmail.com>
Co-authored-by: hector.melo <hector.melo@corp.globo.com>
Co-authored-by: ant1 <antoine@claude.im>
Co-authored-by: Emptyfruit <emptyfruit@gmail.com>
Co-authored-by: Jürgen Kartnaller <kartnaller@lovelysystems.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Default account ban email customMessage does not currently support translations

4 participants