crowetic/commerce
1
0
Fork 1
mirror of https://github.com/vercel/commerce.git synced 2025-05-15 14:06:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Locale switcher fix

Browse Source
This commit is contained in:
Henrik Larsson 2023-08-14 09:20:36 +02:00
parent 1ecd47a0f7
commit 616a177058
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/[locale]/[...slug]/page.tsx
View File

@ -22,7 +22,7 @@ export async function generateMetadata({
if (!page) return notFound(); if (!page) return notFound();
return { return {
title: page.seo?.title || page.title, title: `${page.seo?.title || page.title}`,
description: page.seo?.description || page.bodySummary, description: page.seo?.description || page.bodySummary,
openGraph: { openGraph: {
publishedTime: page.createdAt, publishedTime: page.createdAt,

2
components/modules/slider/slider.tsx
View File

@ -5,7 +5,7 @@ import { useEffect, useState } from 'react';
import CategoryCard from '@/components/ui/category-card/category-card'; import CategoryCard from '@/components/ui/category-card/category-card';
import ProductCard from '@/components/ui/product-card/product-card'; import ProductCard from '@/components/ui/product-card/product-card';
import { Carousel, CarouselItem } from 'components/modules/carousel/carousel'; import { Carousel, CarouselItem } from '@/components/modules/carousel/carousel';
interface SliderProps { interface SliderProps {
products: [] | any; products: [] | any;

32
components/ui/locale-switcher/locale-switcher.tsx
View File

@ -9,7 +9,7 @@ import {
import { LanguageIcon } from '@heroicons/react/24/outline'; import { LanguageIcon } from '@heroicons/react/24/outline';
import { useLocale, useTranslations } from 'next-intl'; import { useLocale, useTranslations } from 'next-intl';
import Link from 'next-intl/link'; import Link from 'next-intl/link';
import { usePathname } from 'next/navigation'; // import { usePathname } from 'next/navigation';
import { useState } from 'react'; import { useState } from 'react';
import { supportedLanguages } from '../../../i18n-config'; import { supportedLanguages } from '../../../i18n-config';
@ -22,29 +22,29 @@ import { supportedLanguages } from '../../../i18n-config';
// } // }
export default function LocaleSwitcher() { export default function LocaleSwitcher() {
const pathName = usePathname(); // const pathName = usePathname();
const currentLocale = useLocale(); const currentLocale = useLocale();
const t = useTranslations('ui'); const t = useTranslations('ui');
// const translations = localeData.translations; // const translations = localeData.translations;
const redirectedPathName = (locale: string) => { // const redirectedPathName = (locale: string) => {
if (!pathName) return '/'; // if (!pathName) return '/';
// if (translations.length > 0) { // if (translations.length > 0) {
// const translation = translations.find((obj) => { // const translation = translations.find((obj) => {
// return obj['locale'] === locale; // return obj['locale'] === locale;
// }); // });
// if (translation) { // if (translation) {
// const url = `/${translation['locale']}${translation['slug']}`; // const url = `/${translation['locale']}${translation['slug']}`;
// return url; // return url;
// } // }
// } // }
return `/${locale}`; // return `/${locale}`;
}; // };
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
@ -67,7 +67,7 @@ export default function LocaleSwitcher() {
className={`flex w-full cursor-pointer items-center px-4 py-2 text-sm ${ className={`flex w-full cursor-pointer items-center px-4 py-2 text-sm ${
currentLocale == locale.id && 'font-bold' currentLocale == locale.id && 'font-bold'
}`} }`}
href={redirectedPathName(locale.id)} href={'/'}
> >
{locale.title} {locale.title}
</Link> </Link>