added react-i18next to FE #3682
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,24 +4,11 @@ import StopIcon from "@material-ui/icons/PauseOutlined" | |
| import PlayIcon from "@material-ui/icons/PlayArrowOutlined" | ||
| import { WorkspaceBuild } from "api/typesGenerated" | ||
| import { Pill } from "components/Pill/Pill" | ||
| import i18next from "i18next" | ||
| import React from "react" | ||
| import { PaletteIndex } from "theme/palettes" | ||
| import { getWorkspaceStatus } from "util/workspace" | ||
|
|
||
| const LoadingIcon: React.FC = () => { | ||
| return <CircularProgress size={10} style={{ color: "#FFF" }} /> | ||
| } | ||
|
|
@@ -34,70 +21,72 @@ export const getStatus = ( | |
| icon: React.ReactNode | ||
| } => { | ||
| const status = getWorkspaceStatus(build) | ||
| const { t } = i18next | ||
|
There was a problem hiding this comment. Here is another way we can access translations: directly from There was a problem hiding this comment. Why is the hook preferable when you have the choice? There was a problem hiding this comment. Oh is it because it takes the namespace? There was a problem hiding this comment. Definitely! But also, There was a problem hiding this comment. Great to know. Can you add something to Notion about this? |
||
|
|
||
| switch (status) { | ||
| case undefined: | ||
| return { | ||
| text: t("workspaceStatus.loading", { ns: "common" }), | ||
| icon: <LoadingIcon />, | ||
| } | ||
| case "started": | ||
| return { | ||
| type: "success", | ||
| text: t("workspaceStatus.started", { ns: "common" }), | ||
| icon: <PlayIcon />, | ||
| } | ||
| case "starting": | ||
| return { | ||
| type: "success", | ||
| text: t("workspaceStatus.starting", { ns: "common" }), | ||
| icon: <LoadingIcon />, | ||
| } | ||
| case "stopping": | ||
| return { | ||
| type: "warning", | ||
| text: t("workspaceStatus.stopping", { ns: "common" }), | ||
| icon: <LoadingIcon />, | ||
| } | ||
| case "stopped": | ||
| return { | ||
| type: "warning", | ||
| text: t("workspaceStatus.stopped", { ns: "common" }), | ||
| icon: <StopIcon />, | ||
| } | ||
| case "deleting": | ||
| return { | ||
| type: "warning", | ||
| text: t("workspaceStatus.deleting", { ns: "common" }), | ||
| icon: <LoadingIcon />, | ||
| } | ||
| case "deleted": | ||
| return { | ||
| type: "error", | ||
| text: t("workspaceStatus.deleted", { ns: "common" }), | ||
| icon: <ErrorIcon />, | ||
| } | ||
| case "canceling": | ||
| return { | ||
| type: "warning", | ||
| text: t("workspaceStatus.canceling", { ns: "common" }), | ||
| icon: <LoadingIcon />, | ||
| } | ||
| case "canceled": | ||
| return { | ||
| type: "warning", | ||
| text: t("workspaceStatus.canceled", { ns: "common" }), | ||
| icon: <ErrorIcon />, | ||
| } | ||
| case "error": | ||
| return { | ||
| type: "error", | ||
| text: t("workspaceStatus.failed", { ns: "common" }), | ||
| icon: <ErrorIcon />, | ||
| } | ||
| case "queued": | ||
| return { | ||
| type: "info", | ||
| text: t("workspaceStatus.queued", { ns: "common" }), | ||
| icon: <LoadingIcon />, | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "workspaceStatus": { | ||
| "loading": "Loading", | ||
| "started": "Running", | ||
| "starting": "Starting", | ||
| "stopping": "Stopping", | ||
| "stopped": "Stopped", | ||
| "deleting": "Deleting", | ||
| "deleted": "Deleted", | ||
| "canceling": "Canceling action", | ||
| "canceled": "Canceled action", | ||
| "failed": "Failed", | ||
| "queued": "Queued" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| import common from "./common.json" | ||
| import workspacePage from "./workspacePage.json" | ||
|
|
||
| export const en = { | ||
| common, | ||
| workspacePage, | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "workspaceScheduleButton": { | ||
| "schedule": "Schedule", | ||
| "editDeadlineMinus": "Subtract one hour", | ||
| "editDeadlinePlus": "Add one hour" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import i18next from "i18next" | ||
| import { initReactI18next } from "react-i18next" | ||
| import { en } from "./en" | ||
|
|
||
| export const defaultNS = "common" | ||
| export const resources = { en } as const | ||
|
|
||
| export const i18n = i18next.use(initReactI18next) | ||
|
|
||
| i18n | ||
| .init({ | ||
| fallbackLng: "en", | ||
| interpolation: { | ||
| escapeValue: false, // not needed for react as it escapes by default | ||
| }, | ||
| resources, | ||
| }) | ||
| .catch((error) => { | ||
| // we are catching here to avoid lint's no-floating-promises error | ||
| console.error("[Translation Service]:", error) | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export * from "./i18n" | ||
|
There was a problem hiding this comment. Yeah, I figure this is a good place for one. |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
❓ Why do we import this here? Is that to initialize translations or something?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yup, it's part of the setup!