diff --git a/package-lock.json b/package-lock.json index f016035fd..986121888 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2346,6 +2346,43 @@ "integrity": "sha512-n/VQ4mbfr81aqkx/XmVicOLjviMuy02eenSdJY33SVA7S2J42EU0P1H0mOogfYedb3wXA0d/LVtBrgTSm04WEA==", "dev": true }, + "@fluent/bundle": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@fluent/bundle/-/bundle-0.14.0.tgz", + "integrity": "sha512-ENcZYWq6Q5ut39n3hSQiL3seCTAajuPXIkpnPBeO4xcJFTUebNhKh5VpmwJngoS5lkRVYOzJGmupADzQy/ODYw==" + }, + "@fluent/dom": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@fluent/dom/-/dom-0.6.0.tgz", + "integrity": "sha512-xdRYUMl4mgyFyzWLFlQWmX66j11phqRRmdMNtyfEpse1vHXRuoO6pxzbyXCcj+MqWLNp2jnbgU64IMgva5LNSw==", + "requires": { + "cached-iterable": "^0.3" + }, + "dependencies": { + "cached-iterable": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/cached-iterable/-/cached-iterable-0.3.0.tgz", + "integrity": "sha512-MDqM6TpBVebZD4UDtmlFp8EjVtRcsB6xt9aRdWymjk0fWVUUGgmt/V7o0H0gkI2Tkvv8B0ucjidZm4mLosdlWw==" + } + } + }, + "@fluent/react": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/@fluent/react/-/react-0.10.0.tgz", + "integrity": "sha512-SDuvLpSSbgX346UwjAqQtVZCI/NQBKiIonRX2rCvaBUL90jFYSBQTnS9c429p1cSqPvOiB1OH/Qiqq63SkPi4w==", + "dev": true, + "requires": { + "@fluent/sequence": "0.4.0", + "cached-iterable": "^0.2.1", + "prop-types": "^15.6.0" + } + }, + "@fluent/sequence": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@fluent/sequence/-/sequence-0.4.0.tgz", + "integrity": "sha512-ADP/GYbmQZ8DxBHzLGN4I1Vrq0h+ujQuIa9O8E4+Fh5MiSUtPNW0sSH/NzikmAPPQ5cnz5cb53OBv54ANrsvCw==", + "dev": true + }, "@gulp-sourcemaps/identity-map": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz", @@ -7842,7 +7879,8 @@ "cached-iterable": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/cached-iterable/-/cached-iterable-0.2.1.tgz", - "integrity": "sha512-8zAVjMjdn/S/QXJaOnqsko0+ZJzXT2Dum2u9TMGg5YR9fxONPrUjuO9VYqnb1AoldXeYVAcNJLgT5Q8WaIJSgA==" + "integrity": "sha512-8zAVjMjdn/S/QXJaOnqsko0+ZJzXT2Dum2u9TMGg5YR9fxONPrUjuO9VYqnb1AoldXeYVAcNJLgT5Q8WaIJSgA==", + "dev": true }, "call-me-maybe": { "version": "1.0.1", @@ -14861,19 +14899,6 @@ "resolved": "https://registry.npmjs.org/flexbuffer/-/flexbuffer-0.0.6.tgz", "integrity": "sha1-A5/fI/iCPkQMOPMnfm/vEXQhWzA=" }, - "fluent": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/fluent/-/fluent-0.10.0.tgz", - "integrity": "sha512-2I6xaHecA76FiGavw6eKurXaHd6p25eenAgRYKSaMwJEpbvWpAlwFWAnC+BGzrGIKINUHwDlCQRtRenJvlbqQQ==" - }, - "fluent-dom": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/fluent-dom/-/fluent-dom-0.4.1.tgz", - "integrity": "sha512-3V78Kl5OdL2fRLiuO2R2XkJSmSQuOPHgBPA53J9hiZXPnvoN+J4KIpGAa4tJxwIrdEpVCVz8fv77wrZVk+SZVw==", - "requires": { - "cached-iterable": "^0.2.1" - } - }, "fluent-intl-polyfill": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/fluent-intl-polyfill/-/fluent-intl-polyfill-0.1.0.tgz", @@ -14883,29 +14908,6 @@ "intl-pluralrules": "github:projectfluent/IntlPluralRules#module" } }, - "fluent-langneg": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/fluent-langneg/-/fluent-langneg-0.1.1.tgz", - "integrity": "sha512-7lCFviLfesnxV4SnwAJh1epnKw97doF1Fmrjx3rAjq1/bbgrmuC43rpL7Qx81keB4Eu+YsjFZ7hCMg2mM25SyA==", - "dev": true - }, - "fluent-react": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/fluent-react/-/fluent-react-0.8.4.tgz", - "integrity": "sha512-7iPKD9pwh982i2Mwqnf6vNbdRFdwIBBVyXrEuv48LX8s4vNgcowD9A/FRNY8b8mXy4XLv8jhIo8dlwgFOtW40w==", - "dev": true, - "requires": { - "cached-iterable": "^0.2.1", - "fluent-sequence": "^0.2.0", - "prop-types": "^15.6.0" - } - }, - "fluent-sequence": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/fluent-sequence/-/fluent-sequence-0.2.0.tgz", - "integrity": "sha512-t8fc4rHvzO9Yk8otP8LkTqWo6mzjdemooQcnHlDrNzrYAnwsSbVFIlthnkzK2pLsRnO9Ybmw4lXOYUx+fAIyJw==", - "dev": true - }, "flush-write-stream": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz", @@ -24980,7 +24982,7 @@ "dependencies": { "async": { "version": "1.5.2", - "resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", "dev": true } diff --git a/package.json b/package.json index 56dc116ca..ca4ac3cd6 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,8 @@ "license": "Apache-2.0", "dependencies": { "@coralproject/bunyan-prettystream": "^0.1.4", + "@fluent/bundle": "^0.14.0", + "@fluent/dom": "^0.6.0", "@metascraper/helpers": "^5.7.21", "@types/prettier": "^1.19.0", "abort-controller": "^3.0.0", @@ -85,8 +87,6 @@ "express": "^4.16.3", "express-enforces-ssl": "^1.1.0", "express-static-gzip": "^0.3.2", - "fluent": "^0.10.0", - "fluent-dom": "^0.4.1", "fs-extra": "^6.0.1", "graphql": "^0.13.2", "graphql-config": "^2.0.1", @@ -152,6 +152,7 @@ "@babel/preset-typescript": "^7.3.3", "@coralproject/npm-run-all": "^4.1.5", "@coralproject/rte": "^0.11.0", + "@fluent/react": "^0.10.0", "@intervolga/optimize-cssnano-plugin": "^1.0.6", "@types/agent-base": "^4.2.0", "@types/archiver": "^3.0.0", @@ -286,8 +287,6 @@ "final-form-arrays": "1.1.2", "flat": "^4.1.0", "fluent-intl-polyfill": "^0.1.0", - "fluent-langneg": "^0.1.1", - "fluent-react": "^0.8.4", "fork-ts-checker-webpack-plugin": "^1.5.0", "found": "^0.4.0-alpha.17", "found-relay": "^0.4.0-alpha.8", diff --git a/src/core/client/account/routes/download/Download/DownloadDescription.tsx b/src/core/client/account/routes/download/Download/DownloadDescription.tsx index c7ca596d8..354220cad 100644 --- a/src/core/client/account/routes/download/Download/DownloadDescription.tsx +++ b/src/core/client/account/routes/download/Download/DownloadDescription.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Flex, HorizontalGutter, Icon, Typography } from "coral-ui/components"; diff --git a/src/core/client/account/routes/download/Download/DownloadForm.tsx b/src/core/client/account/routes/download/Download/DownloadForm.tsx index 9adb89d0c..f2df363b5 100644 --- a/src/core/client/account/routes/download/Download/DownloadForm.tsx +++ b/src/core/client/account/routes/download/Download/DownloadForm.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback, useState } from "react"; import { Button, HorizontalGutter } from "coral-ui/components"; diff --git a/src/core/client/account/routes/download/Download/Sorry.tsx b/src/core/client/account/routes/download/Download/Sorry.tsx index 24db5421e..096cebd2e 100644 --- a/src/core/client/account/routes/download/Download/Sorry.tsx +++ b/src/core/client/account/routes/download/Download/Sorry.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { CallOut, Flex, Icon } from "coral-ui/components"; diff --git a/src/core/client/account/routes/email/Confirm/ConfirmForm.tsx b/src/core/client/account/routes/email/Confirm/ConfirmForm.tsx index 5fc87a062..9aab99083 100644 --- a/src/core/client/account/routes/email/Confirm/ConfirmForm.tsx +++ b/src/core/client/account/routes/email/Confirm/ConfirmForm.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { FORM_ERROR } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { useCallback } from "react"; import { Form } from "react-final-form"; diff --git a/src/core/client/account/routes/email/Confirm/Sorry.tsx b/src/core/client/account/routes/email/Confirm/Sorry.tsx index 7a9776fcb..69465f937 100644 --- a/src/core/client/account/routes/email/Confirm/Sorry.tsx +++ b/src/core/client/account/routes/email/Confirm/Sorry.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React from "react"; import { CallOut, HorizontalGutter, Typography } from "coral-ui/components"; diff --git a/src/core/client/account/routes/email/Confirm/Success.tsx b/src/core/client/account/routes/email/Confirm/Success.tsx index 3672bab36..5f90dc358 100644 --- a/src/core/client/account/routes/email/Confirm/Success.tsx +++ b/src/core/client/account/routes/email/Confirm/Success.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React from "react"; import { HorizontalGutter, Typography } from "coral-ui/components"; diff --git a/src/core/client/account/routes/notifications/Unsubscribe/Sorry.tsx b/src/core/client/account/routes/notifications/Unsubscribe/Sorry.tsx index c33c6c91f..fa7a77309 100644 --- a/src/core/client/account/routes/notifications/Unsubscribe/Sorry.tsx +++ b/src/core/client/account/routes/notifications/Unsubscribe/Sorry.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React from "react"; import { CallOut, HorizontalGutter, Typography } from "coral-ui/components"; diff --git a/src/core/client/account/routes/notifications/Unsubscribe/Success.tsx b/src/core/client/account/routes/notifications/Unsubscribe/Success.tsx index e822533c7..5e6e34b86 100644 --- a/src/core/client/account/routes/notifications/Unsubscribe/Success.tsx +++ b/src/core/client/account/routes/notifications/Unsubscribe/Success.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React from "react"; import { HorizontalGutter, Typography } from "coral-ui/components"; diff --git a/src/core/client/account/routes/notifications/Unsubscribe/UnsubscribeForm.tsx b/src/core/client/account/routes/notifications/Unsubscribe/UnsubscribeForm.tsx index d14fd7710..da4e3dc98 100644 --- a/src/core/client/account/routes/notifications/Unsubscribe/UnsubscribeForm.tsx +++ b/src/core/client/account/routes/notifications/Unsubscribe/UnsubscribeForm.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { FORM_ERROR } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { useCallback } from "react"; import { Form } from "react-final-form"; diff --git a/src/core/client/account/routes/password/Reset/ResetPasswordForm.tsx b/src/core/client/account/routes/password/Reset/ResetPasswordForm.tsx index 177cbe481..c1bf80454 100644 --- a/src/core/client/account/routes/password/Reset/ResetPasswordForm.tsx +++ b/src/core/client/account/routes/password/Reset/ResetPasswordForm.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { FORM_ERROR } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { useCallback } from "react"; import { Field, Form } from "react-final-form"; diff --git a/src/core/client/account/routes/password/Reset/Sorry.tsx b/src/core/client/account/routes/password/Reset/Sorry.tsx index e17640f63..37dcbc5f6 100644 --- a/src/core/client/account/routes/password/Reset/Sorry.tsx +++ b/src/core/client/account/routes/password/Reset/Sorry.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React from "react"; import { CallOut, HorizontalGutter, Typography } from "coral-ui/components"; diff --git a/src/core/client/account/routes/password/Reset/Success.tsx b/src/core/client/account/routes/password/Reset/Success.tsx index 0498501f0..d72f137b5 100644 --- a/src/core/client/account/routes/password/Reset/Success.tsx +++ b/src/core/client/account/routes/password/Reset/Success.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React from "react"; import { HorizontalGutter, Typography } from "coral-ui/components"; diff --git a/src/core/client/admin/App/DecisionHistory/ApprovedComment.tsx b/src/core/client/admin/App/DecisionHistory/ApprovedComment.tsx index a23651f5d..bbf2501f3 100644 --- a/src/core/client/admin/App/DecisionHistory/ApprovedComment.tsx +++ b/src/core/client/admin/App/DecisionHistory/ApprovedComment.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import ApprovedIcon from "./ApprovedIcon"; diff --git a/src/core/client/admin/App/DecisionHistory/DecisionHistoryButton.tsx b/src/core/client/admin/App/DecisionHistory/DecisionHistoryButton.tsx index 15dfc595c..3265b4417 100644 --- a/src/core/client/admin/App/DecisionHistory/DecisionHistoryButton.tsx +++ b/src/core/client/admin/App/DecisionHistory/DecisionHistoryButton.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { diff --git a/src/core/client/admin/App/DecisionHistory/Empty.tsx b/src/core/client/admin/App/DecisionHistory/Empty.tsx index d88e7e268..30c1e767d 100644 --- a/src/core/client/admin/App/DecisionHistory/Empty.tsx +++ b/src/core/client/admin/App/DecisionHistory/Empty.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Flex } from "coral-ui/components/v2"; diff --git a/src/core/client/admin/App/DecisionHistory/GoToCommentLink.tsx b/src/core/client/admin/App/DecisionHistory/GoToCommentLink.tsx index aeed3bac1..bda4e01b2 100644 --- a/src/core/client/admin/App/DecisionHistory/GoToCommentLink.tsx +++ b/src/core/client/admin/App/DecisionHistory/GoToCommentLink.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import { Link } from "found"; import React, { FunctionComponent } from "react"; diff --git a/src/core/client/admin/App/DecisionHistory/RejectedComment.tsx b/src/core/client/admin/App/DecisionHistory/RejectedComment.tsx index f2fc6f6c8..e8bf98960 100644 --- a/src/core/client/admin/App/DecisionHistory/RejectedComment.tsx +++ b/src/core/client/admin/App/DecisionHistory/RejectedComment.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import DecisionItem from "./DecisionItem"; diff --git a/src/core/client/admin/App/DecisionHistory/ShowMoreButton.tsx b/src/core/client/admin/App/DecisionHistory/ShowMoreButton.tsx index 646244f57..2a460bcd9 100644 --- a/src/core/client/admin/App/DecisionHistory/ShowMoreButton.tsx +++ b/src/core/client/admin/App/DecisionHistory/ShowMoreButton.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { BaseButton } from "coral-ui/components/v2"; diff --git a/src/core/client/admin/App/DecisionHistory/Title.tsx b/src/core/client/admin/App/DecisionHistory/Title.tsx index f72cfc295..403acfeb2 100644 --- a/src/core/client/admin/App/DecisionHistory/Title.tsx +++ b/src/core/client/admin/App/DecisionHistory/Title.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Flex, Icon } from "coral-ui/components/v2"; diff --git a/src/core/client/admin/App/Navigation/Navigation.tsx b/src/core/client/admin/App/Navigation/Navigation.tsx index c53f5e0f3..27f19d569 100644 --- a/src/core/client/admin/App/Navigation/Navigation.tsx +++ b/src/core/client/admin/App/Navigation/Navigation.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { AppBarNavigation } from "coral-ui/components/v2"; diff --git a/src/core/client/admin/App/UserMenu/UserMenu.tsx b/src/core/client/admin/App/UserMenu/UserMenu.tsx index fd71feeee..0307639e3 100644 --- a/src/core/client/admin/App/UserMenu/UserMenu.tsx +++ b/src/core/client/admin/App/UserMenu/UserMenu.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { diff --git a/src/core/client/admin/components/ModerateCard/ApproveButton.tsx b/src/core/client/admin/components/ModerateCard/ApproveButton.tsx index 6c38a52c1..e49779c69 100644 --- a/src/core/client/admin/components/ModerateCard/ApproveButton.tsx +++ b/src/core/client/admin/components/ModerateCard/ApproveButton.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { PropTypesOf } from "coral-framework/types"; diff --git a/src/core/client/admin/components/ModerateCard/CommentAuthorContainer.tsx b/src/core/client/admin/components/ModerateCard/CommentAuthorContainer.tsx index ba07eeb43..37a3ed4a0 100644 --- a/src/core/client/admin/components/ModerateCard/CommentAuthorContainer.tsx +++ b/src/core/client/admin/components/ModerateCard/CommentAuthorContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { graphql, withFragmentContainer } from "coral-framework/lib/relay"; diff --git a/src/core/client/admin/components/ModerateCard/FeatureButton.tsx b/src/core/client/admin/components/ModerateCard/FeatureButton.tsx index fb826bd75..3216cd2c6 100644 --- a/src/core/client/admin/components/ModerateCard/FeatureButton.tsx +++ b/src/core/client/admin/components/ModerateCard/FeatureButton.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { PropTypesOf } from "coral-framework/types"; diff --git a/src/core/client/admin/components/ModerateCard/FlagDetailsContainer.tsx b/src/core/client/admin/components/ModerateCard/FlagDetailsContainer.tsx index e35b432d9..4fef82b41 100644 --- a/src/core/client/admin/components/ModerateCard/FlagDetailsContainer.tsx +++ b/src/core/client/admin/components/ModerateCard/FlagDetailsContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/components/ModerateCard/InReplyTo.tsx b/src/core/client/admin/components/ModerateCard/InReplyTo.tsx index 428f8eaff..07878187e 100644 --- a/src/core/client/admin/components/ModerateCard/InReplyTo.tsx +++ b/src/core/client/admin/components/ModerateCard/InReplyTo.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { BaseButton, Flex, Icon } from "coral-ui/components/v2"; diff --git a/src/core/client/admin/components/ModerateCard/LinkDetailsContainer.tsx b/src/core/client/admin/components/ModerateCard/LinkDetailsContainer.tsx index e0701d61b..7fa18e9d5 100644 --- a/src/core/client/admin/components/ModerateCard/LinkDetailsContainer.tsx +++ b/src/core/client/admin/components/ModerateCard/LinkDetailsContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import CopyToClipboard from "react-copy-to-clipboard"; diff --git a/src/core/client/admin/components/ModerateCard/Markers.tsx b/src/core/client/admin/components/ModerateCard/Markers.tsx index 6c5ea4502..e9b207bd0 100644 --- a/src/core/client/admin/components/ModerateCard/Markers.tsx +++ b/src/core/client/admin/components/ModerateCard/Markers.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback, useState } from "react"; import { useUUID } from "coral-framework/hooks"; diff --git a/src/core/client/admin/components/ModerateCard/MarkersContainer.tsx b/src/core/client/admin/components/ModerateCard/MarkersContainer.tsx index 91e438869..c52b9604a 100644 --- a/src/core/client/admin/components/ModerateCard/MarkersContainer.tsx +++ b/src/core/client/admin/components/ModerateCard/MarkersContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/components/ModerateCard/ModerateCard.tsx b/src/core/client/admin/components/ModerateCard/ModerateCard.tsx index 65cf39017..aef8d309b 100644 --- a/src/core/client/admin/components/ModerateCard/ModerateCard.tsx +++ b/src/core/client/admin/components/ModerateCard/ModerateCard.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import key from "keymaster"; import { noop } from "lodash"; import React, { diff --git a/src/core/client/admin/components/ModerateCard/ModerateCardDetailsContainer.tsx b/src/core/client/admin/components/ModerateCard/ModerateCardDetailsContainer.tsx index beab1cc98..0bc655017 100644 --- a/src/core/client/admin/components/ModerateCard/ModerateCardDetailsContainer.tsx +++ b/src/core/client/admin/components/ModerateCard/ModerateCardDetailsContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useState } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/components/ModerateCard/ModeratedByContainer.tsx b/src/core/client/admin/components/ModerateCard/ModeratedByContainer.tsx index c684fefb9..13483272d 100644 --- a/src/core/client/admin/components/ModerateCard/ModeratedByContainer.tsx +++ b/src/core/client/admin/components/ModerateCard/ModeratedByContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { useCallback } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/components/ModerateCard/RejectButton.tsx b/src/core/client/admin/components/ModerateCard/RejectButton.tsx index 20b030036..5403796f5 100644 --- a/src/core/client/admin/components/ModerateCard/RejectButton.tsx +++ b/src/core/client/admin/components/ModerateCard/RejectButton.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { PropTypesOf } from "coral-framework/types"; diff --git a/src/core/client/admin/components/ModerateCard/ToxicityLabel.tsx b/src/core/client/admin/components/ModerateCard/ToxicityLabel.tsx index a5cd1d5dd..af6878480 100644 --- a/src/core/client/admin/components/ModerateCard/ToxicityLabel.tsx +++ b/src/core/client/admin/components/ModerateCard/ToxicityLabel.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Counter } from "coral-ui/components/v2"; diff --git a/src/core/client/admin/components/NotAvailable.tsx b/src/core/client/admin/components/NotAvailable.tsx index bce0d84de..7b070b732 100644 --- a/src/core/client/admin/components/NotAvailable.tsx +++ b/src/core/client/admin/components/NotAvailable.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import styles from "./NotAvailable.css"; diff --git a/src/core/client/admin/components/TranslatedRole.tsx b/src/core/client/admin/components/TranslatedRole.tsx index 2485efd73..0e703e152 100644 --- a/src/core/client/admin/components/TranslatedRole.tsx +++ b/src/core/client/admin/components/TranslatedRole.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React from "react"; import { GQLUSER_ROLE, GQLUSER_ROLE_RL } from "coral-framework/schema"; diff --git a/src/core/client/admin/components/TranslatedStoryStatus.tsx b/src/core/client/admin/components/TranslatedStoryStatus.tsx index b431024b8..dc6f88e50 100644 --- a/src/core/client/admin/components/TranslatedStoryStatus.tsx +++ b/src/core/client/admin/components/TranslatedStoryStatus.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React from "react"; import { GQLSTORY_STATUS, GQLSTORY_STATUS_RL } from "coral-framework/schema"; diff --git a/src/core/client/admin/components/UserHistoryDrawer/BanAction.tsx b/src/core/client/admin/components/UserHistoryDrawer/BanAction.tsx index 60ec6cf3a..5ada79e9f 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/BanAction.tsx +++ b/src/core/client/admin/components/UserHistoryDrawer/BanAction.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; export interface BanActionProps { diff --git a/src/core/client/admin/components/UserHistoryDrawer/ModeratorNote.tsx b/src/core/client/admin/components/UserHistoryDrawer/ModeratorNote.tsx index 24748f131..2759e7a12 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/ModeratorNote.tsx +++ b/src/core/client/admin/components/UserHistoryDrawer/ModeratorNote.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { Button, ButtonIcon, Flex, Timestamp } from "coral-ui/components/v2"; diff --git a/src/core/client/admin/components/UserHistoryDrawer/PremodAction.tsx b/src/core/client/admin/components/UserHistoryDrawer/PremodAction.tsx index 046fa800e..fbfb61b1d 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/PremodAction.tsx +++ b/src/core/client/admin/components/UserHistoryDrawer/PremodAction.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; export interface PremodActionProps { diff --git a/src/core/client/admin/components/UserHistoryDrawer/RecentHistory.tsx b/src/core/client/admin/components/UserHistoryDrawer/RecentHistory.tsx index 9f72a35b9..adcbfbeaa 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/RecentHistory.tsx +++ b/src/core/client/admin/components/UserHistoryDrawer/RecentHistory.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { reduceSeconds, UNIT } from "coral-common/helpers/i18n"; diff --git a/src/core/client/admin/components/UserHistoryDrawer/SuspensionAction.tsx b/src/core/client/admin/components/UserHistoryDrawer/SuspensionAction.tsx index 81a84122b..884153ada 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/SuspensionAction.tsx +++ b/src/core/client/admin/components/UserHistoryDrawer/SuspensionAction.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { reduceSeconds } from "coral-common/helpers/i18n"; diff --git a/src/core/client/admin/components/UserHistoryDrawer/Tabs.tsx b/src/core/client/admin/components/UserHistoryDrawer/Tabs.tsx index 5f626316e..c5b600025 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/Tabs.tsx +++ b/src/core/client/admin/components/UserHistoryDrawer/Tabs.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback, useState } from "react"; import { diff --git a/src/core/client/admin/components/UserHistoryDrawer/UserDrawerAccountHistory.tsx b/src/core/client/admin/components/UserHistoryDrawer/UserDrawerAccountHistory.tsx index b5b9dd495..5db726f27 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/UserDrawerAccountHistory.tsx +++ b/src/core/client/admin/components/UserHistoryDrawer/UserDrawerAccountHistory.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useMemo } from "react"; import { useCoralContext } from "coral-framework/lib/bootstrap"; diff --git a/src/core/client/admin/components/UserHistoryDrawer/UserDrawerAccountHistoryQuery.tsx b/src/core/client/admin/components/UserHistoryDrawer/UserDrawerAccountHistoryQuery.tsx index 6bbd55361..2062d3541 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/UserDrawerAccountHistoryQuery.tsx +++ b/src/core/client/admin/components/UserHistoryDrawer/UserDrawerAccountHistoryQuery.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { ReadyState } from "react-relay"; diff --git a/src/core/client/admin/components/UserHistoryDrawer/UserDrawerNotesContainer.tsx b/src/core/client/admin/components/UserHistoryDrawer/UserDrawerNotesContainer.tsx index 190c12fcc..c20c10f0b 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/UserDrawerNotesContainer.tsx +++ b/src/core/client/admin/components/UserHistoryDrawer/UserDrawerNotesContainer.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { FormApi } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { Field, Form } from "react-final-form"; diff --git a/src/core/client/admin/components/UserHistoryDrawer/UserDrawerNotesQuery.tsx b/src/core/client/admin/components/UserHistoryDrawer/UserDrawerNotesQuery.tsx index 6b105d3a4..2bf820e09 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/UserDrawerNotesQuery.tsx +++ b/src/core/client/admin/components/UserHistoryDrawer/UserDrawerNotesQuery.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { ReadyState } from "react-relay"; diff --git a/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerAllComments.tsx b/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerAllComments.tsx index 1940cfdb2..a79fae682 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerAllComments.tsx +++ b/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerAllComments.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { graphql, RelayPaginationProp } from "react-relay"; diff --git a/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerAllCommentsQuery.tsx b/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerAllCommentsQuery.tsx index f16c1427d..0e467d595 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerAllCommentsQuery.tsx +++ b/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerAllCommentsQuery.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { ReadyState } from "react-relay"; diff --git a/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerContainer.tsx b/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerContainer.tsx index 3822ca586..bb651296c 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerContainer.tsx +++ b/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { UserStatusChangeContainer } from "coral-admin/components/UserStatus"; diff --git a/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerQuery.tsx b/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerQuery.tsx index bfca2abf3..09c6bd0e3 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerQuery.tsx +++ b/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerQuery.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { ReadyState } from "react-relay"; diff --git a/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerRejectedComments.tsx b/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerRejectedComments.tsx index a32899c92..8cec4bae5 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerRejectedComments.tsx +++ b/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerRejectedComments.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { graphql, RelayPaginationProp } from "react-relay"; diff --git a/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerRejectedCommentsQuery.tsx b/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerRejectedCommentsQuery.tsx index 7682fce23..557323b0c 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerRejectedCommentsQuery.tsx +++ b/src/core/client/admin/components/UserHistoryDrawer/UserHistoryDrawerRejectedCommentsQuery.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { ReadyState } from "react-relay"; diff --git a/src/core/client/admin/components/UserHistoryDrawer/UserStatusDetailsContainer.tsx b/src/core/client/admin/components/UserHistoryDrawer/UserStatusDetailsContainer.tsx index a665b64ec..392f71ba5 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/UserStatusDetailsContainer.tsx +++ b/src/core/client/admin/components/UserHistoryDrawer/UserStatusDetailsContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useMemo } from "react"; import { useCoralContext } from "coral-framework/lib/bootstrap"; diff --git a/src/core/client/admin/components/UserHistoryDrawer/UsernameChangeAction.tsx b/src/core/client/admin/components/UserHistoryDrawer/UsernameChangeAction.tsx index 3a4b179e0..b85128754 100644 --- a/src/core/client/admin/components/UserHistoryDrawer/UsernameChangeAction.tsx +++ b/src/core/client/admin/components/UserHistoryDrawer/UsernameChangeAction.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import styles from "./UsernameChangeAction.css"; diff --git a/src/core/client/admin/components/UserRole/UserRoleChange.tsx b/src/core/client/admin/components/UserRole/UserRoleChange.tsx index a9851a404..9c0a90ae4 100644 --- a/src/core/client/admin/components/UserRole/UserRoleChange.tsx +++ b/src/core/client/admin/components/UserRole/UserRoleChange.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import TranslatedRole from "coral-admin/components/TranslatedRole"; diff --git a/src/core/client/admin/components/UserStatus/BanModal.tsx b/src/core/client/admin/components/UserStatus/BanModal.tsx index 1cc8c5575..c1a753831 100644 --- a/src/core/client/admin/components/UserStatus/BanModal.tsx +++ b/src/core/client/admin/components/UserStatus/BanModal.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback, useMemo } from "react"; import { Field, Form } from "react-final-form"; diff --git a/src/core/client/admin/components/UserStatus/PremodModal.tsx b/src/core/client/admin/components/UserStatus/PremodModal.tsx index d860f1e8f..b9f6272f9 100644 --- a/src/core/client/admin/components/UserStatus/PremodModal.tsx +++ b/src/core/client/admin/components/UserStatus/PremodModal.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import NotAvailable from "coral-admin/components/NotAvailable"; diff --git a/src/core/client/admin/components/UserStatus/SuspendForm.tsx b/src/core/client/admin/components/UserStatus/SuspendForm.tsx index f883f3b62..0e578675f 100644 --- a/src/core/client/admin/components/UserStatus/SuspendForm.tsx +++ b/src/core/client/admin/components/UserStatus/SuspendForm.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { Mutator } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, RefObject, useCallback } from "react"; import { Field, Form } from "react-final-form"; diff --git a/src/core/client/admin/components/UserStatus/SuspendModal.tsx b/src/core/client/admin/components/UserStatus/SuspendModal.tsx index 00a885728..06a52b656 100644 --- a/src/core/client/admin/components/UserStatus/SuspendModal.tsx +++ b/src/core/client/admin/components/UserStatus/SuspendModal.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback, useState } from "react"; import NotAvailable from "coral-admin/components/NotAvailable"; diff --git a/src/core/client/admin/components/UserStatus/UserStatus.tsx b/src/core/client/admin/components/UserStatus/UserStatus.tsx index 1866c274e..4bd4e9eb0 100644 --- a/src/core/client/admin/components/UserStatus/UserStatus.tsx +++ b/src/core/client/admin/components/UserStatus/UserStatus.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Flex } from "coral-ui/components/v2"; diff --git a/src/core/client/admin/components/UserStatus/UserStatusChange.tsx b/src/core/client/admin/components/UserStatus/UserStatusChange.tsx index 606cdc5a7..e313d6966 100644 --- a/src/core/client/admin/components/UserStatus/UserStatusChange.tsx +++ b/src/core/client/admin/components/UserStatus/UserStatusChange.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { diff --git a/src/core/client/admin/routes/AuthCheck/NetworkError.tsx b/src/core/client/admin/routes/AuthCheck/NetworkError.tsx index 45e8d1a93..6a35ef14b 100644 --- a/src/core/client/admin/routes/AuthCheck/NetworkError.tsx +++ b/src/core/client/admin/routes/AuthCheck/NetworkError.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Message } from "coral-ui/components"; diff --git a/src/core/client/admin/routes/AuthCheck/Restricted.tsx b/src/core/client/admin/routes/AuthCheck/Restricted.tsx index 5d37cf635..6ed849e4e 100644 --- a/src/core/client/admin/routes/AuthCheck/Restricted.tsx +++ b/src/core/client/admin/routes/AuthCheck/Restricted.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import AuthBox from "coral-admin/components/AuthBox"; diff --git a/src/core/client/admin/routes/Community/EmptyMessage.tsx b/src/core/client/admin/routes/Community/EmptyMessage.tsx index 7a84e2fb2..8adb6c36f 100644 --- a/src/core/client/admin/routes/Community/EmptyMessage.tsx +++ b/src/core/client/admin/routes/Community/EmptyMessage.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import styles from "./EmptyMessage.css"; diff --git a/src/core/client/admin/routes/Community/InviteUsers/EmailField.tsx b/src/core/client/admin/routes/Community/InviteUsers/EmailField.tsx index f54f8d70e..950a90875 100644 --- a/src/core/client/admin/routes/Community/InviteUsers/EmailField.tsx +++ b/src/core/client/admin/routes/Community/InviteUsers/EmailField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/admin/routes/Community/InviteUsers/InviteUsers.tsx b/src/core/client/admin/routes/Community/InviteUsers/InviteUsers.tsx index f54b808a6..2f92a9cf4 100644 --- a/src/core/client/admin/routes/Community/InviteUsers/InviteUsers.tsx +++ b/src/core/client/admin/routes/Community/InviteUsers/InviteUsers.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback, useState } from "react"; import { Button, Modal } from "coral-ui/components/v2"; diff --git a/src/core/client/admin/routes/Community/InviteUsers/InviteUsersForm.tsx b/src/core/client/admin/routes/Community/InviteUsers/InviteUsersForm.tsx index 6dd0a0b3b..45fd44cb0 100644 --- a/src/core/client/admin/routes/Community/InviteUsers/InviteUsersForm.tsx +++ b/src/core/client/admin/routes/Community/InviteUsers/InviteUsersForm.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { FORM_ERROR } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback, useState } from "react"; import { Form, FormSpy } from "react-final-form"; diff --git a/src/core/client/admin/routes/Community/InviteUsers/InviteUsersModal.tsx b/src/core/client/admin/routes/Community/InviteUsers/InviteUsersModal.tsx index 6acd21571..49202c148 100644 --- a/src/core/client/admin/routes/Community/InviteUsers/InviteUsersModal.tsx +++ b/src/core/client/admin/routes/Community/InviteUsers/InviteUsersModal.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback, useState } from "react"; import { diff --git a/src/core/client/admin/routes/Community/InviteUsers/RoleField.tsx b/src/core/client/admin/routes/Community/InviteUsers/RoleField.tsx index 4c5aca164..9e1658e68 100644 --- a/src/core/client/admin/routes/Community/InviteUsers/RoleField.tsx +++ b/src/core/client/admin/routes/Community/InviteUsers/RoleField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/admin/routes/Community/InviteUsers/Success.tsx b/src/core/client/admin/routes/Community/InviteUsers/Success.tsx index 56409ca2a..4aa289eb3 100644 --- a/src/core/client/admin/routes/Community/InviteUsers/Success.tsx +++ b/src/core/client/admin/routes/Community/InviteUsers/Success.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Box, Button, CheckIcon, Flex } from "coral-ui/components"; diff --git a/src/core/client/admin/routes/Community/UserRow.tsx b/src/core/client/admin/routes/Community/UserRow.tsx index e5160dbf7..b8638aa7f 100644 --- a/src/core/client/admin/routes/Community/UserRow.tsx +++ b/src/core/client/admin/routes/Community/UserRow.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback } from "react"; import NotAvailable from "coral-admin/components/NotAvailable"; diff --git a/src/core/client/admin/routes/Community/UserTable.tsx b/src/core/client/admin/routes/Community/UserTable.tsx index 15152c656..9d1c04f6c 100644 --- a/src/core/client/admin/routes/Community/UserTable.tsx +++ b/src/core/client/admin/routes/Community/UserTable.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback, useState } from "react"; import AutoLoadMore from "coral-admin/components/AutoLoadMore"; diff --git a/src/core/client/admin/routes/Community/UserTableFilter.tsx b/src/core/client/admin/routes/Community/UserTableFilter.tsx index 6cb310136..2d7ba1bcf 100644 --- a/src/core/client/admin/routes/Community/UserTableFilter.tsx +++ b/src/core/client/admin/routes/Community/UserTableFilter.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field, Form } from "react-final-form"; diff --git a/src/core/client/admin/routes/Configure/ConfigurationSubHeader.tsx b/src/core/client/admin/routes/Configure/ConfigurationSubHeader.tsx index 2f3086248..aad5ed704 100644 --- a/src/core/client/admin/routes/Configure/ConfigurationSubHeader.tsx +++ b/src/core/client/admin/routes/Configure/ConfigurationSubHeader.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import Subheader from "./Subheader"; diff --git a/src/core/client/admin/routes/Configure/Configure.tsx b/src/core/client/admin/routes/Configure/Configure.tsx index 5be62a542..346b528be 100644 --- a/src/core/client/admin/routes/Configure/Configure.tsx +++ b/src/core/client/admin/routes/Configure/Configure.tsx @@ -1,6 +1,6 @@ +import { Localized } from "@fluent/react/compat"; import { FormApi, FormState } from "final-form"; import arrayMutators from "final-form-arrays"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Form, FormSpy } from "react-final-form"; diff --git a/src/core/client/admin/routes/Configure/OnOffField.tsx b/src/core/client/admin/routes/Configure/OnOffField.tsx index 3c186104d..4657854c5 100644 --- a/src/core/client/admin/routes/Configure/OnOffField.tsx +++ b/src/core/client/admin/routes/Configure/OnOffField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/admin/routes/Configure/sections/Advanced/CommentStreamLiveUpdates.tsx b/src/core/client/admin/routes/Configure/sections/Advanced/CommentStreamLiveUpdates.tsx index 3457d2ae2..20cb8916a 100644 --- a/src/core/client/admin/routes/Configure/sections/Advanced/CommentStreamLiveUpdates.tsx +++ b/src/core/client/admin/routes/Configure/sections/Advanced/CommentStreamLiveUpdates.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Advanced/CustomCSSConfig.tsx b/src/core/client/admin/routes/Configure/sections/Advanced/CustomCSSConfig.tsx index 2cdcc78cd..bce7da112 100644 --- a/src/core/client/admin/routes/Configure/sections/Advanced/CustomCSSConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/Advanced/CustomCSSConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Advanced/EmbedCode.tsx b/src/core/client/admin/routes/Configure/sections/Advanced/EmbedCode.tsx index 18addf914..712f019b1 100644 --- a/src/core/client/admin/routes/Configure/sections/Advanced/EmbedCode.tsx +++ b/src/core/client/admin/routes/Configure/sections/Advanced/EmbedCode.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { stripIndent } from "common-tags"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useMemo } from "react"; import { CopyButton } from "coral-framework/components"; diff --git a/src/core/client/admin/routes/Configure/sections/Advanced/PermittedDomainsConfig.tsx b/src/core/client/admin/routes/Configure/sections/Advanced/PermittedDomainsConfig.tsx index c994104fa..6cf992571 100644 --- a/src/core/client/admin/routes/Configure/sections/Advanced/PermittedDomainsConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/Advanced/PermittedDomainsConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Advanced/StoryCreationConfig.tsx b/src/core/client/admin/routes/Configure/sections/Advanced/StoryCreationConfig.tsx index a050bd398..c367002d2 100644 --- a/src/core/client/admin/routes/Configure/sections/Advanced/StoryCreationConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/Advanced/StoryCreationConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Auth/AccountFeaturesConfig.tsx b/src/core/client/admin/routes/Configure/sections/Auth/AccountFeaturesConfig.tsx index 2b70ea040..4e3b93d32 100644 --- a/src/core/client/admin/routes/Configure/sections/Auth/AccountFeaturesConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/Auth/AccountFeaturesConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Auth/AuthConfigContainer.tsx b/src/core/client/admin/routes/Configure/sections/Auth/AuthConfigContainer.tsx index 1efea2cf4..a4990d18b 100644 --- a/src/core/client/admin/routes/Configure/sections/Auth/AuthConfigContainer.tsx +++ b/src/core/client/admin/routes/Configure/sections/Auth/AuthConfigContainer.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { FORM_ERROR, FormApi } from "final-form"; -import { Localized } from "fluent-react/compat"; import { RouteProps } from "found"; import React from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Auth/ClientIDField.tsx b/src/core/client/admin/routes/Configure/sections/Auth/ClientIDField.tsx index 84441edea..ca3bc7011 100644 --- a/src/core/client/admin/routes/Configure/sections/Auth/ClientIDField.tsx +++ b/src/core/client/admin/routes/Configure/sections/Auth/ClientIDField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/admin/routes/Configure/sections/Auth/ClientSecretField.tsx b/src/core/client/admin/routes/Configure/sections/Auth/ClientSecretField.tsx index 8c9322554..dcd75bc4c 100644 --- a/src/core/client/admin/routes/Configure/sections/Auth/ClientSecretField.tsx +++ b/src/core/client/admin/routes/Configure/sections/Auth/ClientSecretField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/admin/routes/Configure/sections/Auth/ConfigBoxWithToggleField.tsx b/src/core/client/admin/routes/Configure/sections/Auth/ConfigBoxWithToggleField.tsx index 959dfba0f..d0be7234a 100644 --- a/src/core/client/admin/routes/Configure/sections/Auth/ConfigBoxWithToggleField.tsx +++ b/src/core/client/admin/routes/Configure/sections/Auth/ConfigBoxWithToggleField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/admin/routes/Configure/sections/Auth/FacebookConfig.tsx b/src/core/client/admin/routes/Configure/sections/Auth/FacebookConfig.tsx index 21a90f535..ccf7cb7f0 100644 --- a/src/core/client/admin/routes/Configure/sections/Auth/FacebookConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/Auth/FacebookConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Auth/GoogleConfig.tsx b/src/core/client/admin/routes/Configure/sections/Auth/GoogleConfig.tsx index 8704c1bb7..24326191c 100644 --- a/src/core/client/admin/routes/Configure/sections/Auth/GoogleConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/Auth/GoogleConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Auth/LocalAuthConfig.tsx b/src/core/client/admin/routes/Configure/sections/Auth/LocalAuthConfig.tsx index 1d12aafad..2da5edf04 100644 --- a/src/core/client/admin/routes/Configure/sections/Auth/LocalAuthConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/Auth/LocalAuthConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Auth/OIDCConfig.tsx b/src/core/client/admin/routes/Configure/sections/Auth/OIDCConfig.tsx index 449065a56..9bd357a66 100644 --- a/src/core/client/admin/routes/Configure/sections/Auth/OIDCConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/Auth/OIDCConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Auth/RedirectField.tsx b/src/core/client/admin/routes/Configure/sections/Auth/RedirectField.tsx index ea0faaf6a..da00e1f5a 100644 --- a/src/core/client/admin/routes/Configure/sections/Auth/RedirectField.tsx +++ b/src/core/client/admin/routes/Configure/sections/Auth/RedirectField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { CopyButton } from "coral-framework/components"; diff --git a/src/core/client/admin/routes/Configure/sections/Auth/RegistrationField.tsx b/src/core/client/admin/routes/Configure/sections/Auth/RegistrationField.tsx index e198b311f..3950c6281 100644 --- a/src/core/client/admin/routes/Configure/sections/Auth/RegistrationField.tsx +++ b/src/core/client/admin/routes/Configure/sections/Auth/RegistrationField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/admin/routes/Configure/sections/Auth/SSOConfig.tsx b/src/core/client/admin/routes/Configure/sections/Auth/SSOConfig.tsx index ac86b8e82..5bb9e7b3d 100644 --- a/src/core/client/admin/routes/Configure/sections/Auth/SSOConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/Auth/SSOConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Auth/SSOKeyField.tsx b/src/core/client/admin/routes/Configure/sections/Auth/SSOKeyField.tsx index 93cad5de3..83d47b43c 100644 --- a/src/core/client/admin/routes/Configure/sections/Auth/SSOKeyField.tsx +++ b/src/core/client/admin/routes/Configure/sections/Auth/SSOKeyField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { @@ -41,11 +41,16 @@ const SSOKeyField: FunctionComponent = ({ showPasswordTitle="Hide SSO Key" fullWidth /> - - - KEY GENERATED AT: {keyGeneratedAt} - - + {keyGeneratedAt && ( + + + KEY GENERATED AT: {keyGeneratedAt} + + + )}
warning diff --git a/src/core/client/admin/routes/Configure/sections/Auth/SessionConfig.tsx b/src/core/client/admin/routes/Configure/sections/Auth/SessionConfig.tsx index 75346f300..1dbd50aa1 100644 --- a/src/core/client/admin/routes/Configure/sections/Auth/SessionConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/Auth/SessionConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Auth/TargetFilterField.tsx b/src/core/client/admin/routes/Configure/sections/Auth/TargetFilterField.tsx index ba78a7295..2ed5f8e86 100644 --- a/src/core/client/admin/routes/Configure/sections/Auth/TargetFilterField.tsx +++ b/src/core/client/admin/routes/Configure/sections/Auth/TargetFilterField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/admin/routes/Configure/sections/Email/EmailConfigContainer.tsx b/src/core/client/admin/routes/Configure/sections/Email/EmailConfigContainer.tsx index 87da346ed..4930f0b70 100644 --- a/src/core/client/admin/routes/Configure/sections/Email/EmailConfigContainer.tsx +++ b/src/core/client/admin/routes/Configure/sections/Email/EmailConfigContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { useMemo } from "react"; import { useForm } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Email/From.tsx b/src/core/client/admin/routes/Configure/sections/Email/From.tsx index 25fa2a250..4a179a933 100644 --- a/src/core/client/admin/routes/Configure/sections/Email/From.tsx +++ b/src/core/client/admin/routes/Configure/sections/Email/From.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Email/SMTP.tsx b/src/core/client/admin/routes/Configure/sections/Email/SMTP.tsx index 32c5e5558..b1c37d34f 100644 --- a/src/core/client/admin/routes/Configure/sections/Email/SMTP.tsx +++ b/src/core/client/admin/routes/Configure/sections/Email/SMTP.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/General/ClosedStreamMessageConfig.tsx b/src/core/client/admin/routes/Configure/sections/General/ClosedStreamMessageConfig.tsx index 3713f3988..e606ce70f 100644 --- a/src/core/client/admin/routes/Configure/sections/General/ClosedStreamMessageConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/General/ClosedStreamMessageConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, Suspense } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/General/ClosingCommentStreamsConfig.tsx b/src/core/client/admin/routes/Configure/sections/General/ClosingCommentStreamsConfig.tsx index 3a44ff2d5..708b56cf1 100644 --- a/src/core/client/admin/routes/Configure/sections/General/ClosingCommentStreamsConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/General/ClosingCommentStreamsConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/General/CommentEditingConfig.tsx b/src/core/client/admin/routes/Configure/sections/General/CommentEditingConfig.tsx index 6a4e48037..889cca4e8 100644 --- a/src/core/client/admin/routes/Configure/sections/General/CommentEditingConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/General/CommentEditingConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/General/CommentLengthConfig.tsx b/src/core/client/admin/routes/Configure/sections/General/CommentLengthConfig.tsx index 2253e7916..d3347ada3 100644 --- a/src/core/client/admin/routes/Configure/sections/General/CommentLengthConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/General/CommentLengthConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/General/GuidelinesConfig.tsx b/src/core/client/admin/routes/Configure/sections/General/GuidelinesConfig.tsx index fb49ca1d9..25e55e8ef 100644 --- a/src/core/client/admin/routes/Configure/sections/General/GuidelinesConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/General/GuidelinesConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, Suspense } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/General/LocaleConfig.tsx b/src/core/client/admin/routes/Configure/sections/General/LocaleConfig.tsx index c38531478..c01294ed8 100644 --- a/src/core/client/admin/routes/Configure/sections/General/LocaleConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/General/LocaleConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/General/ReactionConfig.tsx b/src/core/client/admin/routes/Configure/sections/General/ReactionConfig.tsx index 01d071c89..af61698d4 100644 --- a/src/core/client/admin/routes/Configure/sections/General/ReactionConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/General/ReactionConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/General/SitewideCommentingConfig.tsx b/src/core/client/admin/routes/Configure/sections/General/SitewideCommentingConfig.tsx index 5cf048921..673f73f84 100644 --- a/src/core/client/admin/routes/Configure/sections/General/SitewideCommentingConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/General/SitewideCommentingConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, Suspense } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/General/StaffConfig.tsx b/src/core/client/admin/routes/Configure/sections/General/StaffConfig.tsx index f7e75a44a..335e49e98 100644 --- a/src/core/client/admin/routes/Configure/sections/General/StaffConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/General/StaffConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Moderation/APIKeyField.tsx b/src/core/client/admin/routes/Configure/sections/Moderation/APIKeyField.tsx index 2367e9722..2e3cb8968 100644 --- a/src/core/client/admin/routes/Configure/sections/Moderation/APIKeyField.tsx +++ b/src/core/client/admin/routes/Configure/sections/Moderation/APIKeyField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/admin/routes/Configure/sections/Moderation/AkismetConfig.tsx b/src/core/client/admin/routes/Configure/sections/Moderation/AkismetConfig.tsx index 965fe49e1..d76c9f08f 100644 --- a/src/core/client/admin/routes/Configure/sections/Moderation/AkismetConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/Moderation/AkismetConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Moderation/PerspectiveConfig.tsx b/src/core/client/admin/routes/Configure/sections/Moderation/PerspectiveConfig.tsx index 8870916ce..dbffc877a 100644 --- a/src/core/client/admin/routes/Configure/sections/Moderation/PerspectiveConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/Moderation/PerspectiveConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Moderation/PreModerationConfig.tsx b/src/core/client/admin/routes/Configure/sections/Moderation/PreModerationConfig.tsx index 19ef16dfc..20a4eb69f 100644 --- a/src/core/client/admin/routes/Configure/sections/Moderation/PreModerationConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/Moderation/PreModerationConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Moderation/RecentCommentHistoryConfig.tsx b/src/core/client/admin/routes/Configure/sections/Moderation/RecentCommentHistoryConfig.tsx index 08f9a158b..c3f9a883e 100644 --- a/src/core/client/admin/routes/Configure/sections/Moderation/RecentCommentHistoryConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/Moderation/RecentCommentHistoryConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Organization/OrganizationContactEmailConfig.tsx b/src/core/client/admin/routes/Configure/sections/Organization/OrganizationContactEmailConfig.tsx index 0f806556e..bb3a6f324 100644 --- a/src/core/client/admin/routes/Configure/sections/Organization/OrganizationContactEmailConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/Organization/OrganizationContactEmailConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Organization/OrganizationNameConfig.tsx b/src/core/client/admin/routes/Configure/sections/Organization/OrganizationNameConfig.tsx index 2ce3957f1..338927370 100644 --- a/src/core/client/admin/routes/Configure/sections/Organization/OrganizationNameConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/Organization/OrganizationNameConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Organization/OrganizationURLConfig.tsx b/src/core/client/admin/routes/Configure/sections/Organization/OrganizationURLConfig.tsx index 30d63a8ae..74d31c3f0 100644 --- a/src/core/client/admin/routes/Configure/sections/Organization/OrganizationURLConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/Organization/OrganizationURLConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/Slack/SlackChannel.tsx b/src/core/client/admin/routes/Configure/sections/Slack/SlackChannel.tsx index a22b7561d..2c1ab7dac 100644 --- a/src/core/client/admin/routes/Configure/sections/Slack/SlackChannel.tsx +++ b/src/core/client/admin/routes/Configure/sections/Slack/SlackChannel.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/admin/routes/Configure/sections/Slack/SlackConfigContainer.tsx b/src/core/client/admin/routes/Configure/sections/Slack/SlackConfigContainer.tsx index afa89b9f1..a0b5a8609 100644 --- a/src/core/client/admin/routes/Configure/sections/Slack/SlackConfigContainer.tsx +++ b/src/core/client/admin/routes/Configure/sections/Slack/SlackConfigContainer.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { FormApi } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback, diff --git a/src/core/client/admin/routes/Configure/sections/WordList/BannedWordListConfig.tsx b/src/core/client/admin/routes/Configure/sections/WordList/BannedWordListConfig.tsx index f7ea71f43..95caf2c89 100644 --- a/src/core/client/admin/routes/Configure/sections/WordList/BannedWordListConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/WordList/BannedWordListConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/Configure/sections/WordList/SuspectWordListConfig.tsx b/src/core/client/admin/routes/Configure/sections/WordList/SuspectWordListConfig.tsx index 569c16e47..9e0f759c3 100644 --- a/src/core/client/admin/routes/Configure/sections/WordList/SuspectWordListConfig.tsx +++ b/src/core/client/admin/routes/Configure/sections/WordList/SuspectWordListConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/admin/routes/ForgotPassword/CheckEmail.tsx b/src/core/client/admin/routes/ForgotPassword/CheckEmail.tsx index f3984af77..b23b1b5f9 100644 --- a/src/core/client/admin/routes/ForgotPassword/CheckEmail.tsx +++ b/src/core/client/admin/routes/ForgotPassword/CheckEmail.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import Main from "coral-auth/components/Main"; diff --git a/src/core/client/admin/routes/ForgotPassword/ForgotPasswordContainer.tsx b/src/core/client/admin/routes/ForgotPassword/ForgotPasswordContainer.tsx index e3dcf1c10..50140ed60 100644 --- a/src/core/client/admin/routes/ForgotPassword/ForgotPasswordContainer.tsx +++ b/src/core/client/admin/routes/ForgotPassword/ForgotPasswordContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import { Link } from "found"; import React, { FunctionComponent, useState } from "react"; diff --git a/src/core/client/admin/routes/ForgotPassword/ForgotPasswordForm.tsx b/src/core/client/admin/routes/ForgotPassword/ForgotPasswordForm.tsx index ad1b18f35..efaf7616c 100644 --- a/src/core/client/admin/routes/ForgotPassword/ForgotPasswordForm.tsx +++ b/src/core/client/admin/routes/ForgotPassword/ForgotPasswordForm.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { FORM_ERROR } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { Field, Form } from "react-final-form"; diff --git a/src/core/client/admin/routes/Invite/InviteCompleteForm.tsx b/src/core/client/admin/routes/Invite/InviteCompleteForm.tsx index d3730cbe3..83b947881 100644 --- a/src/core/client/admin/routes/Invite/InviteCompleteForm.tsx +++ b/src/core/client/admin/routes/Invite/InviteCompleteForm.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { FORM_ERROR } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { useCallback, useMemo } from "react"; import { Form } from "react-final-form"; diff --git a/src/core/client/admin/routes/Invite/SetPasswordField.tsx b/src/core/client/admin/routes/Invite/SetPasswordField.tsx index f0f67b94c..525222e32 100644 --- a/src/core/client/admin/routes/Invite/SetPasswordField.tsx +++ b/src/core/client/admin/routes/Invite/SetPasswordField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/admin/routes/Invite/SetUsernameField.tsx b/src/core/client/admin/routes/Invite/SetUsernameField.tsx index fa3ec3af3..c7347d67b 100644 --- a/src/core/client/admin/routes/Invite/SetUsernameField.tsx +++ b/src/core/client/admin/routes/Invite/SetUsernameField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/admin/routes/Invite/Sorry.tsx b/src/core/client/admin/routes/Invite/Sorry.tsx index 7f90287e7..ba0a7c692 100644 --- a/src/core/client/admin/routes/Invite/Sorry.tsx +++ b/src/core/client/admin/routes/Invite/Sorry.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React from "react"; import { CallOut, HorizontalGutter, Typography } from "coral-ui/components"; diff --git a/src/core/client/admin/routes/Invite/Success.tsx b/src/core/client/admin/routes/Invite/Success.tsx index a27a98ee7..9e7e07118 100644 --- a/src/core/client/admin/routes/Invite/Success.tsx +++ b/src/core/client/admin/routes/Invite/Success.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import { Link } from "found"; import React, { useMemo } from "react"; diff --git a/src/core/client/admin/routes/Login/EmailField.tsx b/src/core/client/admin/routes/Login/EmailField.tsx index 63c4b275a..82a342763 100644 --- a/src/core/client/admin/routes/Login/EmailField.tsx +++ b/src/core/client/admin/routes/Login/EmailField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/admin/routes/Login/views/AddEmailAddress/AddEmailAddress.tsx b/src/core/client/admin/routes/Login/views/AddEmailAddress/AddEmailAddress.tsx index aead0a114..5daa97985 100644 --- a/src/core/client/admin/routes/Login/views/AddEmailAddress/AddEmailAddress.tsx +++ b/src/core/client/admin/routes/Login/views/AddEmailAddress/AddEmailAddress.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Form } from "react-final-form"; diff --git a/src/core/client/admin/routes/Login/views/AddEmailAddress/ConfirmEmailField.tsx b/src/core/client/admin/routes/Login/views/AddEmailAddress/ConfirmEmailField.tsx index 4a569a45d..17aec5856 100644 --- a/src/core/client/admin/routes/Login/views/AddEmailAddress/ConfirmEmailField.tsx +++ b/src/core/client/admin/routes/Login/views/AddEmailAddress/ConfirmEmailField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/admin/routes/Login/views/AddEmailAddress/EmailField.tsx b/src/core/client/admin/routes/Login/views/AddEmailAddress/EmailField.tsx index 239e105ce..c29d65b80 100644 --- a/src/core/client/admin/routes/Login/views/AddEmailAddress/EmailField.tsx +++ b/src/core/client/admin/routes/Login/views/AddEmailAddress/EmailField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/admin/routes/Login/views/CreatePassword/CreatePassword.tsx b/src/core/client/admin/routes/Login/views/CreatePassword/CreatePassword.tsx index f287ee419..408404065 100644 --- a/src/core/client/admin/routes/Login/views/CreatePassword/CreatePassword.tsx +++ b/src/core/client/admin/routes/Login/views/CreatePassword/CreatePassword.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Form } from "react-final-form"; diff --git a/src/core/client/admin/routes/Login/views/CreatePassword/SetPasswordField.tsx b/src/core/client/admin/routes/Login/views/CreatePassword/SetPasswordField.tsx index 04f4ee1c3..b26cbaa4a 100644 --- a/src/core/client/admin/routes/Login/views/CreatePassword/SetPasswordField.tsx +++ b/src/core/client/admin/routes/Login/views/CreatePassword/SetPasswordField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/admin/routes/Login/views/CreateUsername/CreateUsername.tsx b/src/core/client/admin/routes/Login/views/CreateUsername/CreateUsername.tsx index 041d68631..eadb3dafb 100644 --- a/src/core/client/admin/routes/Login/views/CreateUsername/CreateUsername.tsx +++ b/src/core/client/admin/routes/Login/views/CreateUsername/CreateUsername.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Form } from "react-final-form"; diff --git a/src/core/client/admin/routes/Login/views/CreateUsername/UsernameField.tsx b/src/core/client/admin/routes/Login/views/CreateUsername/UsernameField.tsx index 2d93f1cf9..d0b4ea94d 100644 --- a/src/core/client/admin/routes/Login/views/CreateUsername/UsernameField.tsx +++ b/src/core/client/admin/routes/Login/views/CreateUsername/UsernameField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/admin/routes/Login/views/SignIn/OrSeparator.tsx b/src/core/client/admin/routes/Login/views/SignIn/OrSeparator.tsx index b8fa98ed4..f27cb6565 100644 --- a/src/core/client/admin/routes/Login/views/SignIn/OrSeparator.tsx +++ b/src/core/client/admin/routes/Login/views/SignIn/OrSeparator.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import HorizontalSeparator from "./HorizontalSeparator"; diff --git a/src/core/client/admin/routes/Login/views/SignIn/SignIn.tsx b/src/core/client/admin/routes/Login/views/SignIn/SignIn.tsx index 49fee816d..7a57c6e80 100644 --- a/src/core/client/admin/routes/Login/views/SignIn/SignIn.tsx +++ b/src/core/client/admin/routes/Login/views/SignIn/SignIn.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import AuthBox from "coral-admin/components/AuthBox"; diff --git a/src/core/client/admin/routes/Login/views/SignIn/SignInWithEmail.tsx b/src/core/client/admin/routes/Login/views/SignIn/SignInWithEmail.tsx index 6eb222e08..947cade97 100644 --- a/src/core/client/admin/routes/Login/views/SignIn/SignInWithEmail.tsx +++ b/src/core/client/admin/routes/Login/views/SignIn/SignInWithEmail.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import { Link } from "found"; import React, { FunctionComponent } from "react"; import { Field, Form } from "react-final-form"; diff --git a/src/core/client/admin/routes/Login/views/SignIn/SignInWithFacebookContainer.tsx b/src/core/client/admin/routes/Login/views/SignIn/SignInWithFacebookContainer.tsx index 17de7d71b..aca2253c8 100644 --- a/src/core/client/admin/routes/Login/views/SignIn/SignInWithFacebookContainer.tsx +++ b/src/core/client/admin/routes/Login/views/SignIn/SignInWithFacebookContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { Component } from "react"; import FacebookButton from "coral-framework/components/FacebookButton"; diff --git a/src/core/client/admin/routes/Login/views/SignIn/SignInWithGoogleContainer.tsx b/src/core/client/admin/routes/Login/views/SignIn/SignInWithGoogleContainer.tsx index ae8b7d887..e6747961a 100644 --- a/src/core/client/admin/routes/Login/views/SignIn/SignInWithGoogleContainer.tsx +++ b/src/core/client/admin/routes/Login/views/SignIn/SignInWithGoogleContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { Component } from "react"; import GoogleButton from "coral-framework/components/GoogleButton"; diff --git a/src/core/client/admin/routes/Login/views/SignIn/SignInWithOIDCContainer.tsx b/src/core/client/admin/routes/Login/views/SignIn/SignInWithOIDCContainer.tsx index 051f407ed..3ca44086f 100644 --- a/src/core/client/admin/routes/Login/views/SignIn/SignInWithOIDCContainer.tsx +++ b/src/core/client/admin/routes/Login/views/SignIn/SignInWithOIDCContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { Component } from "react"; import OIDCButton from "coral-framework/components/OIDCButton"; diff --git a/src/core/client/admin/routes/Moderate/HotkeysModal.tsx b/src/core/client/admin/routes/Moderate/HotkeysModal.tsx index 8ebeb9006..5397982da 100644 --- a/src/core/client/admin/routes/Moderate/HotkeysModal.tsx +++ b/src/core/client/admin/routes/Moderate/HotkeysModal.tsx @@ -1,3 +1,6 @@ +import { Localized } from "@fluent/react/compat"; +import React, { FunctionComponent } from "react"; + import { Card, CardCloseButton, @@ -5,8 +8,6 @@ import { HorizontalGutter, Modal, } from "coral-ui/components/v2"; -import { Localized } from "fluent-react/compat"; -import React, { FunctionComponent } from "react"; import styles from "./HotkeysModal.css"; diff --git a/src/core/client/admin/routes/Moderate/ModerateNavigation/Navigation.tsx b/src/core/client/admin/routes/Moderate/ModerateNavigation/Navigation.tsx index 375ad0958..84c9dd71e 100644 --- a/src/core/client/admin/routes/Moderate/ModerateNavigation/Navigation.tsx +++ b/src/core/client/admin/routes/Moderate/ModerateNavigation/Navigation.tsx @@ -1,9 +1,9 @@ -import { HOTKEYS } from "coral-admin/constants"; -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import { Match, Router, withRouter } from "found"; import key from "keymaster"; import React, { FunctionComponent, useEffect, useMemo } from "react"; +import { HOTKEYS } from "coral-admin/constants"; import { getModerationLink } from "coral-admin/helpers"; import { Counter, Icon, SubBarNavigation } from "coral-ui/components/v2"; diff --git a/src/core/client/admin/routes/Moderate/ModerateSearchBar/Bar.tsx b/src/core/client/admin/routes/Moderate/ModerateSearchBar/Bar.tsx index b40b318fa..2cd55f16c 100644 --- a/src/core/client/admin/routes/Moderate/ModerateSearchBar/Bar.tsx +++ b/src/core/client/admin/routes/Moderate/ModerateSearchBar/Bar.tsx @@ -1,5 +1,4 @@ -import { HOTKEYS } from "coral-admin/constants"; -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import key from "keymaster"; import React, { FunctionComponent, @@ -9,6 +8,7 @@ import React, { } from "react"; import { Form } from "react-final-form"; +import { HOTKEYS } from "coral-admin/constants"; import { Backdrop, Icon, Popover, SubBar } from "coral-ui/components/v2"; import { combineEventHandlers } from "coral-ui/helpers"; import { diff --git a/src/core/client/admin/routes/Moderate/ModerateSearchBar/Field.tsx b/src/core/client/admin/routes/Moderate/ModerateSearchBar/Field.tsx index 1d8c6064b..802d71c63 100644 --- a/src/core/client/admin/routes/Moderate/ModerateSearchBar/Field.tsx +++ b/src/core/client/admin/routes/Moderate/ModerateSearchBar/Field.tsx @@ -1,10 +1,10 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { withForwardRef } from "coral-ui/hocs"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, HTMLAttributes, Ref } from "react"; import { Field as FormField } from "react-final-form"; import { BaseButton, Flex, Icon } from "coral-ui/components/v2"; +import { withForwardRef } from "coral-ui/hocs"; import styles from "./Field.css"; diff --git a/src/core/client/admin/routes/Moderate/ModerateSearchBar/GoToAriaInfo.tsx b/src/core/client/admin/routes/Moderate/ModerateSearchBar/GoToAriaInfo.tsx index 542e86dbd..b1be0e46b 100644 --- a/src/core/client/admin/routes/Moderate/ModerateSearchBar/GoToAriaInfo.tsx +++ b/src/core/client/admin/routes/Moderate/ModerateSearchBar/GoToAriaInfo.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { AriaInfo } from "coral-ui/components/v2"; diff --git a/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateAllOption.tsx b/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateAllOption.tsx index 978e3fcb2..af530572b 100644 --- a/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateAllOption.tsx +++ b/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateAllOption.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, HTMLAttributes } from "react"; import { Button, Icon } from "coral-ui/components/v2"; diff --git a/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateSearchBarContainer.tsx b/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateSearchBarContainer.tsx index d9b7be652..843569038 100644 --- a/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateSearchBarContainer.tsx +++ b/src/core/client/admin/routes/Moderate/ModerateSearchBar/ModerateSearchBarContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import { Match, Router, withRouter } from "found"; import React, { KeyboardEvent, diff --git a/src/core/client/admin/routes/Moderate/ModerateSearchBar/SeeAllOption.tsx b/src/core/client/admin/routes/Moderate/ModerateSearchBar/SeeAllOption.tsx index eeedfa954..e8926e1c1 100644 --- a/src/core/client/admin/routes/Moderate/ModerateSearchBar/SeeAllOption.tsx +++ b/src/core/client/admin/routes/Moderate/ModerateSearchBar/SeeAllOption.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, HTMLAttributes } from "react"; import { Icon } from "coral-ui/components/v2"; diff --git a/src/core/client/admin/routes/Moderate/Queue/Queue.tsx b/src/core/client/admin/routes/Moderate/Queue/Queue.tsx index 86932a8de..34f2c278f 100644 --- a/src/core/client/admin/routes/Moderate/Queue/Queue.tsx +++ b/src/core/client/admin/routes/Moderate/Queue/Queue.tsx @@ -1,13 +1,14 @@ -import { HOTKEYS } from "coral-admin/constants"; -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback, useState } from "react"; import AutoLoadMore from "coral-admin/components/AutoLoadMore"; import ModerateCardContainer from "coral-admin/components/ModerateCard"; import UserHistoryDrawer from "coral-admin/components/UserHistoryDrawer"; +import { HOTKEYS } from "coral-admin/constants"; import { Button, Flex, HorizontalGutter } from "coral-ui/components/v2"; import { useHotkey } from "coral-ui/hooks"; import { PropTypesOf } from "coral-ui/types"; + import QueueWrapper from "./QueueWrapper"; import styles from "./Queue.css"; diff --git a/src/core/client/admin/routes/Moderate/Queue/QueueRoute.tsx b/src/core/client/admin/routes/Moderate/Queue/QueueRoute.tsx index 56092eb34..b71ee260b 100644 --- a/src/core/client/admin/routes/Moderate/Queue/QueueRoute.tsx +++ b/src/core/client/admin/routes/Moderate/Queue/QueueRoute.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback, useEffect } from "react"; import { graphql, GraphQLTaggedNode, RelayPaginationProp } from "react-relay"; diff --git a/src/core/client/admin/routes/Moderate/Queue/RejectedQueueRoute.tsx b/src/core/client/admin/routes/Moderate/Queue/RejectedQueueRoute.tsx index 530d51027..1651e3ac3 100644 --- a/src/core/client/admin/routes/Moderate/Queue/RejectedQueueRoute.tsx +++ b/src/core/client/admin/routes/Moderate/Queue/RejectedQueueRoute.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import { RouteProps } from "found"; import React from "react"; import { graphql, RelayPaginationProp } from "react-relay"; diff --git a/src/core/client/admin/routes/Moderate/SingleModerate/SingleModerate.tsx b/src/core/client/admin/routes/Moderate/SingleModerate/SingleModerate.tsx index 1b3e75615..ff0451fce 100644 --- a/src/core/client/admin/routes/Moderate/SingleModerate/SingleModerate.tsx +++ b/src/core/client/admin/routes/Moderate/SingleModerate/SingleModerate.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import { Link } from "found"; import React, { FunctionComponent } from "react"; diff --git a/src/core/client/admin/routes/Stories/EmptyMessage.tsx b/src/core/client/admin/routes/Stories/EmptyMessage.tsx index c31fd9795..182b7ec0b 100644 --- a/src/core/client/admin/routes/Stories/EmptyMessage.tsx +++ b/src/core/client/admin/routes/Stories/EmptyMessage.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import styles from "./EmptyMessage.css"; diff --git a/src/core/client/admin/routes/Stories/NoMatchMessage.tsx b/src/core/client/admin/routes/Stories/NoMatchMessage.tsx index 3a09939ab..a27dd0495 100644 --- a/src/core/client/admin/routes/Stories/NoMatchMessage.tsx +++ b/src/core/client/admin/routes/Stories/NoMatchMessage.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import styles from "./NoMatchMessage.css"; diff --git a/src/core/client/admin/routes/Stories/StoryStatus/StoryStatusChange.tsx b/src/core/client/admin/routes/Stories/StoryStatus/StoryStatusChange.tsx index 535ddf2e6..310152873 100644 --- a/src/core/client/admin/routes/Stories/StoryStatus/StoryStatusChange.tsx +++ b/src/core/client/admin/routes/Stories/StoryStatus/StoryStatusChange.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import TranslatedStoryStatus from "coral-admin/components/TranslatedStoryStatus"; diff --git a/src/core/client/admin/routes/Stories/StoryTable.tsx b/src/core/client/admin/routes/Stories/StoryTable.tsx index 4cb6fb7f0..bc5ed2b1d 100644 --- a/src/core/client/admin/routes/Stories/StoryTable.tsx +++ b/src/core/client/admin/routes/Stories/StoryTable.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import AutoLoadMore from "coral-admin/components/AutoLoadMore"; diff --git a/src/core/client/admin/routes/Stories/StoryTableFilter.tsx b/src/core/client/admin/routes/Stories/StoryTableFilter.tsx index f6e9f1470..c20e3b71b 100644 --- a/src/core/client/admin/routes/Stories/StoryTableFilter.tsx +++ b/src/core/client/admin/routes/Stories/StoryTableFilter.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field, Form } from "react-final-form"; diff --git a/src/core/client/admin/test/configure/__snapshots__/auth.spec.tsx.snap b/src/core/client/admin/test/configure/__snapshots__/auth.spec.tsx.snap index 4971e38f4..a454832c6 100644 --- a/src/core/client/admin/test/configure/__snapshots__/auth.spec.tsx.snap +++ b/src/core/client/admin/test/configure/__snapshots__/auth.spec.tsx.snap @@ -1276,12 +1276,6 @@ integration to register for a new account.
-

- KEY GENERATED AT: -Invalid Date -

diff --git a/src/core/client/auth/components/ConfirmEmailField.tsx b/src/core/client/auth/components/ConfirmEmailField.tsx index f37df953a..d122013ee 100644 --- a/src/core/client/auth/components/ConfirmEmailField.tsx +++ b/src/core/client/auth/components/ConfirmEmailField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/auth/components/EmailField.tsx b/src/core/client/auth/components/EmailField.tsx index f766451e2..c9ee94028 100644 --- a/src/core/client/auth/components/EmailField.tsx +++ b/src/core/client/auth/components/EmailField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/auth/components/OrSeparator.tsx b/src/core/client/auth/components/OrSeparator.tsx index 6b8de0045..60b006d6f 100644 --- a/src/core/client/auth/components/OrSeparator.tsx +++ b/src/core/client/auth/components/OrSeparator.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import HorizontalSeparator from "./HorizontalSeparator"; diff --git a/src/core/client/auth/components/SetPasswordField.tsx b/src/core/client/auth/components/SetPasswordField.tsx index 83c5427a2..a609e2819 100644 --- a/src/core/client/auth/components/SetPasswordField.tsx +++ b/src/core/client/auth/components/SetPasswordField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/auth/components/UsernameField.tsx b/src/core/client/auth/components/UsernameField.tsx index ac04bb2b7..e6f533558 100644 --- a/src/core/client/auth/components/UsernameField.tsx +++ b/src/core/client/auth/components/UsernameField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; diff --git a/src/core/client/auth/views/AddEmailAddress/AddEmailAddress.tsx b/src/core/client/auth/views/AddEmailAddress/AddEmailAddress.tsx index b02482983..272c1734a 100644 --- a/src/core/client/auth/views/AddEmailAddress/AddEmailAddress.tsx +++ b/src/core/client/auth/views/AddEmailAddress/AddEmailAddress.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { FORM_ERROR } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { Form } from "react-final-form"; diff --git a/src/core/client/auth/views/CreatePassword/CreatePassword.tsx b/src/core/client/auth/views/CreatePassword/CreatePassword.tsx index 92be844a0..58c7780b5 100644 --- a/src/core/client/auth/views/CreatePassword/CreatePassword.tsx +++ b/src/core/client/auth/views/CreatePassword/CreatePassword.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { FORM_ERROR } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { Form } from "react-final-form"; diff --git a/src/core/client/auth/views/CreateUsername/CreateUsername.tsx b/src/core/client/auth/views/CreateUsername/CreateUsername.tsx index e3404adbe..8a0e77e37 100644 --- a/src/core/client/auth/views/CreateUsername/CreateUsername.tsx +++ b/src/core/client/auth/views/CreateUsername/CreateUsername.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { FORM_ERROR } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { Form } from "react-final-form"; diff --git a/src/core/client/auth/views/ForgotPassword/CheckEmail.tsx b/src/core/client/auth/views/ForgotPassword/CheckEmail.tsx index 640f7f6a5..03d94e124 100644 --- a/src/core/client/auth/views/ForgotPassword/CheckEmail.tsx +++ b/src/core/client/auth/views/ForgotPassword/CheckEmail.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { Bar, Title } from "coral-auth/components/Header"; diff --git a/src/core/client/auth/views/ForgotPassword/ForgotPasswordForm.tsx b/src/core/client/auth/views/ForgotPassword/ForgotPasswordForm.tsx index 8e41896df..0531eb5a9 100644 --- a/src/core/client/auth/views/ForgotPassword/ForgotPasswordForm.tsx +++ b/src/core/client/auth/views/ForgotPassword/ForgotPasswordForm.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { FORM_ERROR } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { Field, Form } from "react-final-form"; diff --git a/src/core/client/auth/views/SignIn/SignIn.tsx b/src/core/client/auth/views/SignIn/SignIn.tsx index 8a9902cd4..65a607e07 100644 --- a/src/core/client/auth/views/SignIn/SignIn.tsx +++ b/src/core/client/auth/views/SignIn/SignIn.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Bar, SubBar, Subtitle, Title } from "coral-auth/components/Header"; diff --git a/src/core/client/auth/views/SignIn/SignInWithEmail.tsx b/src/core/client/auth/views/SignIn/SignInWithEmail.tsx index 653433abc..b259e85d4 100644 --- a/src/core/client/auth/views/SignIn/SignInWithEmail.tsx +++ b/src/core/client/auth/views/SignIn/SignInWithEmail.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field, Form } from "react-final-form"; diff --git a/src/core/client/auth/views/SignIn/SignInWithFacebookContainer.tsx b/src/core/client/auth/views/SignIn/SignInWithFacebookContainer.tsx index 4f9931462..7657ba907 100644 --- a/src/core/client/auth/views/SignIn/SignInWithFacebookContainer.tsx +++ b/src/core/client/auth/views/SignIn/SignInWithFacebookContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { Component } from "react"; import FacebookButton from "coral-framework/components/FacebookButton"; diff --git a/src/core/client/auth/views/SignIn/SignInWithGoogleContainer.tsx b/src/core/client/auth/views/SignIn/SignInWithGoogleContainer.tsx index 2d5979d1d..c20b38a7f 100644 --- a/src/core/client/auth/views/SignIn/SignInWithGoogleContainer.tsx +++ b/src/core/client/auth/views/SignIn/SignInWithGoogleContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { Component } from "react"; import GoogleButton from "coral-framework/components/GoogleButton"; diff --git a/src/core/client/auth/views/SignIn/SignInWithOIDCContainer.tsx b/src/core/client/auth/views/SignIn/SignInWithOIDCContainer.tsx index 0fcc2b835..b8685ce5c 100644 --- a/src/core/client/auth/views/SignIn/SignInWithOIDCContainer.tsx +++ b/src/core/client/auth/views/SignIn/SignInWithOIDCContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { Component } from "react"; import OIDCButton from "coral-framework/components/OIDCButton"; diff --git a/src/core/client/auth/views/SignUp/SignUp.tsx b/src/core/client/auth/views/SignUp/SignUp.tsx index fb983f6a4..c065bb86c 100644 --- a/src/core/client/auth/views/SignUp/SignUp.tsx +++ b/src/core/client/auth/views/SignUp/SignUp.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Bar, SubBar, Subtitle, Title } from "coral-auth/components//Header"; diff --git a/src/core/client/auth/views/SignUp/SignUpWithEmail.tsx b/src/core/client/auth/views/SignUp/SignUpWithEmail.tsx index 69fd68b11..aa439d613 100644 --- a/src/core/client/auth/views/SignUp/SignUpWithEmail.tsx +++ b/src/core/client/auth/views/SignUp/SignUpWithEmail.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Form } from "react-final-form"; diff --git a/src/core/client/auth/views/SignUp/SignUpWithFacebookContainer.tsx b/src/core/client/auth/views/SignUp/SignUpWithFacebookContainer.tsx index 271240c97..255dfff27 100644 --- a/src/core/client/auth/views/SignUp/SignUpWithFacebookContainer.tsx +++ b/src/core/client/auth/views/SignUp/SignUpWithFacebookContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { Component } from "react"; import FacebookButton from "coral-framework/components/FacebookButton"; diff --git a/src/core/client/auth/views/SignUp/SignUpWithGoogleContainer.tsx b/src/core/client/auth/views/SignUp/SignUpWithGoogleContainer.tsx index 65ce3651b..dce8f9467 100644 --- a/src/core/client/auth/views/SignUp/SignUpWithGoogleContainer.tsx +++ b/src/core/client/auth/views/SignUp/SignUpWithGoogleContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { Component } from "react"; import GoogleButton from "coral-framework/components/GoogleButton"; diff --git a/src/core/client/auth/views/SignUp/SignUpWithOIDCContainer.tsx b/src/core/client/auth/views/SignUp/SignUpWithOIDCContainer.tsx index addf09254..1e815a47c 100644 --- a/src/core/client/auth/views/SignUp/SignUpWithOIDCContainer.tsx +++ b/src/core/client/auth/views/SignUp/SignUpWithOIDCContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { Component } from "react"; import OIDCButton from "coral-framework/components/OIDCButton"; diff --git a/src/core/client/framework/components/CopyButton.tsx b/src/core/client/framework/components/CopyButton.tsx index 0674d2631..ddf835a5b 100644 --- a/src/core/client/framework/components/CopyButton.tsx +++ b/src/core/client/framework/components/CopyButton.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React from "react"; import CopyToClipboard from "react-copy-to-clipboard"; diff --git a/src/core/client/framework/components/DurationField.tsx b/src/core/client/framework/components/DurationField.tsx index d13248802..915b8274a 100644 --- a/src/core/client/framework/components/DurationField.tsx +++ b/src/core/client/framework/components/DurationField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { ChangeEvent, FunctionComponent, diff --git a/src/core/client/framework/components/PasswordField.tsx b/src/core/client/framework/components/PasswordField.tsx index 57e0f02dc..a68f6a0a1 100644 --- a/src/core/client/framework/components/PasswordField.tsx +++ b/src/core/client/framework/components/PasswordField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Omit, PropTypesOf } from "coral-framework/types"; diff --git a/src/core/client/framework/lib/bootstrap/CoralContext.tsx b/src/core/client/framework/lib/bootstrap/CoralContext.tsx index 83631e233..e4595e9e1 100644 --- a/src/core/client/framework/lib/bootstrap/CoralContext.tsx +++ b/src/core/client/framework/lib/bootstrap/CoralContext.tsx @@ -1,6 +1,6 @@ +import { FluentBundle } from "@fluent/bundle/compat"; +import { LocalizationProvider } from "@fluent/react/compat"; import { EventEmitter2 } from "eventemitter2"; -import { LocalizationProvider } from "fluent-react/compat"; -import { FluentBundle } from "fluent/compat"; import { Child as PymChild } from "pym.js"; import React, { FunctionComponent } from "react"; import { MediaQueryMatchers } from "react-responsive"; diff --git a/src/core/client/framework/lib/bootstrap/createManaged.tsx b/src/core/client/framework/lib/bootstrap/createManaged.tsx index 913ca0640..37880b9b9 100644 --- a/src/core/client/framework/lib/bootstrap/createManaged.tsx +++ b/src/core/client/framework/lib/bootstrap/createManaged.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { EventEmitter2 } from "eventemitter2"; -import { Localized } from "fluent-react/compat"; import { noop } from "lodash"; import { Child as PymChild } from "pym.js"; import React, { Component, ComponentType } from "react"; diff --git a/src/core/client/framework/lib/i18n/format.ts b/src/core/client/framework/lib/i18n/format.ts index 47c79e011..a380f27a1 100644 --- a/src/core/client/framework/lib/i18n/format.ts +++ b/src/core/client/framework/lib/i18n/format.ts @@ -1,4 +1,4 @@ -import { FluentBundle } from "fluent/compat"; +import { FluentBundle } from "@fluent/bundle/compat"; export default function format( bundles: FluentBundle[], @@ -7,8 +7,21 @@ export default function format( ): string { const res = bundles.reduce((val, bundle) => { const message = bundle.getMessage(key); - const got = bundle.format(message, args); - return val || got; + if (!message || !message.value) { + return val; + } + + const errors: Error[] = []; + const formatted = bundle.formatPattern(message.value, args, errors); + if (process.env.NODE_ENV !== "production" && errors.length > 0) { + window.console.warn( + `Translation ${key} encountered an error: ${errors + .map(err => err.message) + .join(", ")}` + ); + } + + return formatted; }, ""); if (res && Array.isArray(res)) { return res.join(""); diff --git a/src/core/client/framework/lib/i18n/functions/SHORT_NUMBER.ts b/src/core/client/framework/lib/i18n/functions/SHORT_NUMBER.ts index 72deefde2..268478086 100644 --- a/src/core/client/framework/lib/i18n/functions/SHORT_NUMBER.ts +++ b/src/core/client/framework/lib/i18n/functions/SHORT_NUMBER.ts @@ -1,4 +1,4 @@ -import { FluentNumber, FluentType } from "fluent/compat"; +import { FluentNumber, FluentType } from "@fluent/bundle/compat"; import { FluentShortNumber } from "../types"; diff --git a/src/core/client/framework/lib/i18n/generateBundles.ts b/src/core/client/framework/lib/i18n/generateBundles.ts index 3582d2aed..5f13fd9dd 100644 --- a/src/core/client/framework/lib/i18n/generateBundles.ts +++ b/src/core/client/framework/lib/i18n/generateBundles.ts @@ -1,4 +1,4 @@ -import { FluentBundle } from "fluent/compat"; +import { FluentBundle, FluentResource } from "@fluent/bundle/compat"; import * as functions from "./functions"; import { LocalesData } from "./locales"; @@ -48,11 +48,11 @@ export default async function generateBundles( // We should be able to use `` tags instead to support rtl languages. const bundle = new FluentBundle(locale, { functions, useIsolating: false }); if (locale in data.bundled) { - bundle.addMessages(data.bundled[locale]); + bundle.addResource(new FluentResource(data.bundled[locale])); promises.push(decorateWarnMissing(bundle)); } else if (locale in data.loadables) { const content = await data.loadables[locale](); - bundle.addMessages(content); + bundle.addResource(new FluentResource(content)); promises.push(decorateWarnMissing(bundle)); } else { throw Error(`Locale ${locale} not available`); diff --git a/src/core/client/framework/lib/i18n/getMessage.ts b/src/core/client/framework/lib/i18n/getMessage.ts index 9a48a5b41..009f69dac 100644 --- a/src/core/client/framework/lib/i18n/getMessage.ts +++ b/src/core/client/framework/lib/i18n/getMessage.ts @@ -1,4 +1,4 @@ -import { FluentBundle } from "fluent/compat"; +import { FluentBundle } from "@fluent/bundle/compat"; export default function getMessage( bundles: FluentBundle[], @@ -8,14 +8,30 @@ export default function getMessage( ): string { const res = bundles.reduce((val, bundle) => { const message = bundle.getMessage(key); - if (!message && process.env.NODE_ENV !== "production") { - // eslint-disable-next-line no-console - console.warn(`Translation ${key} was not found for ${bundle.locales}`); + + // Warn in development about missing translations. + if (process.env.NODE_ENV !== "production" && !message) { + window.console.warn( + `Translation ${key} was not found for ${bundle.locales}` + ); } - if (!args) { - return val || message; + + // If the message, message value, or args are not available, just continue. + if (!message || !message.value || !args) { + return val; } - return val || (message && bundle.format(message, args)); + + const errors: Error[] = []; + const formatted = bundle.formatPattern(message.value, args, errors); + if (process.env.NODE_ENV !== "production" && errors.length > 0) { + window.console.warn( + `Translation ${key} encountered an error: ${errors + .map(err => err.message) + .join(", ")}` + ); + } + + return formatted; }, ""); if (res && Array.isArray(res)) { return res.join(""); diff --git a/src/core/client/framework/lib/i18n/types/FluentShortNumber.spec.ts b/src/core/client/framework/lib/i18n/types/FluentShortNumber.spec.ts index 1b8a0648c..048661118 100644 --- a/src/core/client/framework/lib/i18n/types/FluentShortNumber.spec.ts +++ b/src/core/client/framework/lib/i18n/types/FluentShortNumber.spec.ts @@ -1,6 +1,6 @@ import { toPairs } from "lodash"; -import { getShortNumberCode, validateFormat } from "./FluentShortNumber"; +import { getShortNumberCode, validatePattern } from "./FluentShortNumber"; describe("getShortNumberCode", () => { it("returns correct value", () => { @@ -28,7 +28,7 @@ describe("validateFormat", () => { "000M": true, }; toPairs(cases).forEach(([i, o]) => { - expect(validateFormat(i)).toBe(o); + expect(validatePattern(i)).toBe(o); }); }); }); diff --git a/src/core/client/framework/lib/i18n/types/FluentShortNumber.ts b/src/core/client/framework/lib/i18n/types/FluentShortNumber.ts index 3452fc651..ef664f431 100644 --- a/src/core/client/framework/lib/i18n/types/FluentShortNumber.ts +++ b/src/core/client/framework/lib/i18n/types/FluentShortNumber.ts @@ -1,8 +1,13 @@ -import { FluentBundle, FluentNumber, FluentType } from "fluent/compat"; +import { + FluentBundle, + FluentNumber, + FluentType, + Pattern, +} from "@fluent/bundle/compat"; const formatRegExp = /^(0+|0+\.0+)[^\d.]+$/; -export function validateFormat(fmt: string) { +export function validatePattern(fmt: Pattern) { return formatRegExp.test(fmt); } @@ -15,7 +20,7 @@ export function getShortNumberCode(n: number) { return code; } -function formatShortNumber(n: number, format: string, bundle: FluentBundle) { +function formatShortNumber(n: number, format: Pattern, bundle: FluentBundle) { const lastIndexOf0 = format.lastIndexOf("0"); const unit = format.substr(lastIndexOf0 + 1); const rest = format.substr(0, lastIndexOf0 + 1); @@ -57,8 +62,8 @@ export default class FluentShortNumber extends FluentNumber { } // Check for invalid message. - if (!validateFormat(fmt)) { - const message = `Invalid Short Number Format ${fmt}`; + if (!fmt.value || !validatePattern(fmt.value)) { + const message = `Invalid Short Number Format ${fmt.value}`; if (process.env.NODE_ENV === "production") { // eslint-disable-next-line no-console console.warn(message); @@ -68,7 +73,7 @@ export default class FluentShortNumber extends FluentNumber { return super.toString(bundle); } - return formatShortNumber(this.value, fmt, bundle); + return formatShortNumber(this.value, fmt.value, bundle); } public match(bundle: FluentBundle, other: FluentType) { diff --git a/src/core/client/framework/lib/messages.tsx b/src/core/client/framework/lib/messages.tsx index d2ef6a29e..138b94341 100644 --- a/src/core/client/framework/lib/messages.tsx +++ b/src/core/client/framework/lib/messages.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React from "react"; /** diff --git a/src/core/client/framework/testHelpers/createFluentBundle.ts b/src/core/client/framework/testHelpers/createFluentBundle.ts index 2f5205fb7..5df1f0089 100644 --- a/src/core/client/framework/testHelpers/createFluentBundle.ts +++ b/src/core/client/framework/testHelpers/createFluentBundle.ts @@ -1,4 +1,4 @@ -import { FluentBundle } from "fluent/compat"; +import { FluentBundle, FluentResource } from "@fluent/bundle/compat"; import fs from "fs"; import path from "path"; @@ -48,7 +48,9 @@ function createFluentBundle( prefixes.forEach(prefix => { if (f.startsWith(prefix)) { // eslint-disable-next-line @typescript-eslint/no-var-requires - bundle.addMessages(require(path.resolve(pathToLocale, f))); + bundle.addResource( + new FluentResource(require(path.resolve(pathToLocale, f))) + ); } }); }); diff --git a/src/core/client/install/App/Header.tsx b/src/core/client/install/App/Header.tsx index bbd418ace..b8ad68ed5 100644 --- a/src/core/client/install/App/Header.tsx +++ b/src/core/client/install/App/Header.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Flex, Typography } from "coral-ui/components"; diff --git a/src/core/client/install/App/Wizard.tsx b/src/core/client/install/App/Wizard.tsx index 5ec7a3d00..63d5a23d2 100644 --- a/src/core/client/install/App/Wizard.tsx +++ b/src/core/client/install/App/Wizard.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { Component, ReactNode } from "react"; import { Step, StepBar } from "coral-ui/components"; diff --git a/src/core/client/install/App/steps/AddOrganizationStep.tsx b/src/core/client/install/App/steps/AddOrganizationStep.tsx index 9d1cbab12..54f06ea7b 100644 --- a/src/core/client/install/App/steps/AddOrganizationStep.tsx +++ b/src/core/client/install/App/steps/AddOrganizationStep.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React from "react"; import { Field, Form } from "react-final-form"; diff --git a/src/core/client/install/App/steps/BackButton.tsx b/src/core/client/install/App/steps/BackButton.tsx index b0de674a8..01e95e385 100644 --- a/src/core/client/install/App/steps/BackButton.tsx +++ b/src/core/client/install/App/steps/BackButton.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Button } from "coral-ui/components"; diff --git a/src/core/client/install/App/steps/CreateYourAccountStep.tsx b/src/core/client/install/App/steps/CreateYourAccountStep.tsx index 55e3d8891..f231d02c7 100644 --- a/src/core/client/install/App/steps/CreateYourAccountStep.tsx +++ b/src/core/client/install/App/steps/CreateYourAccountStep.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { Component } from "react"; import { Field, Form } from "react-final-form"; diff --git a/src/core/client/install/App/steps/FinalStep.tsx b/src/core/client/install/App/steps/FinalStep.tsx index a781d8f42..6353a8440 100644 --- a/src/core/client/install/App/steps/FinalStep.tsx +++ b/src/core/client/install/App/steps/FinalStep.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { Component } from "react"; import { urls } from "coral-framework/helpers"; diff --git a/src/core/client/install/App/steps/InitialStep.tsx b/src/core/client/install/App/steps/InitialStep.tsx index e2c4898e3..1b1ea25d4 100644 --- a/src/core/client/install/App/steps/InitialStep.tsx +++ b/src/core/client/install/App/steps/InitialStep.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { Component } from "react"; import { Button, Flex, Typography } from "coral-ui/components"; diff --git a/src/core/client/install/App/steps/NextButton.tsx b/src/core/client/install/App/steps/NextButton.tsx index 66939fd12..3bbf56e3f 100644 --- a/src/core/client/install/App/steps/NextButton.tsx +++ b/src/core/client/install/App/steps/NextButton.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Button, ButtonIcon } from "coral-ui/components"; diff --git a/src/core/client/install/App/steps/PermittedDomainsStep.tsx b/src/core/client/install/App/steps/PermittedDomainsStep.tsx index 7fffa0a6e..8e39d7da7 100644 --- a/src/core/client/install/App/steps/PermittedDomainsStep.tsx +++ b/src/core/client/install/App/steps/PermittedDomainsStep.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { FORM_ERROR } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { Component } from "react"; import { Field, Form } from "react-final-form"; diff --git a/src/core/client/install/App/steps/SelectLanguageStep.tsx b/src/core/client/install/App/steps/SelectLanguageStep.tsx index d2f86752a..f18bbe713 100644 --- a/src/core/client/install/App/steps/SelectLanguageStep.tsx +++ b/src/core/client/install/App/steps/SelectLanguageStep.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { Field, Form } from "react-final-form"; diff --git a/src/core/client/stream/App/TabBar.tsx b/src/core/client/stream/App/TabBar.tsx index 4f734a416..669476bf6 100644 --- a/src/core/client/stream/App/TabBar.tsx +++ b/src/core/client/stream/App/TabBar.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import CLASSES from "coral-stream/classes"; diff --git a/src/core/client/stream/common/UserBox/UserBoxAuthenticated.tsx b/src/core/client/stream/common/UserBox/UserBoxAuthenticated.tsx index 448682184..e8ad69c29 100644 --- a/src/core/client/stream/common/UserBox/UserBoxAuthenticated.tsx +++ b/src/core/client/stream/common/UserBox/UserBoxAuthenticated.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import CLASSES from "coral-stream/classes"; diff --git a/src/core/client/stream/common/UserBox/UserBoxUnauthenticated.tsx b/src/core/client/stream/common/UserBox/UserBoxUnauthenticated.tsx index 2093afdb1..4e40e34bb 100644 --- a/src/core/client/stream/common/UserBox/UserBoxUnauthenticated.tsx +++ b/src/core/client/stream/common/UserBox/UserBoxUnauthenticated.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import CLASSES from "coral-stream/classes"; diff --git a/src/core/client/stream/tabs/Comments/Comment/CommentContainer.tsx b/src/core/client/stream/tabs/Comments/Comment/CommentContainer.tsx index c6f00af02..03c35d136 100644 --- a/src/core/client/stream/tabs/Comments/Comment/CommentContainer.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/CommentContainer.tsx @@ -1,6 +1,6 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; import { EventEmitter2 } from "eventemitter2"; -import { Localized } from "fluent-react/compat"; import React, { Component, MouseEvent } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Comments/Comment/EditCommentForm/EditCommentForm.tsx b/src/core/client/stream/tabs/Comments/Comment/EditCommentForm/EditCommentForm.tsx index 1713d07ae..5d127933e 100644 --- a/src/core/client/stream/tabs/Comments/Comment/EditCommentForm/EditCommentForm.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/EditCommentForm/EditCommentForm.tsx @@ -1,6 +1,6 @@ import { CoralRTE } from "@coralproject/rte"; +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { EventHandler, FunctionComponent, MouseEvent, Ref } from "react"; import { Field, Form } from "react-final-form"; diff --git a/src/core/client/stream/tabs/Comments/Comment/EditedMarker.tsx b/src/core/client/stream/tabs/Comments/Comment/EditedMarker.tsx index 876640594..c5548dce4 100644 --- a/src/core/client/stream/tabs/Comments/Comment/EditedMarker.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/EditedMarker.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import styles from "./EditedMarker.css"; diff --git a/src/core/client/stream/tabs/Comments/Comment/InReplyTo.tsx b/src/core/client/stream/tabs/Comments/Comment/InReplyTo.tsx index 85cbb8253..46db6857b 100644 --- a/src/core/client/stream/tabs/Comments/Comment/InReplyTo.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/InReplyTo.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import CLASSES from "coral-stream/classes"; diff --git a/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/CaretContainer.tsx b/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/CaretContainer.tsx index 002a66815..6c180ea86 100644 --- a/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/CaretContainer.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/CaretContainer.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/ModerationActionBanContainer.tsx b/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/ModerationActionBanContainer.tsx index 76ac024cb..5654ff4ff 100644 --- a/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/ModerationActionBanContainer.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/ModerationActionBanContainer.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/ModerationActionsContainer.tsx b/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/ModerationActionsContainer.tsx index aac80f528..5f54ba112 100644 --- a/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/ModerationActionsContainer.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/ModerationActionsContainer.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/RejectedTombstoneContainer.tsx b/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/RejectedTombstoneContainer.tsx index b56d78848..d6caf5e61 100644 --- a/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/RejectedTombstoneContainer.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/ModerationDropdown/RejectedTombstoneContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useMemo } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Comments/Comment/PermalinkButton/PermalinkButton.tsx b/src/core/client/stream/tabs/Comments/Comment/PermalinkButton/PermalinkButton.tsx index 027b67247..bbc3e679c 100644 --- a/src/core/client/stream/tabs/Comments/Comment/PermalinkButton/PermalinkButton.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/PermalinkButton/PermalinkButton.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { diff --git a/src/core/client/stream/tabs/Comments/Comment/PermalinkButton/PermalinkPopover.tsx b/src/core/client/stream/tabs/Comments/Comment/PermalinkButton/PermalinkPopover.tsx index aaee7042c..c5b8efc43 100644 --- a/src/core/client/stream/tabs/Comments/Comment/PermalinkButton/PermalinkPopover.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/PermalinkButton/PermalinkPopover.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback, useEffect } from "react"; import { CopyButton } from "coral-framework/components"; diff --git a/src/core/client/stream/tabs/Comments/Comment/ReplyButton.tsx b/src/core/client/stream/tabs/Comments/Comment/ReplyButton.tsx index 0f27bb910..fb5be1533 100644 --- a/src/core/client/stream/tabs/Comments/Comment/ReplyButton.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/ReplyButton.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { EventHandler, FunctionComponent, MouseEvent } from "react"; import { Button, Icon, MatchMedia } from "coral-ui/components"; diff --git a/src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyCommentForm.tsx b/src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyCommentForm.tsx index 092cf8dd3..cd5728bca 100644 --- a/src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyCommentForm.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyCommentForm.tsx @@ -1,7 +1,7 @@ import { CoralRTE } from "@coralproject/rte"; +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; import { FormApi, FormState } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { EventHandler, FunctionComponent, diff --git a/src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyTo.tsx b/src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyTo.tsx index 8b8d655f0..ff1aca78a 100644 --- a/src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyTo.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/ReplyCommentForm/ReplyTo.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import CLASSES from "coral-stream/classes"; diff --git a/src/core/client/stream/tabs/Comments/Comment/ReplyEditSubmitStatus.tsx b/src/core/client/stream/tabs/Comments/Comment/ReplyEditSubmitStatus.tsx index 51ae09b90..17c3317a4 100644 --- a/src/core/client/stream/tabs/Comments/Comment/ReplyEditSubmitStatus.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/ReplyEditSubmitStatus.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React from "react"; import { Button, CallOut, Flex, HorizontalGutter } from "coral-ui/components"; diff --git a/src/core/client/stream/tabs/Comments/Comment/ReportButton/ReportButton.tsx b/src/core/client/stream/tabs/Comments/Comment/ReportButton/ReportButton.tsx index 68f5eea6e..f52adf38b 100644 --- a/src/core/client/stream/tabs/Comments/Comment/ReportButton/ReportButton.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/ReportButton/ReportButton.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { Ref } from "react"; import { PropTypesOf } from "coral-framework/types"; diff --git a/src/core/client/stream/tabs/Comments/Comment/ReportButton/ReportButtonWithPopover.tsx b/src/core/client/stream/tabs/Comments/Comment/ReportButton/ReportButtonWithPopover.tsx index bfb58e42f..77e884320 100644 --- a/src/core/client/stream/tabs/Comments/Comment/ReportButton/ReportButtonWithPopover.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/ReportButton/ReportButtonWithPopover.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React from "react"; import { ClickOutside, Popover } from "coral-ui/components"; diff --git a/src/core/client/stream/tabs/Comments/Comment/ReportPopover/ReportCommentForm.tsx b/src/core/client/stream/tabs/Comments/Comment/ReportPopover/ReportCommentForm.tsx index b4661a0c9..452ef28e3 100644 --- a/src/core/client/stream/tabs/Comments/Comment/ReportPopover/ReportCommentForm.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/ReportPopover/ReportCommentForm.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import { get } from "lodash"; import React, { FunctionComponent } from "react"; import { Field, FieldProps, Form } from "react-final-form"; diff --git a/src/core/client/stream/tabs/Comments/Comment/ReportPopover/ThankYou.tsx b/src/core/client/stream/tabs/Comments/Comment/ReportPopover/ThankYou.tsx index bca32a09a..95e91fd83 100644 --- a/src/core/client/stream/tabs/Comments/Comment/ReportPopover/ThankYou.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/ReportPopover/ThankYou.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Button, HorizontalGutter, Typography } from "coral-ui/components"; diff --git a/src/core/client/stream/tabs/Comments/Comment/ShowConversationLink.tsx b/src/core/client/stream/tabs/Comments/Comment/ShowConversationLink.tsx index c81cfe86a..bee75e93b 100644 --- a/src/core/client/stream/tabs/Comments/Comment/ShowConversationLink.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/ShowConversationLink.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { EventHandler, FunctionComponent, MouseEvent } from "react"; import { Button } from "coral-ui/components"; diff --git a/src/core/client/stream/tabs/Comments/Comment/UserBanPopover/UserBanPopoverContainer.tsx b/src/core/client/stream/tabs/Comments/Comment/UserBanPopover/UserBanPopoverContainer.tsx index d9e16ee56..e75da1249 100644 --- a/src/core/client/stream/tabs/Comments/Comment/UserBanPopover/UserBanPopoverContainer.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/UserBanPopover/UserBanPopoverContainer.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Comments/Comment/UserIgnorePopover/UserIgnorePopoverContainer.tsx b/src/core/client/stream/tabs/Comments/Comment/UserIgnorePopover/UserIgnorePopoverContainer.tsx index 6e3ef122a..2c3135068 100644 --- a/src/core/client/stream/tabs/Comments/Comment/UserIgnorePopover/UserIgnorePopoverContainer.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/UserIgnorePopover/UserIgnorePopoverContainer.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Comments/Comment/UserPopover/UserPopoverOverviewContainer.tsx b/src/core/client/stream/tabs/Comments/Comment/UserPopover/UserPopoverOverviewContainer.tsx index 30dd5073f..ead598226 100644 --- a/src/core/client/stream/tabs/Comments/Comment/UserPopover/UserPopoverOverviewContainer.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/UserPopover/UserPopoverOverviewContainer.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; @@ -48,7 +48,7 @@ export const UserPopoverOverviewContainer: FunctionComponent = ({
Member since: {user.createdAt} diff --git a/src/core/client/stream/tabs/Comments/Comment/Username/UsernameWithPopoverContainer.tsx b/src/core/client/stream/tabs/Comments/Comment/Username/UsernameWithPopoverContainer.tsx index dcf43509f..7abeb85a2 100644 --- a/src/core/client/stream/tabs/Comments/Comment/Username/UsernameWithPopoverContainer.tsx +++ b/src/core/client/stream/tabs/Comments/Comment/Username/UsernameWithPopoverContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Comments/IgnoredTombstoneOrHideContainer.tsx b/src/core/client/stream/tabs/Comments/IgnoredTombstoneOrHideContainer.tsx index 366d5bad8..e1d3970ce 100644 --- a/src/core/client/stream/tabs/Comments/IgnoredTombstoneOrHideContainer.tsx +++ b/src/core/client/stream/tabs/Comments/IgnoredTombstoneOrHideContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, ReactNode, diff --git a/src/core/client/stream/tabs/Comments/PermalinkView/ConversationThreadContainer.tsx b/src/core/client/stream/tabs/Comments/PermalinkView/ConversationThreadContainer.tsx index dffe311bf..f674278df 100644 --- a/src/core/client/stream/tabs/Comments/PermalinkView/ConversationThreadContainer.tsx +++ b/src/core/client/stream/tabs/Comments/PermalinkView/ConversationThreadContainer.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import { Child as PymChild } from "pym.js"; import React, { FunctionComponent, useCallback } from "react"; import { graphql, RelayPaginationProp } from "react-relay"; diff --git a/src/core/client/stream/tabs/Comments/PermalinkView/PermalinkView.tsx b/src/core/client/stream/tabs/Comments/PermalinkView/PermalinkView.tsx index 066a995fd..d8256fff3 100644 --- a/src/core/client/stream/tabs/Comments/PermalinkView/PermalinkView.tsx +++ b/src/core/client/stream/tabs/Comments/PermalinkView/PermalinkView.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, MouseEvent } from "react"; import { PropTypesOf } from "coral-framework/types"; diff --git a/src/core/client/stream/tabs/Comments/PermalinkView/PermalinkViewQuery.tsx b/src/core/client/stream/tabs/Comments/PermalinkView/PermalinkViewQuery.tsx index d7a37955f..b6f7b650e 100644 --- a/src/core/client/stream/tabs/Comments/PermalinkView/PermalinkViewQuery.tsx +++ b/src/core/client/stream/tabs/Comments/PermalinkView/PermalinkViewQuery.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { ReadyState } from "react-relay"; diff --git a/src/core/client/stream/tabs/Comments/RTE/RTE.tsx b/src/core/client/stream/tabs/Comments/RTE/RTE.tsx index d5e31e1ba..9dc471f7a 100644 --- a/src/core/client/stream/tabs/Comments/RTE/RTE.tsx +++ b/src/core/client/stream/tabs/Comments/RTE/RTE.tsx @@ -1,6 +1,6 @@ import { Blockquote, Bold, CoralRTE, Italic } from "@coralproject/rte"; +import { Localized as LocalizedOriginal } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized as LocalizedOriginal } from "fluent-react/compat"; import React, { EventHandler, FocusEvent, FunctionComponent, Ref } from "react"; import CLASSES from "coral-stream/classes"; diff --git a/src/core/client/stream/tabs/Comments/RemainingCharacters/RemainingCharacters.tsx b/src/core/client/stream/tabs/Comments/RemainingCharacters/RemainingCharacters.tsx index 73d77b53c..6a8ea42df 100644 --- a/src/core/client/stream/tabs/Comments/RemainingCharacters/RemainingCharacters.tsx +++ b/src/core/client/stream/tabs/Comments/RemainingCharacters/RemainingCharacters.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Flex, Icon, Typography } from "coral-ui/components"; diff --git a/src/core/client/stream/tabs/Comments/ReplyList/ReplyList.tsx b/src/core/client/stream/tabs/Comments/ReplyList/ReplyList.tsx index 7de57fa5a..2918ba364 100644 --- a/src/core/client/stream/tabs/Comments/ReplyList/ReplyList.tsx +++ b/src/core/client/stream/tabs/Comments/ReplyList/ReplyList.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import FadeInTransition from "coral-framework/components/FadeInTransition"; diff --git a/src/core/client/stream/tabs/Comments/Stream/AllCommentsTab/AllCommentsTabContainer.tsx b/src/core/client/stream/tabs/Comments/Stream/AllCommentsTab/AllCommentsTabContainer.tsx index 318c6a339..09ac44b21 100644 --- a/src/core/client/stream/tabs/Comments/Stream/AllCommentsTab/AllCommentsTabContainer.tsx +++ b/src/core/client/stream/tabs/Comments/Stream/AllCommentsTab/AllCommentsTabContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback, useEffect } from "react"; import { graphql, RelayPaginationProp } from "react-relay"; diff --git a/src/core/client/stream/tabs/Comments/Stream/AllCommentsTab/AllCommentsTabQuery.tsx b/src/core/client/stream/tabs/Comments/Stream/AllCommentsTab/AllCommentsTabQuery.tsx index b5d9dd554..8df23a122 100644 --- a/src/core/client/stream/tabs/Comments/Stream/AllCommentsTab/AllCommentsTabQuery.tsx +++ b/src/core/client/stream/tabs/Comments/Stream/AllCommentsTab/AllCommentsTabQuery.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { ReadyState } from "react-relay"; diff --git a/src/core/client/stream/tabs/Comments/Stream/BannedInfo.tsx b/src/core/client/stream/tabs/Comments/Stream/BannedInfo.tsx index 0340f4d15..552cf5c55 100644 --- a/src/core/client/stream/tabs/Comments/Stream/BannedInfo.tsx +++ b/src/core/client/stream/tabs/Comments/Stream/BannedInfo.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { CallOut, HorizontalGutter, Typography } from "coral-ui/components"; diff --git a/src/core/client/stream/tabs/Comments/Stream/DeleteAccount/StreamDeletionRequestCalloutContainer.tsx b/src/core/client/stream/tabs/Comments/Stream/DeleteAccount/StreamDeletionRequestCalloutContainer.tsx index de62b6bfa..9a01d4dee 100644 --- a/src/core/client/stream/tabs/Comments/Stream/DeleteAccount/StreamDeletionRequestCalloutContainer.tsx +++ b/src/core/client/stream/tabs/Comments/Stream/DeleteAccount/StreamDeletionRequestCalloutContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Comments/Stream/FeaturedCommentTooltip.tsx b/src/core/client/stream/tabs/Comments/Stream/FeaturedCommentTooltip.tsx index 0a0b07211..59beef0e9 100644 --- a/src/core/client/stream/tabs/Comments/Stream/FeaturedCommentTooltip.tsx +++ b/src/core/client/stream/tabs/Comments/Stream/FeaturedCommentTooltip.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useEffect } from "react"; import { useViewerEvent } from "coral-framework/lib/events"; diff --git a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentContainer.tsx b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentContainer.tsx index 075a6736e..a0cd1630c 100644 --- a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentContainer.tsx +++ b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentContainer.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, MouseEvent, useCallback } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentsContainer.tsx b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentsContainer.tsx index 73e7384e4..0e5ad64de 100644 --- a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentsContainer.tsx +++ b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentsContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { graphql, RelayPaginationProp } from "react-relay"; diff --git a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentsQuery.tsx b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentsQuery.tsx index 56fbca5f9..9b48d9372 100644 --- a/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentsQuery.tsx +++ b/src/core/client/stream/tabs/Comments/Stream/FeaturedComments/FeaturedCommentsQuery.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { ReadyState } from "react-relay"; diff --git a/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentForm.tsx b/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentForm.tsx index 0cf0b3944..546024bdc 100644 --- a/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentForm.tsx +++ b/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentForm.tsx @@ -1,6 +1,6 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; import { FormApi, FormState } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { Field, Form, FormSpy } from "react-final-form"; diff --git a/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentFormContainer.tsx b/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentFormContainer.tsx index e20d6fe8f..cdc6d462e 100644 --- a/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentFormContainer.tsx +++ b/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentFormContainer.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { FORM_ERROR } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { Component } from "react"; import { withContext } from "coral-framework/lib/bootstrap"; diff --git a/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentFormFake.tsx b/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentFormFake.tsx index 35b900698..7aae31e68 100644 --- a/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentFormFake.tsx +++ b/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentFormFake.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { useViewerEvent } from "coral-framework/lib/events"; diff --git a/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentInReviewMessage.tsx b/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentInReviewMessage.tsx index 0c526923e..c90041935 100644 --- a/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentInReviewMessage.tsx +++ b/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentInReviewMessage.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import CLASSES from "coral-stream/classes"; diff --git a/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentRejectedMessage.tsx b/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentRejectedMessage.tsx index c49915249..124c73e50 100644 --- a/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentRejectedMessage.tsx +++ b/src/core/client/stream/tabs/Comments/Stream/PostCommentForm/PostCommentRejectedMessage.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import CLASSES from "coral-stream/classes"; diff --git a/src/core/client/stream/tabs/Comments/Stream/SortMenu.spec.tsx b/src/core/client/stream/tabs/Comments/Stream/SortMenu.spec.tsx index 3a72a3f5d..31f4b202e 100644 --- a/src/core/client/stream/tabs/Comments/Stream/SortMenu.spec.tsx +++ b/src/core/client/stream/tabs/Comments/Stream/SortMenu.spec.tsx @@ -1,4 +1,4 @@ -import { LocalizationProvider } from "fluent-react/compat"; +import { LocalizationProvider } from "@fluent/react/compat"; import { noop } from "lodash"; import React from "react"; import TestRenderer from "react-test-renderer"; diff --git a/src/core/client/stream/tabs/Comments/Stream/SortMenu.tsx b/src/core/client/stream/tabs/Comments/Stream/SortMenu.tsx index 7fc5acb8e..1276810c4 100644 --- a/src/core/client/stream/tabs/Comments/Stream/SortMenu.tsx +++ b/src/core/client/stream/tabs/Comments/Stream/SortMenu.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { useViewerEvent } from "coral-framework/lib/events"; diff --git a/src/core/client/stream/tabs/Comments/Stream/StreamContainer.tsx b/src/core/client/stream/tabs/Comments/Stream/StreamContainer.tsx index 6740e2d7d..f7e1af9ae 100644 --- a/src/core/client/stream/tabs/Comments/Stream/StreamContainer.tsx +++ b/src/core/client/stream/tabs/Comments/Stream/StreamContainer.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback, useEffect } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Comments/Stream/StreamQuery.tsx b/src/core/client/stream/tabs/Comments/Stream/StreamQuery.tsx index 8103843d7..6d03ef938 100644 --- a/src/core/client/stream/tabs/Comments/Stream/StreamQuery.tsx +++ b/src/core/client/stream/tabs/Comments/Stream/StreamQuery.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { ReadyState } from "react-relay"; diff --git a/src/core/client/stream/tabs/Comments/Stream/SuspendedInfo/SuspendedInfo.tsx b/src/core/client/stream/tabs/Comments/Stream/SuspendedInfo/SuspendedInfo.tsx index 5dd074b93..0677cc3cd 100644 --- a/src/core/client/stream/tabs/Comments/Stream/SuspendedInfo/SuspendedInfo.tsx +++ b/src/core/client/stream/tabs/Comments/Stream/SuspendedInfo/SuspendedInfo.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useMemo } from "react"; import { useCoralContext } from "coral-framework/lib/bootstrap"; diff --git a/src/core/client/stream/tabs/Configure/ConfigureQuery.tsx b/src/core/client/stream/tabs/Configure/ConfigureQuery.tsx index e48306c68..3dbe762c5 100644 --- a/src/core/client/stream/tabs/Configure/ConfigureQuery.tsx +++ b/src/core/client/stream/tabs/Configure/ConfigureQuery.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import { once } from "lodash"; import React, { FunctionComponent, Suspense } from "react"; import { ReadyState } from "react-relay"; diff --git a/src/core/client/stream/tabs/Configure/ConfigureStream/ConfigureStream.tsx b/src/core/client/stream/tabs/Configure/ConfigureStream/ConfigureStream.tsx index ac127c31d..cf370033e 100644 --- a/src/core/client/stream/tabs/Configure/ConfigureStream/ConfigureStream.tsx +++ b/src/core/client/stream/tabs/Configure/ConfigureStream/ConfigureStream.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { FormApi } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { Form } from "react-final-form"; diff --git a/src/core/client/stream/tabs/Configure/ConfigureStream/LiveUpdatesConfig/LiveUpdatesConfig.tsx b/src/core/client/stream/tabs/Configure/ConfigureStream/LiveUpdatesConfig/LiveUpdatesConfig.tsx index b68643e09..a25a8a03b 100644 --- a/src/core/client/stream/tabs/Configure/ConfigureStream/LiveUpdatesConfig/LiveUpdatesConfig.tsx +++ b/src/core/client/stream/tabs/Configure/ConfigureStream/LiveUpdatesConfig/LiveUpdatesConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Configure/ConfigureStream/MessageBoxConfig.tsx b/src/core/client/stream/tabs/Configure/ConfigureStream/MessageBoxConfig.tsx index 5df6f1917..4da7615c2 100644 --- a/src/core/client/stream/tabs/Configure/ConfigureStream/MessageBoxConfig.tsx +++ b/src/core/client/stream/tabs/Configure/ConfigureStream/MessageBoxConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, Suspense } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Configure/ConfigureStream/PremodConfig.tsx b/src/core/client/stream/tabs/Configure/ConfigureStream/PremodConfig.tsx index 07216305f..dce9352c1 100644 --- a/src/core/client/stream/tabs/Configure/ConfigureStream/PremodConfig.tsx +++ b/src/core/client/stream/tabs/Configure/ConfigureStream/PremodConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Configure/ConfigureStream/PremodLinksConfig.tsx b/src/core/client/stream/tabs/Configure/ConfigureStream/PremodLinksConfig.tsx index 5d11b07e1..928da3cb8 100644 --- a/src/core/client/stream/tabs/Configure/ConfigureStream/PremodLinksConfig.tsx +++ b/src/core/client/stream/tabs/Configure/ConfigureStream/PremodLinksConfig.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { Field } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Configure/ModerateStreamContainer.tsx b/src/core/client/stream/tabs/Configure/ModerateStreamContainer.tsx index 6d7df52f3..a82288a04 100644 --- a/src/core/client/stream/tabs/Configure/ModerateStreamContainer.tsx +++ b/src/core/client/stream/tabs/Configure/ModerateStreamContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useMemo } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Configure/OpenOrCloseStream/CloseStream.tsx b/src/core/client/stream/tabs/Configure/OpenOrCloseStream/CloseStream.tsx index 4f610fae7..a9264f508 100644 --- a/src/core/client/stream/tabs/Configure/OpenOrCloseStream/CloseStream.tsx +++ b/src/core/client/stream/tabs/Configure/OpenOrCloseStream/CloseStream.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import CLASSES from "coral-stream/classes"; diff --git a/src/core/client/stream/tabs/Configure/OpenOrCloseStream/OpenStream.tsx b/src/core/client/stream/tabs/Configure/OpenOrCloseStream/OpenStream.tsx index 32dbc9a15..dd57bc411 100644 --- a/src/core/client/stream/tabs/Configure/OpenOrCloseStream/OpenStream.tsx +++ b/src/core/client/stream/tabs/Configure/OpenOrCloseStream/OpenStream.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import CLASSES from "coral-stream/classes"; diff --git a/src/core/client/stream/tabs/Profile/CommentHistory/CommentHistory.tsx b/src/core/client/stream/tabs/Profile/CommentHistory/CommentHistory.tsx index 30ae6f409..aa535987b 100644 --- a/src/core/client/stream/tabs/Profile/CommentHistory/CommentHistory.tsx +++ b/src/core/client/stream/tabs/Profile/CommentHistory/CommentHistory.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { PropTypesOf } from "coral-framework/types"; diff --git a/src/core/client/stream/tabs/Profile/CommentHistory/HistoryComment.tsx b/src/core/client/stream/tabs/Profile/CommentHistory/HistoryComment.tsx index 54bc187c6..8ab523a1d 100644 --- a/src/core/client/stream/tabs/Profile/CommentHistory/HistoryComment.tsx +++ b/src/core/client/stream/tabs/Profile/CommentHistory/HistoryComment.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import CLASSES from "coral-stream/classes"; diff --git a/src/core/client/stream/tabs/Profile/DeletionRequest/DeletionRequestCalloutContainer.tsx b/src/core/client/stream/tabs/Profile/DeletionRequest/DeletionRequestCalloutContainer.tsx index a14b5ce47..b6463fde5 100644 --- a/src/core/client/stream/tabs/Profile/DeletionRequest/DeletionRequestCalloutContainer.tsx +++ b/src/core/client/stream/tabs/Profile/DeletionRequest/DeletionRequestCalloutContainer.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { useCoralContext } from "coral-framework/lib/bootstrap"; diff --git a/src/core/client/stream/tabs/Profile/Profile.tsx b/src/core/client/stream/tabs/Profile/Profile.tsx index 36eb2fb9d..7e2ddaa1d 100644 --- a/src/core/client/stream/tabs/Profile/Profile.tsx +++ b/src/core/client/stream/tabs/Profile/Profile.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { useViewerEvent } from "coral-framework/lib/events"; diff --git a/src/core/client/stream/tabs/Profile/ProfileQuery.tsx b/src/core/client/stream/tabs/Profile/ProfileQuery.tsx index 25c4b009b..bef707a83 100644 --- a/src/core/client/stream/tabs/Profile/ProfileQuery.tsx +++ b/src/core/client/stream/tabs/Profile/ProfileQuery.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import { once } from "lodash"; import React, { FunctionComponent, Suspense } from "react"; import { ReadyState } from "react-relay"; diff --git a/src/core/client/stream/tabs/Profile/Settings/AccountSettingsContainer.tsx b/src/core/client/stream/tabs/Profile/Settings/AccountSettingsContainer.tsx index 27ff39b2d..9ea88f395 100644 --- a/src/core/client/stream/tabs/Profile/Settings/AccountSettingsContainer.tsx +++ b/src/core/client/stream/tabs/Profile/Settings/AccountSettingsContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Profile/Settings/ChangeEmail/ChangeEmailContainer.tsx b/src/core/client/stream/tabs/Profile/Settings/ChangeEmail/ChangeEmailContainer.tsx index 0c56ebd81..efff9406d 100644 --- a/src/core/client/stream/tabs/Profile/Settings/ChangeEmail/ChangeEmailContainer.tsx +++ b/src/core/client/stream/tabs/Profile/Settings/ChangeEmail/ChangeEmailContainer.tsx @@ -1,6 +1,6 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; import { FORM_ERROR, FormApi, FormState } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback, diff --git a/src/core/client/stream/tabs/Profile/Settings/ChangePassword.tsx b/src/core/client/stream/tabs/Profile/Settings/ChangePassword.tsx index 069290e96..9c3376dc1 100644 --- a/src/core/client/stream/tabs/Profile/Settings/ChangePassword.tsx +++ b/src/core/client/stream/tabs/Profile/Settings/ChangePassword.tsx @@ -1,6 +1,6 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; import { FORM_ERROR, FormApi } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback, useState } from "react"; import { Field, Form } from "react-final-form"; diff --git a/src/core/client/stream/tabs/Profile/Settings/ChangeUsername/ChangeUsernameContainer.tsx b/src/core/client/stream/tabs/Profile/Settings/ChangeUsername/ChangeUsernameContainer.tsx index 868f41a93..111d6d7c7 100644 --- a/src/core/client/stream/tabs/Profile/Settings/ChangeUsername/ChangeUsernameContainer.tsx +++ b/src/core/client/stream/tabs/Profile/Settings/ChangeUsername/ChangeUsernameContainer.tsx @@ -1,6 +1,6 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; import { FORM_ERROR, FormApi } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback, diff --git a/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/DeleteAccountContainer.tsx b/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/DeleteAccountContainer.tsx index c69d5e259..42de65fd1 100644 --- a/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/DeleteAccountContainer.tsx +++ b/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/DeleteAccountContainer.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback, useState } from "react"; import { useCoralContext } from "coral-framework/lib/bootstrap"; diff --git a/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/CompletionPage.tsx b/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/CompletionPage.tsx index 8f8f97048..0b436bcfa 100644 --- a/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/CompletionPage.tsx +++ b/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/CompletionPage.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { useCoralContext } from "coral-framework/lib/bootstrap"; diff --git a/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/ConfirmPage.tsx b/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/ConfirmPage.tsx index 5120fc393..7386b1b42 100644 --- a/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/ConfirmPage.tsx +++ b/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/ConfirmPage.tsx @@ -1,6 +1,6 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; import { FORM_ERROR, FormApi, FormState } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { Field, Form } from "react-final-form"; diff --git a/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/DescriptionPage.tsx b/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/DescriptionPage.tsx index 9eec5d270..77492af54 100644 --- a/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/DescriptionPage.tsx +++ b/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/DescriptionPage.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import CLASSES from "coral-stream/classes"; diff --git a/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/DownloadCommentsPage.tsx b/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/DownloadCommentsPage.tsx index dc267623f..d37289470 100644 --- a/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/DownloadCommentsPage.tsx +++ b/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/DownloadCommentsPage.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import CLASSES from "coral-stream/classes"; diff --git a/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/WhenPage.tsx b/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/WhenPage.tsx index 8aa0ee7bf..de5a0ef53 100644 --- a/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/WhenPage.tsx +++ b/src/core/client/stream/tabs/Profile/Settings/DeleteAccount/Pages/WhenPage.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import CLASSES from "coral-stream/classes"; diff --git a/src/core/client/stream/tabs/Profile/Settings/DownloadCommentsContainer.tsx b/src/core/client/stream/tabs/Profile/Settings/DownloadCommentsContainer.tsx index 730c9786e..08bee1b5a 100644 --- a/src/core/client/stream/tabs/Profile/Settings/DownloadCommentsContainer.tsx +++ b/src/core/client/stream/tabs/Profile/Settings/DownloadCommentsContainer.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Profile/Settings/IgnoreUserSettingsContainer.tsx b/src/core/client/stream/tabs/Profile/Settings/IgnoreUserSettingsContainer.tsx index 5b6778750..b273f615a 100644 --- a/src/core/client/stream/tabs/Profile/Settings/IgnoreUserSettingsContainer.tsx +++ b/src/core/client/stream/tabs/Profile/Settings/IgnoreUserSettingsContainer.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent, useCallback, useState } from "react"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/tabs/Profile/Settings/NotificationSettingsContainer.tsx b/src/core/client/stream/tabs/Profile/Settings/NotificationSettingsContainer.tsx index 5e6f0efa3..ae1ffd332 100644 --- a/src/core/client/stream/tabs/Profile/Settings/NotificationSettingsContainer.tsx +++ b/src/core/client/stream/tabs/Profile/Settings/NotificationSettingsContainer.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import { FORM_ERROR } from "final-form"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent, useCallback } from "react"; import { Field, Form, FormSpy } from "react-final-form"; import { graphql } from "react-relay"; diff --git a/src/core/client/stream/test/profile/__snapshots__/account.spec.tsx.snap b/src/core/client/stream/test/profile/__snapshots__/account.spec.tsx.snap index a626efee9..7ec0aca3d 100644 --- a/src/core/client/stream/test/profile/__snapshots__/account.spec.tsx.snap +++ b/src/core/client/stream/test/profile/__snapshots__/account.spec.tsx.snap @@ -307,7 +307,7 @@ exports[`renders the empty settings pane 1`] = `

- An email has been sent to $email to verify your account. + An email has been sent to {$email} to verify your account. You must verify your new email address before it can be used to sign in to your account or to receive notifications.

diff --git a/src/core/client/ui/components/Brand/BrandName.tsx b/src/core/client/ui/components/Brand/BrandName.tsx index 8b7e4ceab..f43e8562d 100644 --- a/src/core/client/ui/components/Brand/BrandName.tsx +++ b/src/core/client/ui/components/Brand/BrandName.tsx @@ -1,5 +1,5 @@ +import { Localized } from "@fluent/react/compat"; import cn from "classnames"; -import { Localized } from "fluent-react/compat"; import React, { FunctionComponent } from "react"; import { PropTypesOf } from "coral-framework/types"; diff --git a/src/core/client/ui/components/Brand/LogoHorizontal.tsx b/src/core/client/ui/components/Brand/LogoHorizontal.tsx index 0a6ca6750..6b32bb156 100644 --- a/src/core/client/ui/components/Brand/LogoHorizontal.tsx +++ b/src/core/client/ui/components/Brand/LogoHorizontal.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { FunctionComponent } from "react"; import { withStyles } from "coral-ui/hocs"; diff --git a/src/core/client/ui/components/v2/DurationField/DurationField.tsx b/src/core/client/ui/components/v2/DurationField/DurationField.tsx index b6d4419eb..7d912ab88 100644 --- a/src/core/client/ui/components/v2/DurationField/DurationField.tsx +++ b/src/core/client/ui/components/v2/DurationField/DurationField.tsx @@ -1,4 +1,4 @@ -import { Localized } from "fluent-react/compat"; +import { Localized } from "@fluent/react/compat"; import React, { ChangeEvent, FunctionComponent, diff --git a/src/core/server/app/middleware/error.ts b/src/core/server/app/middleware/error.ts index 45d222022..d215289cc 100644 --- a/src/core/server/app/middleware/error.ts +++ b/src/core/server/app/middleware/error.ts @@ -1,9 +1,9 @@ +import { FluentBundle } from "@fluent/bundle/compat"; import { ErrorRequestHandler } from "express"; import { CoralError, InternalError } from "coral-server/errors"; import { I18n } from "coral-server/services/i18n"; import { Request } from "coral-server/types/express"; -import { FluentBundle } from "fluent/compat"; /** * wrapError ensures that the error being propagated is a CoralError. diff --git a/src/core/server/errors/index.ts b/src/core/server/errors/index.ts index 867405822..24e64516a 100644 --- a/src/core/server/errors/index.ts +++ b/src/core/server/errors/index.ts @@ -1,6 +1,6 @@ /* eslint-disable max-classes-per-file */ -import { FluentBundle } from "fluent/compat"; +import { FluentBundle } from "@fluent/bundle/compat"; import { MongoError } from "mongodb"; import uuid from "uuid"; import { VError } from "verror"; diff --git a/src/core/server/models/tenant/helpers.ts b/src/core/server/models/tenant/helpers.ts index a9e575bbe..b28b4f212 100644 --- a/src/core/server/models/tenant/helpers.ts +++ b/src/core/server/models/tenant/helpers.ts @@ -1,5 +1,5 @@ +import { FluentBundle } from "@fluent/bundle/compat"; import crypto from "crypto"; -import { FluentBundle } from "fluent/compat"; import { translate } from "coral-server/services/i18n"; diff --git a/src/core/server/queue/tasks/mailer/processor.ts b/src/core/server/queue/tasks/mailer/processor.ts index 325e8ad43..d27d567a1 100644 --- a/src/core/server/queue/tasks/mailer/processor.ts +++ b/src/core/server/queue/tasks/mailer/processor.ts @@ -1,7 +1,7 @@ +import { FluentBundle } from "@fluent/bundle/compat"; +import { DOMLocalization } from "@fluent/dom/compat"; import { Job } from "bull"; import createDOMPurify from "dompurify"; -import { DOMLocalization } from "fluent-dom/compat"; -import { FluentBundle } from "fluent/compat"; import { minify } from "html-minifier"; import htmlToText from "html-to-text"; import Joi from "joi"; diff --git a/src/core/server/services/i18n/index.ts b/src/core/server/services/i18n/index.ts index d048ccee1..029b2265a 100644 --- a/src/core/server/services/i18n/index.ts +++ b/src/core/server/services/i18n/index.ts @@ -1,4 +1,4 @@ -import { FluentBundle } from "fluent/compat"; +import { FluentBundle, FluentResource } from "@fluent/bundle/compat"; import fs from "fs-extra"; import path from "path"; @@ -64,7 +64,7 @@ export class I18n { const messages = await fs.readFile(filePath, "utf8"); - bundle.addMessages(messages); + bundle.addResource(new FluentResource(messages)); } this.bundles[locale] = bundle; @@ -117,10 +117,10 @@ export function translate( defaultValue: string, id: string, args?: object, - errors?: string[] + errors?: Error[] ): string { const message = bundle.getMessage(id); - if (!message) { + if (!message || !message.value) { if (config.get("env") === "test") { throw new Error(`the message for ${id} is missing`); } @@ -128,7 +128,7 @@ export function translate( return defaultValue; } - const value = bundle.format(message, args, errors); + const value = bundle.formatPattern(message.value, args, errors); if (!value) { return defaultValue; } diff --git a/src/types/fluent.d.ts b/src/types/fluent.d.ts index 3be273b4b..6c3d6b419 100644 --- a/src/types/fluent.d.ts +++ b/src/types/fluent.d.ts @@ -3,8 +3,8 @@ // Allowing loading fluent files. declare module "*.ftl"; -declare module "fluent-dom/compat" { - import { FluentBundle } from "fluent/compat"; +declare module "@fluent/dom/compat" { + import { FluentBundle } from "@fluent/bundle/compat"; export class DOMLocalization { constructor(resourceIDs: string[], generateBundles: any); @@ -26,8 +26,8 @@ declare module "fluent-dom/compat" { } } -declare module "fluent-react/compat" { - import { FluentBundle } from "fluent/compat"; +declare module "@fluent/react/compat" { + import { FluentBundle } from "@fluent/bundle/compat"; import { ComponentType } from "react"; export interface LocalizationProviderProps { @@ -43,22 +43,22 @@ declare module "fluent-react/compat" { export const Localized: ComponentType; } -declare module "fluent-langneg/compat" { - export function negotiateLanguages( - requestedLocales: ReadonlyArray, - available: ReadonlyArray, - options: { - strategy: "filtering" | "matching" | "lookup"; - defaultLocale: string; - } - ): string[]; -} - -declare module "fluent/compat" { +declare module "@fluent/bundle/compat" { export interface FluentBundleOptions { functions?: { [key: string]: (...args: any[]) => string | FluentType }; useIsolating?: boolean; - transform?: ((s: string) => string); + transform?: (s: string) => string; + } + + export class FluentResource { + constructor(source: string); + } + + export type Pattern = string; + + export interface RawMessage { + value: Pattern | null; + attributes: Record; } export class FluentBundle { @@ -66,13 +66,13 @@ declare module "fluent/compat" { public locales: string[]; public readonly messages: Iterator<[string, any]>; public hasMessage(id: string): boolean; - public getMessage(id: string): any; - public addMessages(source: string): string[]; - public format( - message: any, + public getMessage(id: string): RawMessage; + public addResource(res: FluentResource, options?: {}): void; + public formatPattern( + pattern: Pattern, args?: object, - errors?: string[] - ): string | null; + errors?: Error[] + ): string; } export class FluentType {