Skip to content

Commit 620e4c4

Browse files
SiumauricioSiumauricio
authored
Merge pull request #3718 from Dokploy/feat/remove-internationalization
chore(dependencies): update zod version across multiple packages to 3…
2 parents e8bec0a + 125c23e commit 620e4c4

32 files changed

Lines changed: 2577 additions & 2651 deletions

‎apps/api/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"react": "18.2.0",
2121
"react-dom": "18.2.0",
2222
"redis": "4.7.0",
23-
"zod": "^3.25.32"
23+
"zod": "^3.25.76"
2424
},
2525
"devDependencies": {
2626
"@types/node": "^20.16.0",

‎apps/dokploy/components/dashboard/settings/profile/profile-form.tsx‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { zodResolver } from "@hookform/resolvers/zod";
22
import { Loader2, Palette, User } from "lucide-react";
3-
import { useTranslation } from "next-i18next";
43
import { useEffect, useMemo, useRef, useState } from "react";
54
import { useForm } from "react-hook-form";
65
import { toast } from "sonner";
@@ -73,7 +72,6 @@ export const ProfileForm = () => {
7372
isError,
7473
error,
7574
} = api.user.update.useMutation();
76-
const { t } = useTranslation("settings");
7775
const [gravatarHash, setGravatarHash] = useState<string | null>(null);
7876
const colorInputRef = useRef<HTMLInputElement>(null);
7977

@@ -157,10 +155,10 @@ export const ProfileForm = () => {
157155
<div>
158156
<CardTitle className="text-xl flex flex-row gap-2">
159157
<User className="size-6 text-muted-foreground self-center" />
160-
{t("settings.profile.title")}
158+
Account
161159
</CardTitle>
162160
<CardDescription>
163-
{t("settings.profile.description")}
161+
Change the details of your profile here.
164162
</CardDescription>
165163
</div>
166164

@@ -213,12 +211,9 @@ export const ProfileForm = () => {
213211
name="email"
214212
render={({ field }) => (
215213
<FormItem>
216-
<FormLabel>{t("settings.profile.email")}</FormLabel>
214+
<FormLabel>Email</FormLabel>
217215
<FormControl>
218-
<Input
219-
placeholder={t("settings.profile.email")}
220-
{...field}
221-
/>
216+
<Input placeholder="Email" {...field} />
222217
</FormControl>
223218
<FormMessage />
224219
</FormItem>
@@ -233,7 +228,7 @@ export const ProfileForm = () => {
233228
<FormControl>
234229
<Input
235230
type="password"
236-
placeholder={t("settings.profile.password")}
231+
placeholder="Current Password"
237232
{...field}
238233
value={field.value || ""}
239234
/>
@@ -247,13 +242,11 @@ export const ProfileForm = () => {
247242
name="password"
248243
render={({ field }) => (
249244
<FormItem>
250-
<FormLabel>
251-
{t("settings.profile.password")}
252-
</FormLabel>
245+
<FormLabel>Password</FormLabel>
253246
<FormControl>
254247
<Input
255248
type="password"
256-
placeholder={t("settings.profile.password")}
249+
placeholder="Password"
257250
{...field}
258251
value={field.value || ""}
259252
/>
@@ -268,9 +261,7 @@ export const ProfileForm = () => {
268261
name="image"
269262
render={({ field }) => (
270263
<FormItem>
271-
<FormLabel>
272-
{t("settings.profile.avatar")}
273-
</FormLabel>
264+
<FormLabel>Avatar</FormLabel>
274265
<FormControl>
275266
<RadioGroup
276267
onValueChange={(e) => {
@@ -454,7 +445,7 @@ export const ProfileForm = () => {
454445

455446
<div className="flex items-center justify-end gap-2">
456447
<Button type="submit" isLoading={isUpdating}>
457-
{t("settings.common.save")}
448+
Save
458449
</Button>
459450
</div>
460451
</form>

‎apps/dokploy/components/dashboard/settings/servers/actions/show-dokploy-actions.tsx‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { useTranslation } from "next-i18next";
21
import { toast } from "sonner";
32
import { UpdateServerIp } from "@/components/dashboard/settings/web-server/update-server-ip";
43
import { Button } from "@/components/ui/button";
@@ -17,7 +16,6 @@ import { TerminalModal } from "../../web-server/terminal-modal";
1716
import { GPUSupportModal } from "../gpu-support-modal";
1817

1918
export const ShowDokployActions = () => {
20-
const { t } = useTranslation("settings");
2119
const { mutateAsync: reloadServer, isLoading } =
2220
api.settings.reloadServer.useMutation();
2321

@@ -30,13 +28,11 @@ export const ShowDokployActions = () => {
3028
<DropdownMenu>
3129
<DropdownMenuTrigger asChild disabled={isLoading}>
3230
<Button isLoading={isLoading} variant="outline">
33-
{t("settings.server.webServer.server.label")}
31+
Server
3432
</Button>
3533
</DropdownMenuTrigger>
3634
<DropdownMenuContent className="w-56" align="start">
37-
<DropdownMenuLabel>
38-
{t("settings.server.webServer.actions")}
39-
</DropdownMenuLabel>
35+
<DropdownMenuLabel>Actions</DropdownMenuLabel>
4036
<DropdownMenuSeparator />
4137
<DropdownMenuGroup>
4238
<DropdownMenuItem
@@ -51,17 +47,17 @@ export const ShowDokployActions = () => {
5147
}}
5248
className="cursor-pointer"
5349
>
54-
<span>{t("settings.server.webServer.reload")}</span>
50+
<span>Reload</span>
5551
</DropdownMenuItem>
5652
<TerminalModal serverId="local">
57-
<span>{t("settings.common.enterTerminal")}</span>
53+
<span>Terminal</span>
5854
</TerminalModal>
5955
<ShowModalLogs appName="dokploy">
6056
<DropdownMenuItem
6157
className="cursor-pointer"
6258
onSelect={(e) => e.preventDefault()}
6359
>
64-
{t("settings.server.webServer.watchLogs")}
60+
View Logs
6561
</DropdownMenuItem>
6662
</ShowModalLogs>
6763
<GPUSupportModal />
@@ -70,7 +66,7 @@ export const ShowDokployActions = () => {
7066
className="cursor-pointer"
7167
onSelect={(e) => e.preventDefault()}
7268
>
73-
{t("settings.server.webServer.updateServerIp")}
69+
Update Server IP
7470
</DropdownMenuItem>
7571
</UpdateServerIp>
7672

‎apps/dokploy/components/dashboard/settings/servers/actions/show-storage-actions.tsx‎

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { useTranslation } from "next-i18next";
21
import { toast } from "sonner";
32
import { Button } from "@/components/ui/button";
43
import {
@@ -16,7 +15,6 @@ interface Props {
1615
serverId?: string;
1716
}
1817
export const ShowStorageActions = ({ serverId }: Props) => {
19-
const { t } = useTranslation("settings");
2018
const { mutateAsync: cleanAll, isLoading: cleanAllIsLoading } =
2119
api.settings.cleanAll.useMutation();
2220

@@ -64,13 +62,11 @@ export const ShowStorageActions = ({ serverId }: Props) => {
6462
}
6563
variant="outline"
6664
>
67-
{t("settings.server.webServer.storage.label")}
65+
Space
6866
</Button>
6967
</DropdownMenuTrigger>
7068
<DropdownMenuContent className="w-64" align="start">
71-
<DropdownMenuLabel>
72-
{t("settings.server.webServer.actions")}
73-
</DropdownMenuLabel>
69+
<DropdownMenuLabel>Actions</DropdownMenuLabel>
7470
<DropdownMenuSeparator />
7571
<DropdownMenuGroup>
7672
<DropdownMenuItem
@@ -87,9 +83,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
8783
});
8884
}}
8985
>
90-
<span>
91-
{t("settings.server.webServer.storage.cleanUnusedImages")}
92-
</span>
86+
<span>Clean unused images</span>
9387
</DropdownMenuItem>
9488
<DropdownMenuItem
9589
className="w-full cursor-pointer"
@@ -105,9 +99,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
10599
});
106100
}}
107101
>
108-
<span>
109-
{t("settings.server.webServer.storage.cleanUnusedVolumes")}
110-
</span>
102+
<span>Clean unused volumes</span>
111103
</DropdownMenuItem>
112104

113105
<DropdownMenuItem
@@ -124,9 +116,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
124116
});
125117
}}
126118
>
127-
<span>
128-
{t("settings.server.webServer.storage.cleanStoppedContainers")}
129-
</span>
119+
<span>Clean stopped containers</span>
130120
</DropdownMenuItem>
131121

132122
<DropdownMenuItem
@@ -143,9 +133,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
143133
});
144134
}}
145135
>
146-
<span>
147-
{t("settings.server.webServer.storage.cleanDockerBuilder")}
148-
</span>
136+
<span>Clean Docker Builder & System</span>
149137
</DropdownMenuItem>
150138
{!serverId && (
151139
<DropdownMenuItem
@@ -160,9 +148,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
160148
});
161149
}}
162150
>
163-
<span>
164-
{t("settings.server.webServer.storage.cleanMonitoring")}
165-
</span>
151+
<span>Clean Monitoring</span>
166152
</DropdownMenuItem>
167153
)}
168154

@@ -180,7 +166,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
180166
});
181167
}}
182168
>
183-
<span>{t("settings.server.webServer.storage.cleanAll")}</span>
169+
<span>Clean all</span>
184170
</DropdownMenuItem>
185171
</DropdownMenuGroup>
186172
</DropdownMenuContent>

‎apps/dokploy/components/dashboard/settings/servers/actions/show-traefik-actions.tsx‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { useTranslation } from "next-i18next";
21
import { toast } from "sonner";
32
import { AlertBlock } from "@/components/shared/alert-block";
43
import { DialogAction } from "@/components/shared/dialog-action";
@@ -22,7 +21,6 @@ interface Props {
2221
serverId?: string;
2322
}
2423
export const ShowTraefikActions = ({ serverId }: Props) => {
25-
const { t } = useTranslation("settings");
2624
const { mutateAsync: reloadTraefik, isLoading: reloadTraefikIsLoading } =
2725
api.settings.reloadTraefik.useMutation();
2826

@@ -75,13 +73,11 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
7573
}
7674
variant="outline"
7775
>
78-
{t("settings.server.webServer.traefik.label")}
76+
Traefik
7977
</Button>
8078
</DropdownMenuTrigger>
8179
<DropdownMenuContent className="w-56" align="start">
82-
<DropdownMenuLabel>
83-
{t("settings.server.webServer.actions")}
84-
</DropdownMenuLabel>
80+
<DropdownMenuLabel>Actions</DropdownMenuLabel>
8581
<DropdownMenuSeparator />
8682
<DropdownMenuGroup>
8783
<DropdownMenuItem
@@ -100,7 +96,7 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
10096
className="cursor-pointer"
10197
disabled={isReloadHealthCheckExecuting}
10298
>
103-
<span>{t("settings.server.webServer.reload")}</span>
99+
<span>Reload</span>
104100
</DropdownMenuItem>
105101
<ShowModalLogs
106102
appName="dokploy-traefik"
@@ -111,15 +107,15 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
111107
onSelect={(e) => e.preventDefault()}
112108
className="cursor-pointer"
113109
>
114-
{t("settings.server.webServer.watchLogs")}
110+
View Logs
115111
</DropdownMenuItem>
116112
</ShowModalLogs>
117113
<EditTraefikEnv serverId={serverId}>
118114
<DropdownMenuItem
119115
onSelect={(e) => e.preventDefault()}
120116
className="cursor-pointer"
121117
>
122-
<span>{t("settings.server.webServer.traefik.modifyEnv")}</span>
118+
<span>Modify Environment</span>
123119
</DropdownMenuItem>
124120
</EditTraefikEnv>
125121

@@ -176,7 +172,7 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
176172
onSelect={(e) => e.preventDefault()}
177173
className="cursor-pointer"
178174
>
179-
<span>{t("settings.server.webServer.traefik.managePorts")}</span>
175+
<span>Additional Port Mappings</span>
180176
</DropdownMenuItem>
181177
</ManageTraefikPorts>
182178
</DropdownMenuGroup>

‎apps/dokploy/components/dashboard/settings/servers/handle-servers.tsx‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { zodResolver } from "@hookform/resolvers/zod";
22
import { Pencil, PlusIcon } from "lucide-react";
33
import Link from "next/link";
4-
import { useTranslation } from "next-i18next";
54
import { useEffect, useState } from "react";
65
import { useForm } from "react-hook-form";
76
import { toast } from "sonner";
@@ -63,8 +62,6 @@ interface Props {
6362
}
6463

6564
export const HandleServers = ({ serverId, asButton = false }: Props) => {
66-
const { t } = useTranslation("settings");
67-
6865
const utils = api.useUtils();
6966
const [isOpen, setIsOpen] = useState(false);
7067
const { data: canCreateMoreServers, refetch } =
@@ -365,7 +362,7 @@ export const HandleServers = ({ serverId, asButton = false }: Props) => {
365362
name="ipAddress"
366363
render={({ field }) => (
367364
<FormItem>
368-
<FormLabel>{t("settings.terminal.ipAddress")}</FormLabel>
365+
<FormLabel>IP Address</FormLabel>
369366
<FormControl>
370367
<Input placeholder="192.168.1.100" {...field} />
371368
</FormControl>
@@ -379,7 +376,7 @@ export const HandleServers = ({ serverId, asButton = false }: Props) => {
379376
name="port"
380377
render={({ field }) => (
381378
<FormItem>
382-
<FormLabel>{t("settings.terminal.port")}</FormLabel>
379+
<FormLabel>Port</FormLabel>
383380
<FormControl>
384381
<Input
385382
placeholder="22"
@@ -409,7 +406,7 @@ export const HandleServers = ({ serverId, asButton = false }: Props) => {
409406
name="username"
410407
render={({ field }) => (
411408
<FormItem>
412-
<FormLabel>{t("settings.terminal.username")}</FormLabel>
409+
<FormLabel>Username</FormLabel>
413410
<FormControl>
414411
<Input placeholder="root" {...field} />
415412
</FormControl>

‎apps/dokploy/components/dashboard/settings/servers/show-servers.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {
1313
} from "lucide-react";
1414
import Link from "next/link";
1515
import { useRouter } from "next/router";
16-
import { useTranslation } from "next-i18next";
1716
import { toast } from "sonner";
1817
import { AlertBlock } from "@/components/shared/alert-block";
1918
import { DialogAction } from "@/components/shared/dialog-action";
@@ -52,7 +51,6 @@ import { ShowTraefikFileSystemModal } from "./show-traefik-file-system-modal";
5251
import { WelcomeSuscription } from "./welcome-stripe/welcome-suscription";
5352

5453
export const ShowServers = () => {
55-
const { t } = useTranslation("settings");
5654
const router = useRouter();
5755
const query = router.query;
5856
const { data, refetch, isLoading } = api.server.all.useQuery();

0 commit comments

Comments
 (0)