From 3c812cb51ac59b61f4af855651450755fe62ae82 Mon Sep 17 00:00:00 2001 From: Martti Malmi Date: Tue, 26 Sep 2023 09:58:53 +0300 Subject: [PATCH] FormattedMessage: replace Snort -> APP_NAME_CAPITALIZED --- packages/app/config/README.md | 1 + packages/app/config/default.json | 1 + packages/app/config/iris.json | 1 + packages/app/src/Element/BadgeList.tsx | 2 +- packages/app/src/Element/BlockButton.tsx | 2 +- packages/app/src/Element/Bookmarks.tsx | 2 +- packages/app/src/Element/DmWindow.tsx | 2 +- packages/app/src/Element/FollowButton.tsx | 2 +- packages/app/src/Element/FollowListBase.tsx | 2 +- packages/app/src/Element/Following.tsx | 2 +- packages/app/src/Element/FormattedMessage.tsx | 22 +++++++++++++++++++ packages/app/src/Element/LiveEvent.tsx | 2 +- packages/app/src/Element/LoadMore.tsx | 2 +- packages/app/src/Element/LogoutButton.tsx | 2 +- packages/app/src/Element/MagnetLink.tsx | 2 +- packages/app/src/Element/MuteButton.tsx | 2 +- packages/app/src/Element/MutedList.tsx | 2 +- packages/app/src/Element/NostrFileHeader.tsx | 2 +- packages/app/src/Element/NoteReaction.tsx | 2 +- packages/app/src/Element/NoteToSelf.tsx | 2 +- packages/app/src/Element/ProxyImg.tsx | 2 +- packages/app/src/Element/ReBroadcaster.tsx | 2 +- packages/app/src/Element/Relay.tsx | 2 +- packages/app/src/Element/RevealMedia.tsx | 2 +- packages/app/src/Element/RootTabs.tsx | 2 +- .../app/src/Element/SuggestedProfiles.tsx | 2 +- packages/app/src/Element/Timeline.tsx | 2 +- packages/app/src/Element/TimelineFollows.tsx | 2 +- packages/app/src/Element/ZapstrEmbed.tsx | 2 +- packages/app/src/Pages/DeckLayout.tsx | 2 +- packages/app/src/Pages/DonatePage.tsx | 2 +- packages/app/src/Pages/ErrorPage.tsx | 2 +- packages/app/src/Pages/HashTagsPage.tsx | 2 +- packages/app/src/Pages/HelpPage.tsx | 2 +- packages/app/src/Pages/NostrAddressPage.tsx | 2 +- packages/app/src/Pages/NostrLinkHandler.tsx | 2 +- packages/app/src/Pages/ProfilePage.tsx | 2 +- packages/app/src/Pages/Root.tsx | 2 +- packages/app/src/Pages/SettingsPage.tsx | 2 +- packages/app/src/Pages/new/GetVerified.tsx | 2 +- packages/app/src/Pages/new/NewUserFlow.tsx | 2 +- packages/app/src/Pages/settings/Accounts.tsx | 2 +- packages/app/src/Pages/settings/Keys.tsx | 2 +- .../app/src/Pages/settings/Moderation.tsx | 2 +- packages/app/src/Pages/settings/Profile.tsx | 2 +- packages/app/src/Pages/settings/RelayInfo.tsx | 2 +- packages/app/src/Pages/settings/Relays.tsx | 2 +- packages/app/src/Pages/settings/Root.tsx | 2 +- .../app/src/Pages/settings/WalletSettings.tsx | 2 +- .../src/Pages/settings/handle/ListHandles.tsx | 2 +- .../app/src/Pages/settings/handle/index.tsx | 2 +- .../Pages/subscribe/ManageSubscription.tsx | 2 +- packages/app/src/Pages/subscribe/index.tsx | 2 +- packages/app/src/Tasks/DonateTask.tsx | 2 +- packages/app/src/Tasks/Nip5Task.tsx | 2 +- packages/app/webpack.config.js | 1 + 56 files changed, 77 insertions(+), 51 deletions(-) create mode 100644 packages/app/config/README.md create mode 100644 packages/app/src/Element/FormattedMessage.tsx diff --git a/packages/app/config/README.md b/packages/app/config/README.md new file mode 100644 index 00000000..16871890 --- /dev/null +++ b/packages/app/config/README.md @@ -0,0 +1 @@ +Choose config with NODE_CONFIG_ENV: `NODE_CONFIG_ENV=iris yarn start` \ No newline at end of file diff --git a/packages/app/config/default.json b/packages/app/config/default.json index a95cb327..c74a1967 100644 --- a/packages/app/config/default.json +++ b/packages/app/config/default.json @@ -1,4 +1,5 @@ { "appName": "Snort", + "appNameCapitalized": "Snort", "appTitle": "Snort - Nostr" } diff --git a/packages/app/config/iris.json b/packages/app/config/iris.json index f3819618..a142040e 100644 --- a/packages/app/config/iris.json +++ b/packages/app/config/iris.json @@ -1,4 +1,5 @@ { "appName": "iris", + "appNameCapitalized": "Iris", "appTitle": "iris" } diff --git a/packages/app/src/Element/BadgeList.tsx b/packages/app/src/Element/BadgeList.tsx index 062ff55b..e3357ef0 100644 --- a/packages/app/src/Element/BadgeList.tsx +++ b/packages/app/src/Element/BadgeList.tsx @@ -1,7 +1,7 @@ import "./BadgeList.css"; import { useState } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { TaggedNostrEvent } from "@snort/system"; diff --git a/packages/app/src/Element/BlockButton.tsx b/packages/app/src/Element/BlockButton.tsx index 3245d76d..e8a4a701 100644 --- a/packages/app/src/Element/BlockButton.tsx +++ b/packages/app/src/Element/BlockButton.tsx @@ -1,4 +1,4 @@ -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { HexKey } from "@snort/system"; import useModeration from "Hooks/useModeration"; diff --git a/packages/app/src/Element/Bookmarks.tsx b/packages/app/src/Element/Bookmarks.tsx index 5bef3a36..249b41ae 100644 --- a/packages/app/src/Element/Bookmarks.tsx +++ b/packages/app/src/Element/Bookmarks.tsx @@ -1,5 +1,5 @@ import { useState, useMemo, ChangeEvent } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { HexKey, TaggedNostrEvent } from "@snort/system"; import Note from "Element/Note"; diff --git a/packages/app/src/Element/DmWindow.tsx b/packages/app/src/Element/DmWindow.tsx index 2620500b..7bf6af34 100644 --- a/packages/app/src/Element/DmWindow.tsx +++ b/packages/app/src/Element/DmWindow.tsx @@ -6,7 +6,7 @@ import DM from "Element/DM"; import useLogin from "Hooks/useLogin"; import WriteMessage from "Element/WriteMessage"; import { Chat, createEmptyChatObject, useChatSystem } from "chat"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { ChatParticipantProfile } from "./ChatParticipant"; export default function DmWindow({ id }: { id: string }) { diff --git a/packages/app/src/Element/FollowButton.tsx b/packages/app/src/Element/FollowButton.tsx index 258d693b..48863694 100644 --- a/packages/app/src/Element/FollowButton.tsx +++ b/packages/app/src/Element/FollowButton.tsx @@ -1,5 +1,5 @@ import "./FollowButton.css"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { HexKey } from "@snort/system"; import useEventPublisher from "Hooks/useEventPublisher"; diff --git a/packages/app/src/Element/FollowListBase.tsx b/packages/app/src/Element/FollowListBase.tsx index 377bd207..47451dd2 100644 --- a/packages/app/src/Element/FollowListBase.tsx +++ b/packages/app/src/Element/FollowListBase.tsx @@ -1,5 +1,5 @@ import { ReactNode } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { HexKey } from "@snort/system"; import useEventPublisher from "Hooks/useEventPublisher"; diff --git a/packages/app/src/Element/Following.tsx b/packages/app/src/Element/Following.tsx index 2ce66c8c..de082d83 100644 --- a/packages/app/src/Element/Following.tsx +++ b/packages/app/src/Element/Following.tsx @@ -1,7 +1,7 @@ import "./Following.css"; import useLogin from "Hooks/useLogin"; import Icon from "Icons/Icon"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; export function FollowingMark({ pubkey }: { pubkey: string }) { const { follows } = useLogin(s => ({ follows: s.follows })); diff --git a/packages/app/src/Element/FormattedMessage.tsx b/packages/app/src/Element/FormattedMessage.tsx new file mode 100644 index 00000000..c8923fc0 --- /dev/null +++ b/packages/app/src/Element/FormattedMessage.tsx @@ -0,0 +1,22 @@ +import { useState, useEffect, FC, ComponentProps } from 'react'; +import { useIntl, FormattedMessage } from 'react-intl'; + +type ExtendedProps = ComponentProps; + +const ExtendedFormattedMessage: FC = (props) => { + const { id, defaultMessage, values} = props; + const { formatMessage } = useIntl(); + + const [processedMessage, setProcessedMessage] = useState(null); + + useEffect(() => { + const translatedMessage = formatMessage({ id, defaultMessage }, values); + if (typeof translatedMessage === 'string') { + setProcessedMessage(translatedMessage.replace('Snort', process.env.APP_NAME_CAPITALIZED || 'Snort')); + } + }, [id, defaultMessage, values, formatMessage]); + + return <>{processedMessage}; +}; + +export default ExtendedFormattedMessage; diff --git a/packages/app/src/Element/LiveEvent.tsx b/packages/app/src/Element/LiveEvent.tsx index 1dd0137c..8acc43fb 100644 --- a/packages/app/src/Element/LiveEvent.tsx +++ b/packages/app/src/Element/LiveEvent.tsx @@ -1,5 +1,5 @@ import { NostrEvent, NostrLink } from "@snort/system"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { Link } from "react-router-dom"; import { findTag } from "SnortUtils"; diff --git a/packages/app/src/Element/LoadMore.tsx b/packages/app/src/Element/LoadMore.tsx index 8982c375..10198091 100644 --- a/packages/app/src/Element/LoadMore.tsx +++ b/packages/app/src/Element/LoadMore.tsx @@ -1,5 +1,5 @@ import { useEffect, useState } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { useInView } from "react-intersection-observer"; import messages from "./messages"; diff --git a/packages/app/src/Element/LogoutButton.tsx b/packages/app/src/Element/LogoutButton.tsx index edd0144a..6ba5afcc 100644 --- a/packages/app/src/Element/LogoutButton.tsx +++ b/packages/app/src/Element/LogoutButton.tsx @@ -1,4 +1,4 @@ -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { useNavigate } from "react-router-dom"; import { logout } from "Login"; diff --git a/packages/app/src/Element/MagnetLink.tsx b/packages/app/src/Element/MagnetLink.tsx index 4dca7d5e..39a65029 100644 --- a/packages/app/src/Element/MagnetLink.tsx +++ b/packages/app/src/Element/MagnetLink.tsx @@ -1,4 +1,4 @@ -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { Magnet } from "SnortUtils"; diff --git a/packages/app/src/Element/MuteButton.tsx b/packages/app/src/Element/MuteButton.tsx index b95d1e21..f7417765 100644 --- a/packages/app/src/Element/MuteButton.tsx +++ b/packages/app/src/Element/MuteButton.tsx @@ -1,4 +1,4 @@ -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { HexKey } from "@snort/system"; import useModeration from "Hooks/useModeration"; diff --git a/packages/app/src/Element/MutedList.tsx b/packages/app/src/Element/MutedList.tsx index b4d9c8ba..9ecf305c 100644 --- a/packages/app/src/Element/MutedList.tsx +++ b/packages/app/src/Element/MutedList.tsx @@ -1,4 +1,4 @@ -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { HexKey } from "@snort/system"; import MuteButton from "Element/MuteButton"; import ProfilePreview from "Element/ProfilePreview"; diff --git a/packages/app/src/Element/NostrFileHeader.tsx b/packages/app/src/Element/NostrFileHeader.tsx index 39f7d636..72873bf0 100644 --- a/packages/app/src/Element/NostrFileHeader.tsx +++ b/packages/app/src/Element/NostrFileHeader.tsx @@ -1,4 +1,4 @@ -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { NostrEvent, NostrLink } from "@snort/system"; import { findTag } from "SnortUtils"; diff --git a/packages/app/src/Element/NoteReaction.tsx b/packages/app/src/Element/NoteReaction.tsx index a2992c7f..9d54626f 100644 --- a/packages/app/src/Element/NoteReaction.tsx +++ b/packages/app/src/Element/NoteReaction.tsx @@ -7,7 +7,7 @@ import Note from "Element/Note"; import { getDisplayName } from "Element/ProfileImage"; import { eventLink, hexToBech32 } from "SnortUtils"; import useModeration from "Hooks/useModeration"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import Icon from "Icons/Icon"; import { useUserProfile } from "@snort/system-react"; import { useInView } from "react-intersection-observer"; diff --git a/packages/app/src/Element/NoteToSelf.tsx b/packages/app/src/Element/NoteToSelf.tsx index b134762a..b3c2b26e 100644 --- a/packages/app/src/Element/NoteToSelf.tsx +++ b/packages/app/src/Element/NoteToSelf.tsx @@ -1,6 +1,6 @@ import "./NoteToSelf.css"; import { Link, useNavigate } from "react-router-dom"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { profileLink } from "SnortUtils"; import messages from "./messages"; diff --git a/packages/app/src/Element/ProxyImg.tsx b/packages/app/src/Element/ProxyImg.tsx index dc625e57..634880a6 100644 --- a/packages/app/src/Element/ProxyImg.tsx +++ b/packages/app/src/Element/ProxyImg.tsx @@ -1,6 +1,6 @@ import useImgProxy from "Hooks/useImgProxy"; import React, { useState } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { getUrlHostname } from "SnortUtils"; interface ProxyImgProps extends React.DetailedHTMLProps, HTMLImageElement> { diff --git a/packages/app/src/Element/ReBroadcaster.tsx b/packages/app/src/Element/ReBroadcaster.tsx index 48e3f436..3a75fe27 100644 --- a/packages/app/src/Element/ReBroadcaster.tsx +++ b/packages/app/src/Element/ReBroadcaster.tsx @@ -1,5 +1,5 @@ import { useContext, useState } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { TaggedNostrEvent } from "@snort/system"; import { SnortContext } from "@snort/system-react"; diff --git a/packages/app/src/Element/Relay.tsx b/packages/app/src/Element/Relay.tsx index 0de4d288..09d881f1 100644 --- a/packages/app/src/Element/Relay.tsx +++ b/packages/app/src/Element/Relay.tsx @@ -1,6 +1,6 @@ import "./Relay.css"; import { useMemo } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { useNavigate } from "react-router-dom"; import { RelaySettings } from "@snort/system"; import { unixNowMs } from "@snort/shared"; diff --git a/packages/app/src/Element/RevealMedia.tsx b/packages/app/src/Element/RevealMedia.tsx index dce6caaa..87ad64b6 100644 --- a/packages/app/src/Element/RevealMedia.tsx +++ b/packages/app/src/Element/RevealMedia.tsx @@ -1,4 +1,4 @@ -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { FileExtensionRegex } from "Const"; import Reveal from "Element/Reveal"; diff --git a/packages/app/src/Element/RootTabs.tsx b/packages/app/src/Element/RootTabs.tsx index 8f709def..733ce273 100644 --- a/packages/app/src/Element/RootTabs.tsx +++ b/packages/app/src/Element/RootTabs.tsx @@ -2,7 +2,7 @@ import "./RootTabs.css"; import { useState, ReactNode, useEffect } from "react"; import { useLocation, useNavigate } from "react-router-dom"; import { Menu, MenuItem } from "@szhsin/react-menu"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import useLogin from "Hooks/useLogin"; import Icon from "Icons/Icon"; diff --git a/packages/app/src/Element/SuggestedProfiles.tsx b/packages/app/src/Element/SuggestedProfiles.tsx index 4680555b..d3841d4f 100644 --- a/packages/app/src/Element/SuggestedProfiles.tsx +++ b/packages/app/src/Element/SuggestedProfiles.tsx @@ -1,6 +1,6 @@ import { useEffect, useState } from "react"; import { HexKey, NostrPrefix } from "@snort/system"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import FollowListBase from "Element/FollowListBase"; import PageSpinner from "Element/PageSpinner"; diff --git a/packages/app/src/Element/Timeline.tsx b/packages/app/src/Element/Timeline.tsx index 0b5c545a..71681d1a 100644 --- a/packages/app/src/Element/Timeline.tsx +++ b/packages/app/src/Element/Timeline.tsx @@ -1,5 +1,5 @@ import "./Timeline.css"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { useCallback, useMemo } from "react"; import { useInView } from "react-intersection-observer"; import { TaggedNostrEvent, EventKind, u256 } from "@snort/system"; diff --git a/packages/app/src/Element/TimelineFollows.tsx b/packages/app/src/Element/TimelineFollows.tsx index 467f3b66..cbfa53d6 100644 --- a/packages/app/src/Element/TimelineFollows.tsx +++ b/packages/app/src/Element/TimelineFollows.tsx @@ -1,6 +1,6 @@ import "./Timeline.css"; import { ReactNode, useCallback, useContext, useMemo, useState, useSyncExternalStore } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { TaggedNostrEvent, EventKind, u256, NostrEvent, NostrLink } from "@snort/system"; import { unixNow } from "@snort/shared"; import { SnortContext } from "@snort/system-react"; diff --git a/packages/app/src/Element/ZapstrEmbed.tsx b/packages/app/src/Element/ZapstrEmbed.tsx index 184254c5..6e225d2b 100644 --- a/packages/app/src/Element/ZapstrEmbed.tsx +++ b/packages/app/src/Element/ZapstrEmbed.tsx @@ -4,7 +4,7 @@ import { NostrEvent, NostrLink } from "@snort/system"; import { ProxyImg } from "Element/ProxyImg"; import ProfileImage from "Element/ProfileImage"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; export default function ZapstrEmbed({ ev }: { ev: NostrEvent }) { const media = ev.tags.find(a => a[0] === "media"); diff --git a/packages/app/src/Pages/DeckLayout.tsx b/packages/app/src/Pages/DeckLayout.tsx index 1be3bf7d..f667ab55 100644 --- a/packages/app/src/Pages/DeckLayout.tsx +++ b/packages/app/src/Pages/DeckLayout.tsx @@ -1,7 +1,7 @@ import "./Deck.css"; import { CSSProperties, createContext, useContext, useEffect, useState } from "react"; import { Outlet, useNavigate } from "react-router-dom"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { NostrLink } from "@snort/system"; import { DeckNav } from "Element/Deck/Nav"; diff --git a/packages/app/src/Pages/DonatePage.tsx b/packages/app/src/Pages/DonatePage.tsx index 2078608b..ffbd9464 100644 --- a/packages/app/src/Pages/DonatePage.tsx +++ b/packages/app/src/Pages/DonatePage.tsx @@ -1,5 +1,5 @@ import { useEffect, useState } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { HexKey } from "@snort/system"; import { ApiHost, KieranPubKey, SnortPubKey } from "Const"; diff --git a/packages/app/src/Pages/ErrorPage.tsx b/packages/app/src/Pages/ErrorPage.tsx index b3fcb541..3dfe226c 100644 --- a/packages/app/src/Pages/ErrorPage.tsx +++ b/packages/app/src/Pages/ErrorPage.tsx @@ -1,6 +1,6 @@ import { db } from "Db"; import AsyncButton from "Element/AsyncButton"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { useRouteError } from "react-router-dom"; const ErrorPage = () => { diff --git a/packages/app/src/Pages/HashTagsPage.tsx b/packages/app/src/Pages/HashTagsPage.tsx index 82ef1a88..48d3dbdf 100644 --- a/packages/app/src/Pages/HashTagsPage.tsx +++ b/packages/app/src/Pages/HashTagsPage.tsx @@ -1,6 +1,6 @@ import { useMemo } from "react"; import { useParams } from "react-router-dom"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import Timeline from "Element/Timeline"; import useEventPublisher from "Hooks/useEventPublisher"; diff --git a/packages/app/src/Pages/HelpPage.tsx b/packages/app/src/Pages/HelpPage.tsx index 793fa898..6c583920 100644 --- a/packages/app/src/Pages/HelpPage.tsx +++ b/packages/app/src/Pages/HelpPage.tsx @@ -1,6 +1,6 @@ import { Link } from "react-router-dom"; import { KieranPubKey } from "Const"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { TLVEntryType, encodeTLVEntries, NostrPrefix } from "@snort/system"; import { bech32ToHex } from "SnortUtils"; diff --git a/packages/app/src/Pages/NostrAddressPage.tsx b/packages/app/src/Pages/NostrAddressPage.tsx index 96c2436c..f561a393 100644 --- a/packages/app/src/Pages/NostrAddressPage.tsx +++ b/packages/app/src/Pages/NostrAddressPage.tsx @@ -1,4 +1,4 @@ -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { ApiHost } from "Const"; import Nip5Service from "Element/Nip5Service"; diff --git a/packages/app/src/Pages/NostrLinkHandler.tsx b/packages/app/src/Pages/NostrLinkHandler.tsx index 6786b05b..8325ce42 100644 --- a/packages/app/src/Pages/NostrLinkHandler.tsx +++ b/packages/app/src/Pages/NostrLinkHandler.tsx @@ -1,6 +1,6 @@ import { NostrPrefix, tryParseNostrLink } from "@snort/system"; import { useEffect, useState } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { useNavigate, useParams } from "react-router-dom"; import Spinner from "Icons/Spinner"; diff --git a/packages/app/src/Pages/ProfilePage.tsx b/packages/app/src/Pages/ProfilePage.tsx index 99093682..def988ff 100644 --- a/packages/app/src/Pages/ProfilePage.tsx +++ b/packages/app/src/Pages/ProfilePage.tsx @@ -1,6 +1,6 @@ import "./ProfilePage.css"; import { useEffect, useState } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { useNavigate, useParams } from "react-router-dom"; import { encodeTLV, diff --git a/packages/app/src/Pages/Root.tsx b/packages/app/src/Pages/Root.tsx index fc488539..cd3da903 100644 --- a/packages/app/src/Pages/Root.tsx +++ b/packages/app/src/Pages/Root.tsx @@ -1,6 +1,6 @@ import { useContext, useEffect, useState } from "react"; import { Link, Outlet, RouteObject, useParams } from "react-router-dom"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { unixNow } from "@snort/shared"; import { NostrLink } from "@snort/system"; diff --git a/packages/app/src/Pages/SettingsPage.tsx b/packages/app/src/Pages/SettingsPage.tsx index 717fede6..3e5fe0c9 100644 --- a/packages/app/src/Pages/SettingsPage.tsx +++ b/packages/app/src/Pages/SettingsPage.tsx @@ -1,4 +1,4 @@ -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { Outlet, RouteObject, useNavigate } from "react-router-dom"; import SettingsIndex from "Pages/settings/Root"; import Profile from "Pages/settings/Profile"; diff --git a/packages/app/src/Pages/new/GetVerified.tsx b/packages/app/src/Pages/new/GetVerified.tsx index 273de69e..bf38616a 100644 --- a/packages/app/src/Pages/new/GetVerified.tsx +++ b/packages/app/src/Pages/new/GetVerified.tsx @@ -1,5 +1,5 @@ import { useState } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { useNavigate } from "react-router-dom"; import { useUserProfile } from "@snort/system-react"; diff --git a/packages/app/src/Pages/new/NewUserFlow.tsx b/packages/app/src/Pages/new/NewUserFlow.tsx index 4c780d7e..e1a1c1e6 100644 --- a/packages/app/src/Pages/new/NewUserFlow.tsx +++ b/packages/app/src/Pages/new/NewUserFlow.tsx @@ -1,4 +1,4 @@ -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { useNavigate } from "react-router-dom"; import Logo from "Element/Logo"; diff --git a/packages/app/src/Pages/settings/Accounts.tsx b/packages/app/src/Pages/settings/Accounts.tsx index 1fb0a987..b961d11d 100644 --- a/packages/app/src/Pages/settings/Accounts.tsx +++ b/packages/app/src/Pages/settings/Accounts.tsx @@ -1,4 +1,4 @@ -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { Link } from "react-router-dom"; import ProfilePreview from "Element/ProfilePreview"; diff --git a/packages/app/src/Pages/settings/Keys.tsx b/packages/app/src/Pages/settings/Keys.tsx index f4f3f626..c8cce209 100644 --- a/packages/app/src/Pages/settings/Keys.tsx +++ b/packages/app/src/Pages/settings/Keys.tsx @@ -1,5 +1,5 @@ import "./Keys.css"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { encodeTLV, NostrPrefix, PinEncrypted } from "@snort/system"; import Copy from "Element/Copy"; diff --git a/packages/app/src/Pages/settings/Moderation.tsx b/packages/app/src/Pages/settings/Moderation.tsx index c48cb92f..b38cf2ba 100644 --- a/packages/app/src/Pages/settings/Moderation.tsx +++ b/packages/app/src/Pages/settings/Moderation.tsx @@ -3,7 +3,7 @@ import useLogin from "Hooks/useLogin"; import { setAppData } from "Login"; import { appendDedupe } from "SnortUtils"; import { useState } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; export function ModerationSettings() { const login = useLogin(); diff --git a/packages/app/src/Pages/settings/Profile.tsx b/packages/app/src/Pages/settings/Profile.tsx index de6542b0..10fccf1e 100644 --- a/packages/app/src/Pages/settings/Profile.tsx +++ b/packages/app/src/Pages/settings/Profile.tsx @@ -1,6 +1,6 @@ import "./Profile.css"; import { useEffect, useState } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { useNavigate } from "react-router-dom"; import { mapEventToProfile } from "@snort/system"; import { useUserProfile } from "@snort/system-react"; diff --git a/packages/app/src/Pages/settings/RelayInfo.tsx b/packages/app/src/Pages/settings/RelayInfo.tsx index 6c5bca22..a08e5143 100644 --- a/packages/app/src/Pages/settings/RelayInfo.tsx +++ b/packages/app/src/Pages/settings/RelayInfo.tsx @@ -1,4 +1,4 @@ -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import ProfilePreview from "Element/ProfilePreview"; import useRelayState from "Feed/RelayState"; import { useNavigate, useParams } from "react-router-dom"; diff --git a/packages/app/src/Pages/settings/Relays.tsx b/packages/app/src/Pages/settings/Relays.tsx index 12675895..5699a394 100644 --- a/packages/app/src/Pages/settings/Relays.tsx +++ b/packages/app/src/Pages/settings/Relays.tsx @@ -1,5 +1,5 @@ import { useMemo, useState } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { unixNowMs } from "@snort/shared"; import { randomSample } from "SnortUtils"; diff --git a/packages/app/src/Pages/settings/Root.tsx b/packages/app/src/Pages/settings/Root.tsx index 1fcc8d4e..aa749fc0 100644 --- a/packages/app/src/Pages/settings/Root.tsx +++ b/packages/app/src/Pages/settings/Root.tsx @@ -1,6 +1,6 @@ import "./Root.css"; import { useEffect, useMemo } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { Outlet, useLocation, useNavigate } from "react-router-dom"; import Icon from "Icons/Icon"; import { LoginStore, logout } from "Login"; diff --git a/packages/app/src/Pages/settings/WalletSettings.tsx b/packages/app/src/Pages/settings/WalletSettings.tsx index 26540973..b42bc0af 100644 --- a/packages/app/src/Pages/settings/WalletSettings.tsx +++ b/packages/app/src/Pages/settings/WalletSettings.tsx @@ -1,6 +1,6 @@ import "./WalletSettings.css"; import LndLogo from "lnd-logo.png"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { Link, RouteObject, useNavigate } from "react-router-dom"; import BlueWallet from "Icons/BlueWallet"; diff --git a/packages/app/src/Pages/settings/handle/ListHandles.tsx b/packages/app/src/Pages/settings/handle/ListHandles.tsx index 8bef9940..e9883ced 100644 --- a/packages/app/src/Pages/settings/handle/ListHandles.tsx +++ b/packages/app/src/Pages/settings/handle/ListHandles.tsx @@ -1,5 +1,5 @@ import { useEffect, useState } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { Link, useNavigate } from "react-router-dom"; import { ApiHost } from "Const"; diff --git a/packages/app/src/Pages/settings/handle/index.tsx b/packages/app/src/Pages/settings/handle/index.tsx index 5a60b380..0b6e7440 100644 --- a/packages/app/src/Pages/settings/handle/index.tsx +++ b/packages/app/src/Pages/settings/handle/index.tsx @@ -1,4 +1,4 @@ -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { Outlet, RouteObject, useNavigate } from "react-router-dom"; import ListHandles from "./ListHandles"; diff --git a/packages/app/src/Pages/subscribe/ManageSubscription.tsx b/packages/app/src/Pages/subscribe/ManageSubscription.tsx index ea616a3c..6ab33db7 100644 --- a/packages/app/src/Pages/subscribe/ManageSubscription.tsx +++ b/packages/app/src/Pages/subscribe/ManageSubscription.tsx @@ -1,5 +1,5 @@ import { useEffect, useState } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { Link, useNavigate } from "react-router-dom"; import PageSpinner from "Element/PageSpinner"; diff --git a/packages/app/src/Pages/subscribe/index.tsx b/packages/app/src/Pages/subscribe/index.tsx index 58eb6020..627993bc 100644 --- a/packages/app/src/Pages/subscribe/index.tsx +++ b/packages/app/src/Pages/subscribe/index.tsx @@ -1,7 +1,7 @@ import "./index.css"; import { useState } from "react"; -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { RouteObject } from "react-router-dom"; import { formatShort } from "Number"; diff --git a/packages/app/src/Tasks/DonateTask.tsx b/packages/app/src/Tasks/DonateTask.tsx index 0d1b8518..3e4ab3bf 100644 --- a/packages/app/src/Tasks/DonateTask.tsx +++ b/packages/app/src/Tasks/DonateTask.tsx @@ -1,4 +1,4 @@ -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { Link } from "react-router-dom"; import { BaseUITask } from "Tasks"; diff --git a/packages/app/src/Tasks/Nip5Task.tsx b/packages/app/src/Tasks/Nip5Task.tsx index 9087dd69..192af397 100644 --- a/packages/app/src/Tasks/Nip5Task.tsx +++ b/packages/app/src/Tasks/Nip5Task.tsx @@ -1,4 +1,4 @@ -import { FormattedMessage } from "react-intl"; +import FormattedMessage from "@snort/app/src/Element/FormattedMessage"; import { Link } from "react-router-dom"; import { MetadataCache } from "@snort/system"; import { BaseUITask } from "Tasks"; diff --git a/packages/app/webpack.config.js b/packages/app/webpack.config.js index e8e4d021..add49b51 100644 --- a/packages/app/webpack.config.js +++ b/packages/app/webpack.config.js @@ -77,6 +77,7 @@ const config = { : false, new DefinePlugin({ "process.env.APP_NAME": JSON.stringify(appConfig.get('appName')), + "process.env.APP_NAME_CAPITALIZED": JSON.stringify(appConfig.get('appNameCapitalized')), }), ], module: {