jazzymc/homarr
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'tests/add-tests' of https://github.com/ajnart/homarr into tests/add-tests

Browse Source
This commit is contained in:
Manuel
2023-03-29 12:42:51 +02:00
parent ca47f2d240 0506cd542c
commit 41e142634f
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tools/server/getServerSideTranslations.ts
View File

@@ -6,19 +6,13 @@ export const getServerSideTranslations = async (
namespaces: string[], namespaces: string[],
requestLocale?: string, requestLocale?: string,
req?: IncomingMessage, req?: IncomingMessage,
res?: ServerResponse, res?: ServerResponse
) => { ) => {
if (!req || !res) { if (!req || !res) {
return serverSideTranslations( return serverSideTranslations(requestLocale ?? 'en', namespaces);
requestLocale ?? 'en',
namespaces
);
} }
const configLocale = getCookie('config-locale', { req, res }); const configLocale = getCookie('config-locale', { req, res });
return serverSideTranslations( return serverSideTranslations((configLocale ?? requestLocale ?? 'en') as string, namespaces);
(configLocale ?? requestLocale ?? 'en') as string,
namespaces
);
}; };

4
vitest.config.ts
View File

@@ -13,8 +13,6 @@ export default defineConfig({
all: true, all: true,
exclude: ['.next/', '.yarn/', 'data/'], exclude: ['.next/', '.yarn/', 'data/'],
}, },
setupFiles: [ setupFiles: ['./tests/setupVitest.ts'],
'./tests/setupVitest.ts',
],
}, },
}); });