Merge pull request #585 from 1enify/i18n-2

i18n: Refactor strings with formated numbers

Author: SupertigerDev

src/components/InVoiceActions.tsx

@@ -8,7 +8,7 @@ import RouterEndpoints from "@/common/RouterEndpoints";
 import { CustomLink } from "./ui/CustomLink";
 import { timeSinceDigital } from "@/common/date";
 import Button from "./ui/Button";
-import { useTransContext } from "@nerimity/solid-i18lite";
+import { Trans } from "@nerimity/solid-i18lite";
 
 const InVoiceActionsContainer = styled(FlexColumn)`
   background-color: rgb(15, 15, 15);
@@ -46,8 +46,6 @@ export default function InVoiceActions(props: { style?: JSX.CSSProperties }) {
     return RouterEndpoints.SERVER_MESSAGES(server()?.id!, channel()?.id!);
   };
 
-  const [t] = useTransContext();
-
   return (
     <Show when={channelId()}>
       <InVoiceActionsContainer style={props?.style}>
@@ -59,9 +57,7 @@ export default function InVoiceActions(props: { style?: JSX.CSSProperties }) {
             style={{ padding: "10px", "padding-right": "5px" }}
           />
           <DetailsContainer>
-            <Text size={12}>
-              {t("inVoiceActions.connectedFor")} <CallTime channelId={channelId()!} />
-            </Text>
+            <CallTime channelId={channelId()!} />
             <CustomLink
               href={href()}
               decoration
@@ -197,13 +193,16 @@ function CallTime(props: { channelId: string }) {
     <Show when={channel()?.callJoinedAt}>
       <Text
         size={12}
-        opacity={0.6}
         style={{
-          "margin-left": "auto",
           "font-variant-numeric": "tabular-nums"
         }}
       >
-        {time()}
+        <Trans
+          key="inVoiceActions.connectedFor"
+          options={{ time: time() }}
+        >
+          Connected for <Text size={12} opacity={0.6}>{"time"}</Text>
+        </Trans>
       </Text>
     </Show>
   );

src/components/post-area/PostItem.tsx

@@ -699,7 +699,12 @@ const PollEmbed = (props: { post: Post; poll: RawPostPoll }) => {
       <div class={style.footer}>
         <span class={style.votes}>
           <Text size={12}>
-            {t("posts.voteCount", { count: props.poll._count.votedUsers })}
+            <Trans
+              key="posts.voteCount"
+              options={{ count: props.poll._count.votedUsers }}
+            >
+              <Text size={12} opacity={0.6}>{"count"}</Text> vote(s)
+            </Trans>
           </Text>
         </span>
 

src/locales/list/en-gb.json

@@ -1027,7 +1027,7 @@
     "reposted": "Reposted",
     "repostedBy": "Reposted by",
     "voteButton": "Vote",
-    "voteCount": "{{count}} vote(s)",
+    "voteCount": "<1>{{count}}</1> vote(s)",
     "copyPostButton": "Copy Post",
     "sections": {
       "replies": "Replies ({{count}})",
@@ -1116,7 +1116,7 @@
     "inVoice": "In voice"
   },
   "inVoiceActions": {
-    "connectedFor": "Connected for"
+    "connectedFor": "Connected for <1>{{time}}</1>"
   },
   "informationDrawer": {
     "info": "Info",