From 8f121667f108554de37ea594260cb330564ed4d1 Mon Sep 17 00:00:00 2001 From: 1ilit <1ilit@proton.me> Date: Wed, 16 Jul 2025 20:37:53 +0400 Subject: [PATCH] update date localization --- package-lock.json | 20 +++++------ package.json | 2 +- src/api/gists.js | 2 -- src/components/EditorHeader/Modal/Share.jsx | 1 - .../EditorHeader/SideSheet/Revisions.jsx | 35 +++++++++---------- src/i18n/i18n.js | 14 ++++---- src/i18n/locales/en.js | 4 ++- src/index.css | 2 +- 8 files changed, 39 insertions(+), 41 deletions(-) diff --git a/package-lock.json b/package-lock.json index fb17a5e..558d228 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "jspdf": "^3.0.1", "jszip": "^3.10.1", "lexical": "^0.12.5", - "moment": "^2.30.1", + "luxon": "^3.7.1", "nanoid": "^5.1.5", "node-sql-parser": "^5.3.11", "oracle-sql-parser": "^0.1.0", @@ -4205,6 +4205,15 @@ "yallist": "^3.0.2" } }, + "node_modules/luxon": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.1.tgz", + "integrity": "sha512-RkRWjA926cTvz5rAb1BqyWkKbbjzCGchDUIKMCUvNi17j6f6j8uHGDV82Aqcqtzd+icoYpELmG3ksgGiFNNcNg==", + "license": "MIT", + "engines": { + "node": ">=12" + } + }, "node_modules/markdown-extensions": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/markdown-extensions/-/markdown-extensions-2.0.0.tgz", @@ -5276,15 +5285,6 @@ "node": "*" } }, - "node_modules/moment": { - "version": "2.30.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", - "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", - "license": "MIT", - "engines": { - "node": "*" - } - }, "node_modules/monaco-editor": { "version": "0.52.2", "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.52.2.tgz", diff --git a/package.json b/package.json index a2f2f4c..f60b0f5 100644 --- a/package.json +++ b/package.json @@ -32,8 +32,8 @@ "jspdf": "^3.0.1", "jszip": "^3.10.1", "lexical": "^0.12.5", + "luxon": "^3.7.1", "nanoid": "^5.1.5", - "moment": "^2.30.1", "node-sql-parser": "^5.3.11", "oracle-sql-parser": "^0.1.0", "react": "^18.2.0", diff --git a/src/api/gists.js b/src/api/gists.js index 64ec459..d62c79e 100644 --- a/src/api/gists.js +++ b/src/api/gists.js @@ -41,7 +41,5 @@ export async function getCommits(gistId, perPage = 20, page = 1) { }, }); - console.log(res) - return res.data; } diff --git a/src/components/EditorHeader/Modal/Share.jsx b/src/components/EditorHeader/Modal/Share.jsx index b72e296..87f843c 100644 --- a/src/components/EditorHeader/Modal/Share.jsx +++ b/src/components/EditorHeader/Modal/Share.jsx @@ -66,7 +66,6 @@ export default function Share({ title, setModal }) { useEffect(() => { const updateOrGenerateLink = async () => { - setLoading(true); try { setLoading(true); if (!gistId || gistId === "") { diff --git a/src/components/EditorHeader/SideSheet/Revisions.jsx b/src/components/EditorHeader/SideSheet/Revisions.jsx index 9367889..ca1fc5a 100644 --- a/src/components/EditorHeader/SideSheet/Revisions.jsx +++ b/src/components/EditorHeader/SideSheet/Revisions.jsx @@ -8,20 +8,22 @@ import { IconChevronLeft, } from "@douyinfe/semi-icons"; import { getCommits } from "../../../api/gists"; -import moment from "moment"; +import { DateTime } from "luxon"; export default function Revisions({ open }) { const { gistId } = useContext(IdContext); - const { t } = useTranslation(); + const { t, i18n } = useTranslation(); const [isLoading, setIsLoading] = useState(false); const [revisions, setRevisions] = useState([]); useEffect(() => { const getRevisions = async (gistId) => { - setIsLoading(true); try { + setIsLoading(true); const { data } = await getCommits(gistId); - setRevisions(data); + setRevisions( + data.filter((version) => version.change_status.total !== 0), + ); } catch (e) { console.log(e); Toast.error(t("oops_smth_went_wrong")); @@ -47,36 +49,33 @@ export default function Revisions({ open }) { return (
- } /> + } title="Previous" /> - } /> + } title="Next" />
{!gistId &&
{t("no_saved_revisions")}
} {gistId && (
- console.log(i)} - > + {revisions.map((r, i) => ( { + alert(r.version); + }} title={
{`${t("version")} ${revisions.length - i}`} {r.version.substring(0, 7)}
} - description={ -
-
{`Commited on ${moment( - new Date(r.committed_at), - ).format("MMMM Do YYYY, h:mm")}`}
-
- } + description={`${t("commited_at")} ${DateTime.fromISO( + r.committed_at, + ) + .setLocale(i18n.language) + .toLocaleString(DateTime.DATETIME_MED)}`} icon={} /> ))} diff --git a/src/i18n/i18n.js b/src/i18n/i18n.js index c78cff2..aabbdb0 100644 --- a/src/i18n/i18n.js +++ b/src/i18n/i18n.js @@ -35,10 +35,10 @@ import { pl, polish } from "./locales/pl"; import { no, norwegian } from "./locales/no"; import { sv, swedish } from "./locales/sv-se"; import { ur, urdu } from "./locales/ur"; -import { jp, japanese} from "./locales/jp" -import {ne, nepali} from "./locales/ne" -import {ug, uyghur} from "./locales/ug"; -import {pa_pk,punjabipk } from "./locales/pa-pk"; +import { jp, japanese } from "./locales/jp"; +import { ne, nepali } from "./locales/ne"; +import { ug, uyghur } from "./locales/ug"; +import { pa_pk, punjabipk } from "./locales/pa-pk"; import { cz, czech } from "./locales/cz"; export const languages = [ @@ -80,7 +80,7 @@ export const languages = [ nepali, uyghur, punjabipk, - czech + czech, ].sort((a, b) => a.name.localeCompare(b.name)); i18n @@ -130,8 +130,8 @@ i18n jp, ne, ug, - "pa-PK":pa_pk, - cz + "pa-PK": pa_pk, + cz, }, }); diff --git a/src/i18n/locales/en.js b/src/i18n/locales/en.js index 46df0ab..872e3f1 100644 --- a/src/i18n/locales/en.js +++ b/src/i18n/locales/en.js @@ -9,7 +9,8 @@ const en = { report_bug: "Report a bug", import: "Import", inherits: "Inherits", - merging_column_w_inherited_definition: "Column '{{fieldName}}' in table '{{tableName}}' with inherited definition will be merged", + merging_column_w_inherited_definition: + "Column '{{fieldName}}' in table '{{tableName}}' with inherited definition will be merged", import_from: "Import from", file: "File", new: "New", @@ -262,6 +263,7 @@ const en = { no_saved_revisions: "No saved revisions", version: "Version", record_version: "Record version", + commited_at: "Commited at", }, }; diff --git a/src/index.css b/src/index.css index 0edbc63..697313f 100644 --- a/src/index.css +++ b/src/index.css @@ -69,7 +69,7 @@ .semi-steps-item-content, .semi-steps-item-title { - width: 100%; + width: 100% !important; } .semi-spin-wrapper {