use Trans as much as possible to ease lingui upgrade to 4.0

commafeed-client/src/components/sidebar/Tree.tsx

@@ -1,4 +1,4 @@
-import { t } from "@lingui/macro"
+import { Trans } from "@lingui/macro"
 import { Box, Stack } from "@mantine/core"
 import { Constants } from "app/constants"
 import {
@@ -27,6 +27,7 @@ const expandedIcon = <TbChevronDown size={16} />
 const collapsedIcon = <TbChevronRight size={16} />
 
 const errorThreshold = 9
+
 export function Tree() {
     const root = useAppSelector(state => state.tree.rootCategory)
     const source = useAppSelector(state => state.entries.source)
@@ -63,7 +64,7 @@ export function Tree() {
     const allCategoryNode = () => (
         <TreeNode
             id={Constants.categories.all.id}
-            name={t`All`}
+            name={<Trans>All</Trans>}
             icon={allIcon}
             unread={categoryUnreadCount(root)}
             selected={source.type === "category" && source.id === Constants.categories.all.id}
@@ -76,7 +77,7 @@ export function Tree() {
     const starredCategoryNode = () => (
         <TreeNode
             id={Constants.categories.starred.id}
-            name={t`Starred`}
+            name={<Trans>Starred</Trans>}
             icon={starredIcon}
             unread={0}
             selected={source.type === "category" && source.id === Constants.categories.starred.id}

commafeed-client/src/components/sidebar/TreeNode.tsx

@@ -5,8 +5,8 @@ import { UnreadCount } from "./UnreadCount"
 
 interface TreeNodeProps {
     id: string
-    name: string
-    icon: ReactNode | string
+    name: ReactNode
+    icon: ReactNode
     unread: number
     selected: boolean
     expanded?: boolean

commafeed-client/src/components/sidebar/TreeSearch.tsx

@@ -1,4 +1,4 @@
-import { t } from "@lingui/macro"
+import { t, Trans } from "@lingui/macro"
 import { Box, Center, Kbd, TextInput } from "@mantine/core"
 import { openSpotlight, SpotlightAction, SpotlightProvider } from "@mantine/spotlight"
 import { redirectToFeed } from "app/slices/redirect"
@@ -11,6 +11,7 @@ import { TbSearch } from "react-icons/tb"
 export interface TreeSearchProps {
     feeds: Subscription[]
 }
+
 export function TreeSearch(props: TreeSearchProps) {
     const dispatch = useAppDispatch()
 
@@ -40,7 +41,7 @@ export function TreeSearch(props: TreeSearchProps) {
             searchIcon={searchIcon}
             searchPlaceholder={t`Search`}
             shortcut="ctrl+k"
-            nothingFoundMessage={t`Nothing found`}
+            nothingFoundMessage={<Trans>Nothing found</Trans>}
         >
             <TextInput
                 placeholder={t`Search`}