marcel/omni-tools
1
0
Fork 0
mirror of https://github.com/iib0011/omni-tools.git synced 2025-09-19 14:09:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: i18n tsc

Browse Source
This commit is contained in:
Ibrahima G. Coulibaly
2025-07-15 19:42:34 +01:00
parent a0bb24c520
commit e7ac590023
7 changed files with 124 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
.idea/workspace.xml generated
View File

@@ -5,8 +5,15 @@
</component>
<component name="ChangeListManager">
<list default="true" id="b30e2810-c4c1-4aad-b134-794e52cc1c7d" name="Changes" comment="fix: broken translations">
<change afterPath="$PROJECT_DIR$/i18next-parser.config.mjs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/@types/i18n.d.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/Hero.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Hero.tsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/i18n/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/i18n/index.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pages/tools/number/generic-calc/index.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/tools/number/generic-calc/index.tsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/tools/defineTool.tsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/tools/defineTool.tsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/tools/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/tools/index.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -256,63 +263,64 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
&quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
&quot;Docker.Dockerfile build.executor&quot;: &quot;Run&quot;,
&quot;Docker.Dockerfile.executor&quot;: &quot;Run&quot;,
&quot;Node.js.add-i18n-to-meta.js.executor&quot;: &quot;Run&quot;,
&quot;Node.js.locize-upload.js.executor&quot;: &quot;Run&quot;,
&quot;Node.js.update-i18n-from-meta.js.executor&quot;: &quot;Run&quot;,
&quot;Playwright.Create transparent PNG.should make png color transparent.executor&quot;: &quot;Run&quot;,
&quot;Playwright.JoinText Component.executor&quot;: &quot;Run&quot;,
&quot;Playwright.JoinText Component.should merge text pieces with specified join character.executor&quot;: &quot;Run&quot;,
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
&quot;Vitest.compute function (1).executor&quot;: &quot;Run&quot;,
&quot;Vitest.compute function.executor&quot;: &quot;Run&quot;,
&quot;Vitest.generatePassword.executor&quot;: &quot;Run&quot;,
&quot;Vitest.mergeText.executor&quot;: &quot;Run&quot;,
&quot;Vitest.mergeText.should merge lines and preserve blank lines when deleteBlankLines is false.executor&quot;: &quot;Run&quot;,
&quot;Vitest.mergeText.should merge lines, preserve blank lines and trailing spaces when both deleteBlankLines and deleteTrailingSpaces are false.executor&quot;: &quot;Run&quot;,
&quot;Vitest.parsePageRanges.executor&quot;: &quot;Run&quot;,
&quot;Vitest.removeDuplicateLines function.executor&quot;: &quot;Run&quot;,
&quot;Vitest.removeDuplicateLines function.newlines option.executor&quot;: &quot;Run&quot;,
&quot;Vitest.removeDuplicateLines function.newlines option.should filter newlines when newlines is set to filter.executor&quot;: &quot;Run&quot;,
&quot;Vitest.replaceText function (regexp mode).should return the original text when passed an invalid regexp.executor&quot;: &quot;Run&quot;,
&quot;Vitest.replaceText function.executor&quot;: &quot;Run&quot;,
&quot;Vitest.timeBetweenDates.executor&quot;: &quot;Run&quot;,
&quot;git-widget-placeholder&quot;: &quot;main&quot;,
&quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
&quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
&quot;last_opened_file_path&quot;: &quot;C:/Users/Ibrahima/IdeaProjects/omni-tools&quot;,
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;npm.build.executor&quot;: &quot;Run&quot;,
&quot;npm.dev.executor&quot;: &quot;Run&quot;,
&quot;npm.i18n:pull.executor&quot;: &quot;Run&quot;,
&quot;npm.i18n:push.executor&quot;: &quot;Run&quot;,
&quot;npm.i18n:sync.executor&quot;: &quot;Run&quot;,
&quot;npm.lint.executor&quot;: &quot;Run&quot;,
&quot;npm.prebuild.executor&quot;: &quot;Run&quot;,
&quot;npm.script:create:tool.executor&quot;: &quot;Run&quot;,
&quot;npm.test.executor&quot;: &quot;Run&quot;,
&quot;npm.test:e2e.executor&quot;: &quot;Run&quot;,
&quot;npm.test:e2e:run.executor&quot;: &quot;Run&quot;,
&quot;prettierjs.PrettierConfiguration.Package&quot;: &quot;C:\\Users\\Ibrahima\\IdeaProjects\\omni-tools\\node_modules\\prettier&quot;,
&quot;project.structure.last.edited&quot;: &quot;Problems&quot;,
&quot;project.structure.proportion&quot;: &quot;0.0&quot;,
&quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;refactai_advanced_settings&quot;,
&quot;ts.external.directory.path&quot;: &quot;C:\\Users\\Ibrahima\\IdeaProjects\\omni-tools\\node_modules\\typescript\\lib&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"ASKED_ADD_EXTERNAL_FILES": "true",
"ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
"Docker.Dockerfile build.executor": "Run",
"Docker.Dockerfile.executor": "Run",
"Node.js.add-i18n-to-meta.js.executor": "Run",
"Node.js.locize-upload.js.executor": "Run",
"Node.js.update-i18n-from-meta.js.executor": "Run",
"Playwright.Create transparent PNG.should make png color transparent.executor": "Run",
"Playwright.JoinText Component.executor": "Run",
"Playwright.JoinText Component.should merge text pieces with specified join character.executor": "Run",
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.git.unshallow": "true",
"Vitest.compute function (1).executor": "Run",
"Vitest.compute function.executor": "Run",
"Vitest.generatePassword.executor": "Run",
"Vitest.mergeText.executor": "Run",
"Vitest.mergeText.should merge lines and preserve blank lines when deleteBlankLines is false.executor": "Run",
"Vitest.mergeText.should merge lines, preserve blank lines and trailing spaces when both deleteBlankLines and deleteTrailingSpaces are false.executor": "Run",
"Vitest.parsePageRanges.executor": "Run",
"Vitest.removeDuplicateLines function.executor": "Run",
"Vitest.removeDuplicateLines function.newlines option.executor": "Run",
"Vitest.removeDuplicateLines function.newlines option.should filter newlines when newlines is set to filter.executor": "Run",
"Vitest.replaceText function (regexp mode).should return the original text when passed an invalid regexp.executor": "Run",
"Vitest.replaceText function.executor": "Run",
"Vitest.timeBetweenDates.executor": "Run",
"git-widget-placeholder": "main",
"ignore.virus.scanning.warn.message": "true",
"kotlin-language-version-configured": "true",
"last_opened_file_path": "C:/Users/Ibrahima/IdeaProjects/omni-tools",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"npm.build.executor": "Run",
"npm.dev.executor": "Run",
"npm.i18n:extract.executor": "Run",
"npm.i18n:pull.executor": "Run",
"npm.i18n:push.executor": "Run",
"npm.i18n:sync.executor": "Run",
"npm.lint.executor": "Run",
"npm.prebuild.executor": "Run",
"npm.script:create:tool.executor": "Run",
"npm.test.executor": "Run",
"npm.test:e2e.executor": "Run",
"npm.test:e2e:run.executor": "Run",
"prettierjs.PrettierConfiguration.Package": "C:\\Users\\Ibrahima\\IdeaProjects\\omni-tools\\node_modules\\prettier",
"project.structure.last.edited": "Problems",
"project.structure.proportion": "0.0",
"project.structure.side.proportion": "0.2",
"settings.editor.selected.configurable": "refactai_advanced_settings",
"ts.external.directory.path": "C:\\Users\\Ibrahima\\IdeaProjects\\omni-tools\\node_modules\\typescript\\lib",
"vue.rearranger.settings.migration": "true"
}
}</component>
}]]></component>
<component name="ReactDesignerToolWindowState">
<option name="myId2Visible">
<map>
@@ -338,7 +346,7 @@
<recent name="C:\Users\Ibrahima\IdeaProjects\omni-tools\src\pages\categories" />
</key>
</component>
<component name="RunManager" selected="npm.i18n:sync">
<component name="RunManager" selected="npm.dev">
<configuration name="generatePassword" type="JavaScriptTestRunnerVitest" temporary="true" nameIsGenerated="true">
<node-interpreter value="project" />
<vitest-package value="$PROJECT_DIR$/node_modules/vitest" />
@@ -412,8 +420,8 @@
</list>
<recent_temporary>
<list>
<item itemvalue="npm.i18n:sync" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.i18n:sync" />
<item itemvalue="Vitest.generatePassword" />
<item itemvalue="npm.i18n:push" />
<item itemvalue="npm.i18n:pull" />

33
src/@types/i18n.d.ts vendored Normal file
View File

@@ -0,0 +1,33 @@
import 'i18next';
import translation from '../../public/locales/en/translation.json';
import string from '../../public/locales/en/string.json';
import number from '../../public/locales/en/number.json';
import video from '../../public/locales/en/video.json';
import list from '../../public/locales/en/list.json';
import json from '../../public/locales/en/json.json';
import time from '../../public/locales/en/time.json';
import csv from '../../public/locales/en/csv.json';
import pdf from '../../public/locales/en/pdf.json';
import audio from '../../public/locales/en/audio.json';
import xml from '../../public/locales/en/xml.json';
import image from '../../public/locales/en/image.json';
declare module 'i18next' {
interface CustomTypeOptions {
resources: {
translation: typeof translation;
string: typeof string;
number: typeof number;
video: typeof video;
list: typeof list;
json: typeof json;
time: typeof time;
csv: typeof csv;
pdf: typeof pdf;
audio: typeof audio;
xml: typeof xml;
image: typeof image;
};
}
}

26
src/components/Hero.tsx
View File

@@ -18,7 +18,7 @@ import { useNavigate } from 'react-router-dom';
import { Icon } from '@iconify/react';
import { getToolCategoryTitle } from '@utils/string';
import { useTranslation } from 'react-i18next';
import { validNamespaces } from '../i18n';
import { FullI18nKey, validNamespaces } from '../i18n';
import {
getBookmarkedToolPaths,
isBookmarked,
@@ -42,7 +42,7 @@ const GroupItems = styled('ul')({
});
type ToolInfo = {
label: string;
label: FullI18nKey;
url: string;
};
@@ -58,39 +58,39 @@ export default function Hero() {
const exampleTools: ToolInfo[] = [
{
label: t('translation:hero.examples.createTransparentImage'),
label: 'translation:hero.examples.createTransparentImage',
url: '/image-generic/create-transparent'
},
{
label: t('translation:hero.examples.prettifyJson'),
label: 'translation:hero.examples.prettifyJson',
url: '/json/prettify'
},
{
label: t('translation:hero.examples.changeGifSpeed'),
label: 'translation:hero.examples.changeGifSpeed',
url: '/gif/change-speed'
},
{
label: t('translation:hero.examples.sortList'),
label: 'translation:hero.examples.sortList',
url: '/list/sort'
},
{
label: t('translation:hero.examples.compressPng'),
label: 'translation:hero.examples.compressPng',
url: '/png/compress-png'
},
{
label: t('translation:hero.examples.splitText'),
label: 'translation:hero.examples.splitText',
url: '/string/split'
},
{
label: t('translation:hero.examples.splitPdf'),
label: 'translation:hero.examples.splitPdf',
url: '/pdf/split-pdf'
},
{
label: t('translation:hero.examples.trimVideo'),
label: 'translation:hero.examples.trimVideo',
url: '/video/trim'
},
{
label: t('translation:hero.examples.calculateNumberSum'),
label: 'translation:hero.examples.calculateNumberSum',
url: '/number/sum'
}
];
@@ -117,7 +117,7 @@ export default function Hero() {
if (tool === undefined) {
return [];
}
return [{ ...tool, label: t(tool.label) }];
return [tool];
})
: exampleTools;
@@ -256,7 +256,7 @@ export default function Hero() {
}}
>
<Stack direction={'row'} spacing={1} alignItems={'center'}>
<Typography textAlign={'center'}>{tool.label}</Typography>
<Typography textAlign={'center'}>{t(tool.label)}</Typography>
{bookmarkedToolPaths.length > 0 && (
<IconButton
onClick={(e) => {

7
src/i18n/index.ts
View File

@@ -1,8 +1,8 @@
import i18n, { ParseKeys } from 'i18next';
import i18n, { Namespace, ParseKeys } from 'i18next';
import { initReactI18next } from 'react-i18next';
import Backend from 'i18next-http-backend';
export const validNamespaces: (string | 'translation')[] = [
export const validNamespaces = [
'string',
'number',
'video',
@@ -15,7 +15,8 @@ export const validNamespaces: (string | 'translation')[] = [
'xml',
'translation',
'image'
];
] as const satisfies readonly Namespace[];
export type I18nNamespaces = (typeof validNamespaces)[number];
export type FullI18nKey = {
[K in I18nNamespaces]: `${K}:${ParseKeys<K>}`;

7
src/pages/tools/number/generic-calc/index.tsx
View File

@@ -27,6 +27,7 @@ import Typography from '@mui/material/Typography';
import Grid from '@mui/material/Grid';
import useMediaQuery from '@mui/material/useMediaQuery';
import { useTranslation } from 'react-i18next';
import { validNamespaces } from '../../../../i18n';
function numericSolveEquationFor(
equation: string,
@@ -62,7 +63,7 @@ export default async function makeTool(
return function GenericCalc({ title }: ToolComponentProps) {
const { showSnackBar } = useContext(CustomSnackBarContext);
const { t } = useTranslation();
const { t } = useTranslation(validNamespaces);
const theme = useTheme();
const lessThanSmall = useMediaQuery(theme.breakpoints.down('sm'));
@@ -239,7 +240,9 @@ export default async function makeTool(
initialValues={initialValues}
toolInfo={{
title: t(calcData.i18n.name),
description: t(calcData.i18n.longDescription)
description: calcData.i18n.longDescription
? t(calcData.i18n.longDescription)
: undefined
}}
verticalGroups
// @ts-ignore

4
src/tools/defineTool.tsx
View File

@@ -1,7 +1,7 @@
import ToolLayout from '../components/ToolLayout';
import React, { JSXElementConstructor, LazyExoticComponent } from 'react';
import { IconifyIcon } from '@iconify/react';
import { FullI18nKey } from '../i18n';
import { FullI18nKey, validNamespaces } from '../i18n';
import { useTranslation } from 'react-i18next';
export interface ToolMeta {
@@ -63,7 +63,7 @@ export const defineTool = (
shortDescription: i18n.shortDescription,
keywords,
component: function ToolComponent() {
const { t } = useTranslation();
const { t } = useTranslation(validNamespaces);
return (
<ToolLayout
icon={icon}

2
src/tools/index.ts
View File

@@ -144,7 +144,7 @@ const categoriesConfig: {
export const filterTools = (
tools: DefinedTool[],
query: string,
t: TFunction<I18nNamespaces>
t: TFunction<I18nNamespaces[]>
): DefinedTool[] => {
if (!query) return tools;