Skip to content

Add translations to times and numbers #1223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## Changed

- Improved status bar styling (#1221)
- Added method to translate last saved time (#1223)

## [0.30.1] - 2025-06-09

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"classnames": "^2.3.2",
"codemirror": "^6.0.1",
"container-query-polyfill": "^1.0.2",
"date-fns": "^2.29.3",
"date-fns": "^4.1.0",
"eslint-config-prettier": "^8.8.0",
"file-saver": "^2.0.5",
"fs-extra": "^9.0.1",
Expand Down
9 changes: 5 additions & 4 deletions src/components/SaveStatus/SaveStatus.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { intlFormatDistance } from "date-fns";

import React, { useState, useEffect } from "react";
import { useSelector } from "react-redux";
import { useTranslation } from "react-i18next";
Expand All @@ -9,9 +7,12 @@ import CloudTickIcon from "../../assets/icons/cloud_tick.svg";
import CloudUploadIcon from "../../assets/icons/cloud_upload.svg";

import "../../assets/stylesheets/SaveStatus.scss";
import { formatRelativeTime } from "../../utils/formatRelativeTime";

const SaveStatus = ({ isMobile = false }) => {
const { t } = useTranslation();
const { t, i18n } = useTranslation();
const locale = i18n.language;

const lastSavedTime = useSelector((state) => state.editor.lastSavedTime);
const saving = useSelector((state) => state.editor.saving);
const [time, setTime] = useState(Date.now());
Expand Down Expand Up @@ -54,7 +55,7 @@ const SaveStatus = ({ isMobile = false }) => {
</div>
<div className="save-status__text">
{t("saveStatus.saved")}{" "}
{intlFormatDistance(lastSavedTime, time, { style: "narrow" })}
{formatRelativeTime(lastSavedTime, time, locale)}
</div>
</>
)}
Expand Down
16 changes: 16 additions & 0 deletions src/utils/formatRelativeTime.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { intlFormatDistance } from "date-fns";

const localeMap = {
"en-US": "en-US",
en: "en-GB",
"fr-FR": "fr",
"es-LA": "es",
};

export const formatRelativeTime = (lastSavedTime, now, languageCode) => {
const locale = localeMap[languageCode] || localeMap.en; // Default to English if no match found;
return intlFormatDistance(lastSavedTime, now, {
style: "narrow",
locale,
});
};
74 changes: 74 additions & 0 deletions src/utils/formatRelativeTime.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
import { formatRelativeTime } from "./formatRelativeTime";

describe("formatRelativeTime", () => {
describe("formats the times for now in different locales", () => {
const now = Date.now();

test("formats relative time in en", () => {
const result = formatRelativeTime(now, now, "en");
expect(result).toEqual("now");
});

test("formats relative time in en-US", () => {
const result = formatRelativeTime(now, now, "en-US");
expect(result).toEqual("now");
});

test("formats relative time in fr-FR", () => {
const result = formatRelativeTime(now, now, "fr-FR");
expect(result).toEqual("maintenant");
});

test("formats relative time in es-LA", () => {
const result = formatRelativeTime(now, now, "es-LA");
expect(result).toEqual("ahora");
});
});
describe("formats the times for one minute ago in different locales", () => {
const oneMinuteAgo = new Date(Date.now() - 60 * 1000); // 1 minute ago

test("formats relative time in en", () => {
const result = formatRelativeTime(oneMinuteAgo, Date.now(), "en");
expect(result).toEqual("1 min ago");
});

test("formats relative time in en-US", () => {
const result = formatRelativeTime(oneMinuteAgo, Date.now(), "en-US");
expect(result).toEqual("1m ago");

Check failure on line 37 in src/utils/formatRelativeTime.test.js

View workflow job for this annotation

GitHub Actions / test

Error: expect(received).toEqual(expected) // deep equality Expected: "1m ago" Received: "1 min. ago" at Object.toEqual (/home/runner/work/editor-ui/editor-ui/src/utils/formatRelativeTime.test.js:37:22) at Promise.then.completed (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/utils.js:298:28) at new Promise (<anonymous>) at callAsyncCircusFn (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/utils.js:231:10) at _callCircusTest (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/run.js:316:40) at _runTest (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/run.js:252:3) at _runTestsForDescribeBlock (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/run.js:126:9) at _runTestsForDescribeBlock (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/run.js:121:9) at _runTestsForDescribeBlock (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/run.js:121:9) at run (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/run.js:71:3) at runAndTransformResultsToJestFormat (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/legacy-code-todo-rewrite/jestAdapterInit.js:122:21) at jestAdapter (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/legacy-code-todo-rewrite/jestAdapter.js:74:19) at runTestInternal (/home/runner/work/editor-ui/editor-ui/node_modules/jest-runner/build/runTest.js:367:16) at runTest (/home/runner/work/editor-ui/editor-ui/node_modules/jest-runner/build/runTest.js:444:34) at Object.worker (/home/runner/work/editor-ui/editor-ui/node_modules/jest-runner/build/testWorker.js:106:12)
});

test("formats relative time in fr-FR", () => {
const result = formatRelativeTime(oneMinuteAgo, Date.now(), "fr-FR");
expect(result).toEqual("-1 min");
});

test("formats relative time in es-LA", () => {
const result = formatRelativeTime(oneMinuteAgo, Date.now(), "es-LA");
expect(result).toEqual("hace 1 min");
});
});

describe("formats the times for one hour ago in different locales", () => {
const oneHourAgo = new Date(Date.now() - 60 * 60 * 1000); // 1 hour ago

test("formats relative time in en", () => {
const result = formatRelativeTime(oneHourAgo, Date.now(), "en");
expect(result).toEqual("1 hr ago");
});

test("formats relative time in en-US", () => {
const result = formatRelativeTime(oneHourAgo, Date.now(), "en-US");
expect(result).toEqual("1h ago");

Check failure on line 61 in src/utils/formatRelativeTime.test.js

View workflow job for this annotation

GitHub Actions / test

Error: expect(received).toEqual(expected) // deep equality Expected: "1h ago" Received: "1 hr. ago" at Object.toEqual (/home/runner/work/editor-ui/editor-ui/src/utils/formatRelativeTime.test.js:61:22) at Promise.then.completed (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/utils.js:298:28) at new Promise (<anonymous>) at callAsyncCircusFn (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/utils.js:231:10) at _callCircusTest (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/run.js:316:40) at _runTest (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/run.js:252:3) at _runTestsForDescribeBlock (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/run.js:126:9) at _runTestsForDescribeBlock (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/run.js:121:9) at _runTestsForDescribeBlock (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/run.js:121:9) at run (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/run.js:71:3) at runAndTransformResultsToJestFormat (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/legacy-code-todo-rewrite/jestAdapterInit.js:122:21) at jestAdapter (/home/runner/work/editor-ui/editor-ui/node_modules/jest-circus/build/legacy-code-todo-rewrite/jestAdapter.js:74:19) at runTestInternal (/home/runner/work/editor-ui/editor-ui/node_modules/jest-runner/build/runTest.js:367:16) at runTest (/home/runner/work/editor-ui/editor-ui/node_modules/jest-runner/build/runTest.js:444:34) at Object.worker (/home/runner/work/editor-ui/editor-ui/node_modules/jest-runner/build/testWorker.js:106:12)
});

test("formats relative time in fr-FR", () => {
const result = formatRelativeTime(oneHourAgo, Date.now(), "fr-FR");
expect(result).toEqual("-1 h");
});

test("formats relative time in es-LA", () => {
const result = formatRelativeTime(oneHourAgo, Date.now(), "es-LA");
expect(result).toEqual("hace 1 h");
});
});
});
14 changes: 6 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1611,7 +1611,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.6, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.24.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.6, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.24.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
version: 7.25.7
resolution: "@babel/runtime@npm:7.25.7"
dependencies:
Expand Down Expand Up @@ -2792,7 +2792,7 @@ __metadata:
css-loader: 4.3.0
curl: ^0.1.4
cypress: 12.12.0
date-fns: ^2.29.3
date-fns: ^4.1.0
dotenv: 8.2.0
dotenv-expand: 5.1.0
dotenv-webpack: 8.1.0
Expand Down Expand Up @@ -7171,12 +7171,10 @@ __metadata:
languageName: node
linkType: hard

"date-fns@npm:^2.29.3":
version: 2.30.0
resolution: "date-fns@npm:2.30.0"
dependencies:
"@babel/runtime": ^7.21.0
checksum: f7be01523282e9bb06c0cd2693d34f245247a29098527d4420628966a2d9aad154bd0e90a6b1cf66d37adcb769cd108cf8a7bd49d76db0fb119af5cdd13644f4
"date-fns@npm:^4.1.0":
version: 4.1.0
resolution: "date-fns@npm:4.1.0"
checksum: fb681b242cccabed45494468f64282a7d375ea970e0adbcc5dcc92dcb7aba49b2081c2c9739d41bf71ce89ed68dd73bebfe06ca35129490704775d091895710b
languageName: node
linkType: hard

Expand Down
Loading