Skip to content

Commit 1ec463d

Browse files
dependabot[bot]rodrimaia
dependabot[bot]
and
rodrimaia
authored
chore: bump i18next from 21.9.1 to 22.5.0 in /site (#7812)
* chore: Bump i18next from 21.9.1 to 22.5.0 in /site Bumps [i18next](https://github.com/i18next/i18next) from 21.9.1 to 22.5.0. - [Release notes](https://github.com/i18next/i18next/releases) - [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md) - [Commits](i18next/i18next@v21.9.1...v22.5.0) --- updated-dependencies: - dependency-name: i18next dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix i18n types * prettier --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rodrigo Maia <rodrigo.maia.pereira@gmail.com>
1 parent 634e146 commit 1ec463d

File tree

24 files changed

+102
-99
lines changed

24 files changed

+102
-99
lines changed

‎site/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"formik": "2.4.1",
6565
"front-matter": "4.0.2",
6666
"history": "5.3.0",
67-
"i18next": "21.9.1",
67+
"i18next": "22.5.0",
6868
"jest-environment-jsdom": "29.5.0",
6969
"jest-location-mock": "1.0.9",
7070
"just-debounce-it": "3.1.1",

‎site/src/components/AuditLogRow/AuditLogDescription/AuditLogDescription.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { render } from "testHelpers/renderHelpers"
1111
import { screen } from "@testing-library/react"
1212
import { i18n } from "i18n"
1313

14-
const t = (str: string, variables?: Record<string, unknown>) =>
14+
const t = (str: string, variables: Record<string, unknown>) =>
1515
i18n.t<string>(str, variables)
1616

1717
const getByTextContent = (text: string) => {

‎site/src/components/EditRolesButton/EditRolesButton.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export const EditRolesButton: FC<EditRolesButtonProps> = ({
7777
ref={anchorRef}
7878
size="small"
7979
className={styles.editButton}
80-
title={t("editUserRolesTooltip")}
80+
title={t("editUserRolesTooltip") || ""}
8181
onClick={() => setIsOpen(true)}
8282
>
8383
<EditSquare />
@@ -101,7 +101,7 @@ export const EditRolesButton: FC<EditRolesButtonProps> = ({
101101
<fieldset
102102
className={styles.fieldset}
103103
disabled={isLoading}
104-
title={t("fieldSetRolesTooltip")}
104+
title={t("fieldSetRolesTooltip") || ""}
105105
>
106106
<Stack className={styles.options} spacing={3}>
107107
{roles.map((role) => (

‎site/src/components/Form/Form.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ export const FormFooter: FC<BaseFormFooterProps> = (props) => {
118118
/>
119119
)
120120
}
121+
const getFlexDirection = ({ direction }: FormContextValue = {}):
122+
| "row"
123+
| "column" =>
124+
direction === "horizontal" ? ("row" as const) : ("column" as const)
121125

122126
const useStyles = makeStyles((theme) => ({
123127
form: {
@@ -136,8 +140,7 @@ const useStyles = makeStyles((theme) => ({
136140
alignItems: "flex-start",
137141
gap: ({ direction }: FormContextValue = {}) =>
138142
direction === "horizontal" ? theme.spacing(15) : theme.spacing(3),
139-
flexDirection: ({ direction }: FormContextValue = {}) =>
140-
direction === "horizontal" ? "row" : "column",
143+
flexDirection: getFlexDirection,
141144

142145
[theme.breakpoints.down("md")]: {
143146
flexDirection: "column",
@@ -156,7 +159,7 @@ const useStyles = makeStyles((theme) => ({
156159

157160
[theme.breakpoints.down("md")]: {
158161
width: "100%",
159-
position: "initial",
162+
position: "initial" as const,
160163
},
161164
},
162165

‎site/src/components/Resources/AgentStatus.tsx

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,27 @@ import Link from "@mui/material/Link"
1919
// connected:ready, connected:shutting_down, connected:shutdown_timeout,
2020
// connected:shutdown_error, connected:off.
2121

22-
const ReadyLifecycle: React.FC = () => {
22+
const ReadyLifecycle = () => {
2323
const styles = useStyles()
2424
const { t } = useTranslation("workspacePage")
2525

2626
return (
2727
<div
2828
role="status"
29-
aria-label={t("agentStatus.connected.ready")}
29+
aria-label={t("agentStatus.connected.ready") || "Ready"}
3030
className={combineClasses([styles.status, styles.connected])}
3131
/>
3232
)
3333
}
3434

3535
const StartingLifecycle: React.FC = () => {
3636
const styles = useStyles()
37-
const { t } = useTranslation("workspacePage")
3837

3938
return (
40-
<Tooltip title={t("agentStatus.connected.starting")}>
39+
<Tooltip title="Starting...">
4140
<div
4241
role="status"
43-
aria-label={t("agentStatus.connected.starting")}
42+
aria-label="Starting..."
4443
className={combineClasses([styles.status, styles.connecting])}
4544
/>
4645
</Tooltip>
@@ -135,13 +134,12 @@ const StartErrorLifecycle: React.FC<{
135134

136135
const ShuttingDownLifecycle: React.FC = () => {
137136
const styles = useStyles()
138-
const { t } = useTranslation("workspacePage")
139137

140138
return (
141-
<Tooltip title={t("agentStatus.connected.shuttingDown")}>
139+
<Tooltip title="Stopping...">
142140
<div
143141
role="status"
144-
aria-label={t("agentStatus.connected.shuttingDown")}
142+
aria-label="Stopping..."
145143
className={combineClasses([styles.status, styles.connecting])}
146144
/>
147145
</Tooltip>
@@ -236,13 +234,12 @@ const ShutdownErrorLifecycle: React.FC<{
236234

237235
const OffLifecycle: React.FC = () => {
238236
const styles = useStyles()
239-
const { t } = useTranslation("workspacePage")
240237

241238
return (
242-
<Tooltip title={t("agentStatus.connected.off")}>
239+
<Tooltip title="Stopped">
243240
<div
244241
role="status"
245-
aria-label={t("agentStatus.connected.off")}
242+
aria-label="Stopped"
246243
className={combineClasses([styles.status, styles.disconnected])}
247244
/>
248245
</Tooltip>
@@ -289,13 +286,12 @@ const ConnectedStatus: React.FC<{
289286

290287
const DisconnectedStatus: React.FC = () => {
291288
const styles = useStyles()
292-
const { t } = useTranslation("workspacePage")
293289

294290
return (
295-
<Tooltip title={t("agentStatus.disconnected")}>
291+
<Tooltip title="Disconnected">
296292
<div
297293
role="status"
298-
aria-label={t("agentStatus.disconnected")}
294+
aria-label="Disconnected"
299295
className={combineClasses([styles.status, styles.disconnected])}
300296
/>
301297
</Tooltip>
@@ -304,13 +300,12 @@ const DisconnectedStatus: React.FC = () => {
304300

305301
const ConnectingStatus: React.FC = () => {
306302
const styles = useStyles()
307-
const { t } = useTranslation("workspacePage")
308303

309304
return (
310-
<Tooltip title={t("agentStatus.connecting")}>
305+
<Tooltip title="Connecting...">
311306
<div
312307
role="status"
313-
aria-label={t("agentStatus.connecting")}
308+
aria-label="Connecting..."
314309
className={combineClasses([styles.status, styles.connecting])}
315310
/>
316311
</Tooltip>

‎site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,22 @@ const validationSchema = Yup.object({
7171
),
7272
description: Yup.string().max(
7373
MAX_DESCRIPTION_CHAR_LIMIT,
74-
i18next.t("form.error.descriptionMax", { ns: "createTemplatePage" }),
74+
"Please enter a description that is less than or equal to 128 characters.",
7575
),
7676
icon: Yup.string().optional(),
7777
default_ttl_hours: Yup.number()
7878
.integer()
79-
.min(
80-
0,
81-
i18next.t("form.error.defaultTTLMin", { ns: "templateSettingsPage" }),
82-
)
79+
.min(0, "Default time until autostop must not be less than 0.")
8380
.max(
8481
24 * MAX_TTL_DAYS /* 7 days in hours */,
85-
i18next.t("form.error.defaultTTLMax", { ns: "templateSettingsPage" }),
82+
"Please enter a limit that is less than or equal to 168 hours (7 days).",
8683
),
8784
max_ttl_hours: Yup.number()
8885
.integer()
89-
.min(0, i18next.t("form.error.maxTTLMin", { ns: "templateSettingsPage" }))
86+
.min(0, "Maximum time until autostop must not be less than 0.")
9087
.max(
9188
24 * MAX_TTL_DAYS /* 7 days in hours */,
92-
i18next.t("form.error.maxTTLMax", { ns: "templateSettingsPage" }),
89+
"Please enter a limit that is less than or equal to 168 hours(7 days).",
9390
),
9491
})
9592

@@ -223,8 +220,8 @@ export const CreateTemplateForm: FC<CreateTemplateFormProps> = ({
223220
<HorizontalForm onSubmit={form.handleSubmit}>
224221
{/* General info */}
225222
<FormSection
226-
title={t("form.generalInfo.title")}
227-
description={t("form.generalInfo.description")}
223+
title="General info"
224+
description="The name is used to identify the template in URLs and the API. It must be unique within your organization."
228225
>
229226
<FormFields>
230227
{starterTemplate ? (
@@ -255,8 +252,8 @@ export const CreateTemplateForm: FC<CreateTemplateFormProps> = ({
255252

256253
{/* Display info */}
257254
<FormSection
258-
title={t("form.displayInfo.title")}
259-
description={t("form.displayInfo.description")}
255+
title="Display info"
256+
description="Give your template a friendly name, description, and icon."
260257
>
261258
<FormFields>
262259
<TextField
@@ -288,8 +285,8 @@ export const CreateTemplateForm: FC<CreateTemplateFormProps> = ({
288285

289286
{/* Schedule */}
290287
<FormSection
291-
title={t("form.schedule.title")}
292-
description={t("form.schedule.description")}
288+
title="Schedule"
289+
description="Define when workspaces created from this template automatically stop."
293290
>
294291
<FormFields>
295292
<Stack direction="row" className={styles.ttlFields}>
@@ -384,8 +381,8 @@ export const CreateTemplateForm: FC<CreateTemplateFormProps> = ({
384381

385382
{/* Operations */}
386383
<FormSection
387-
title={t("form.operations.title")}
388-
description={t("form.operations.description")}
384+
title="Operations"
385+
description="Regulate actions allowed on workspaces created from this template."
389386
>
390387
<FormFields>
391388
<label htmlFor="allow_user_cancel_workspace_jobs">

‎site/src/pages/CreateTemplatePage/CreateTemplatePage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const CreateTemplatePage: FC = () => {
4747
return (
4848
<>
4949
<Helmet>
50-
<title>{pageTitle(t("title"))}</title>
50+
<title>{pageTitle("Create Template")}</title>
5151
</Helmet>
5252

5353
<FullPageHorizontalForm title={t("title")} onCancel={onCancel}>

‎site/src/pages/CreateTokenPage/CreateTokenForm.tsx

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ export const CreateTokenForm: FC<CreateTokenFormProps> = ({
6262
return (
6363
<HorizontalForm onSubmit={form.handleSubmit}>
6464
<FormSection
65-
title={t("createToken.nameSection.title")}
66-
description={t("createToken.nameSection.description")}
65+
title="Name"
66+
description="What is this token for?"
6767
classes={{ sectionInfo: styles.formSectionInfo }}
6868
>
6969
<FormFields>
@@ -78,16 +78,14 @@ export const CreateTokenForm: FC<CreateTokenFormProps> = ({
7878
</FormFields>
7979
</FormSection>
8080
<FormSection
81-
title={t("createToken.lifetimeSection.title")}
81+
title="Expiration"
8282
description={
8383
form.values.lifetime
84-
? t("createToken.lifetimeSection.description", {
85-
date: dayjs()
86-
.add(form.values.lifetime, "days")
87-
.utc()
88-
.format("MMMM DD, YYYY"),
89-
})
90-
: t("createToken.lifetimeSection.emptyDescription")
84+
? `The token will expire on ${dayjs()
85+
.add(form.values.lifetime, "days")
86+
.utc()
87+
.format("MMMM DD, YYYY")}`
88+
: "Please set a token expiration."
9189
}
9290
classes={{ sectionInfo: styles.formSectionInfo }}
9391
>
@@ -148,11 +146,7 @@ export const CreateTokenForm: FC<CreateTokenFormProps> = ({
148146
<FormFooter
149147
onCancel={() => navigate("/settings/tokens")}
150148
isLoading={isCreating}
151-
submitLabel={
152-
creationFailed
153-
? t("createToken.footer.retry")
154-
: t("createToken.footer.submit")
155-
}
149+
submitLabel={creationFailed ? "Retry" : "Create token"}
156150
/>
157151
</HorizontalForm>
158152
)

‎site/src/pages/CreateTokenPage/CreateTokenPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export const CreateTokenPage: FC = () => {
8585
return (
8686
<>
8787
<Helmet>
88-
<title>{pageTitle(t("createToken.title"))}</title>
88+
<title>{pageTitle("Create Token")}</title>
8989
</Helmet>
9090
{tokenFetchFailed && <ErrorAlert error={tokenFetchError} />}
9191
<FullPageHorizontalForm

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ export const CreateWorkspacePageView: FC<
213213
<UserAutocomplete
214214
value={props.owner}
215215
onChange={props.setOwner}
216-
label={t("ownerLabel")}
216+
label={t("ownerLabel").toString()}
217217
size="medium"
218218
/>
219219
</FormFields>
@@ -291,7 +291,7 @@ export const CreateWorkspacePageView: FC<
291291
<FormFooter
292292
onCancel={props.onCancel}
293293
isLoading={props.creatingWorkspace}
294-
submitLabel={t("createWorkspace")}
294+
submitLabel={t("createWorkspace").toString()}
295295
/>
296296
</HorizontalForm>
297297
</FullPageHorizontalForm>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy