bubble/yarkov.tech
1
0
Fork 0
mirror of https://github.com/sergeyyarkov/yarkov.tech.git synced 2026-10-11 10:29:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixed language changing on article post page

Browse Source
This commit is contained in:
Sergey Yarkov 2022-08-17 15:01:45 +03:00
parent a8be51891d
commit 8f76011018
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/ArticlePost/ArticlePost.astro
View File

@ -3,6 +3,7 @@ import { createDateFormatter } from "@root/utils";
import { Image } from "@astrojs/image/components"; import { Image } from "@astrojs/image/components";
import ArticleComments from "@components/ArticleComments"; import ArticleComments from "@components/ArticleComments";
import "./ArticlePost.scss"; import "./ArticlePost.scss";
import TranslatedLink from "../TranslatedLink";
export type Props = { export type Props = {
data: ArticleType; data: ArticleType;
@ -20,7 +21,7 @@ const { title, tags, author, published_at } = data;
{ {
tags.map((tag) => ( tags.map((tag) => (
<li> <li>
<a href={`/articles/?tags=${tag.toLocaleLowerCase()}`}>{`${tag}${tags.at(-1) === tag ? "" : ","}`}</a> <TranslatedLink to={`/articles/?tags=${tag.toLocaleLowerCase()}`}>{`${tag}${tags.at(-1) === tag ? "" : ","}`}</TranslatedLink>
</li> </li>
)) ))
} }

6
src/components/LanguageSelect/LanguageSelect.astro
View File

@ -52,6 +52,12 @@ const lang = getLanguageFromURL(Astro.url.pathname);
const pathname = window.location.pathname; const pathname = window.location.pathname;
const url = newLang === DEFAULT_LANGUAGE ? pathname.slice(3) : `${newLang}${pathname}`; const url = newLang === DEFAULT_LANGUAGE ? pathname.slice(3) : `${newLang}${pathname}`;
/* Move user to articles page with new language */
if (window.location.pathname.includes("/blog/")) {
window.location.pathname = `${newLang === DEFAULT_LANGUAGE ? "" : newLang + "/"}` + "articles/";
return;
}
window.location.pathname = url; window.location.pathname = url;
}; };