Skip to content

Commit 3304df5

Browse files
committed
align more with react-i18next
1 parent 7aeee65 commit 3304df5

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎example/app.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export const App = () => {
4141
<div class="flex flex-col gap-4">
4242
<h1>
4343
<Trans
44-
key="welcome"
44+
key="nested.welcome"
4545
fallback="Welcome, <bold>{{name}}</bold> (<bold>fallback</bold>)!"
4646
replace={{ name: name() }}
4747
components={{

‎example/locale/de/translation.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
{
2-
"welcome": "Willkommen, <bold>{{name}}</bold>!"
2+
"nested": {
3+
"welcome": "Willkommen, <bold>{{name}}</bold>!"
4+
}
35
}

‎example/locale/en/translation.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
{
2-
"welcome": "Welcome, <bold>{{name}}</bold>!"
2+
"nested": {
3+
"welcome": "Welcome, <bold>{{name}}</bold>!"
4+
}
35
}

‎src/trans.tsx‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
1-
import type {
2-
EffectiveKPrefix,
3-
Namespace,
4-
ParseKeys,
5-
TFunction,
6-
TOptions,
7-
} from "i18next";
1+
import type { Namespace, ParseKeys, TFunction, TOptions } from "i18next";
82
import { type Component, createMemo, type JSX } from "solid-js";
93
import { useTranslation } from "./use-translation.ts";
104

115
export type TransEmbeddedComponent = Component<{ children?: string }>;
126

137
export type TransProps<
8+
Key extends ParseKeys<Ns, TOpt, KPrefix>,
149
Ns extends Namespace,
1510
KPrefix = undefined,
1611
TOpt extends TOptions = TOptions,
1712
> = {
18-
key: ParseKeys<Ns, TOpt, EffectiveKPrefix<KPrefix, TOpt>>;
13+
key: Key | Key[];
1914
fallback?: string;
2015

2116
components?: Record<string, TransEmbeddedComponent>;
@@ -26,11 +21,12 @@ export type TransProps<
2621
};
2722

2823
export const Trans = <
24+
Key extends ParseKeys<Ns, TOpt, KPrefix>,
2925
Ns extends Namespace,
3026
KPrefix = undefined,
3127
TOpt extends TOptions = TOptions,
3228
>(
33-
props: TransProps<Ns, KPrefix, TOpt>,
29+
props: TransProps<Key, Ns, KPrefix, TOpt>,
3430
): JSX.Element => {
3531
const [contextT] = useTranslation(() => props.options?.ns);
3632

0 commit comments

Comments
 (0)