From be3a2adaff8b9c887ef27f3e6d8d9a1988a4c44f Mon Sep 17 00:00:00 2001 From: Ekaterina Ledeneva <31830048+ekiuled@users.noreply.github.com> Date: Sat, 14 Dec 2024 18:31:29 +0000 Subject: [PATCH] fix: fixed localisation for notes block --- src/models.ts | 1 + src/resolvers/md2html.ts | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/models.ts b/src/models.ts index 16680fd5d..844d4d626 100644 --- a/src/models.ts +++ b/src/models.ts @@ -263,6 +263,7 @@ export interface ResolverOptions { fileExtension: string; outputPath: string; outputBundlePath: string; + lang: string; metadata?: MetaDataOptions; } diff --git a/src/resolvers/md2html.ts b/src/resolvers/md2html.ts index d32ad3db8..ff0ff933f 100644 --- a/src/resolvers/md2html.ts +++ b/src/resolvers/md2html.ts @@ -38,14 +38,14 @@ const FileTransformer: Record = { '.md': MdFileTransformer, }; -const getFileData = async ({fileExtension, metadata, inputPath}: ResolverOptions) => { +const getFileData = async ({fileExtension, metadata, inputPath, lang}: ResolverOptions) => { const {input, allowCustomResources} = ArgvService.getConfig(); const resolvedPath: string = resolve(input, inputPath); const content: string = readFileSync(resolvedPath, 'utf8'); const transformFn: Function = FileTransformer[fileExtension]; - const {result} = transformFn(content, {path: inputPath, root: input}); + const {result} = transformFn(content, {path: inputPath, root: input, lang}); const vars = getVarsPerFile(inputPath); const updatedMetadata = metadata?.isContributorsEnabled @@ -77,14 +77,14 @@ const getFileProps = async (options: ResolverOptions) => { const {inputPath} = options; const {lang: configLang, langs: configLangs, analytics, search} = ArgvService.getConfig(); - const data = await getFileData(options); - const tocBaseLang = inputPath.replace(/\\/g, '/').split('/')[0]; const tocLang = configLangs?.includes(tocBaseLang as Lang) && tocBaseLang; const lang = tocLang || configLang || configLangs?.[0] || Lang.RU; const langs = configLangs?.length ? configLangs : [lang]; + const data = await getFileData({...options, lang}); + const pathname = inputPath.replace(extname(inputPath), ''); return { @@ -217,7 +217,7 @@ export function liquidMd2Html(input: string, vars: Record, path function MdFileTransformer(content: string, transformOptions: FileTransformOptions): Output { const {input, ...options} = ArgvService.getConfig(); - const {path: filePath} = transformOptions; + const {path: filePath, lang} = transformOptions; const plugins = PluginService.getPlugins(); const vars = getVarsPerFile(filePath); @@ -230,6 +230,7 @@ function MdFileTransformer(content: string, transformOptions: FileTransformOptio vars, root, path, + lang, assetsPublicPath: './', getVarsPerFile: getVarsPerRelativeFile, getPublicPath,