Skip to content

Commit

Permalink
Merge pull request #2049 from ever-co/fix/lang
Browse files Browse the repository at this point in the history
fix: kanaban lang error
  • Loading branch information
evereq authored Jan 3, 2024
2 parents 0340825 + b062b7b commit c54fe3e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
4 changes: 3 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,9 @@
"Proguard",
"horcrux",
"dimesions",
"Ordereds"
"Ordereds",
"uidotdev",
"usehooks"
],
"useGitignore": true,
"ignorePaths": [
Expand Down
9 changes: 6 additions & 3 deletions apps/web/app/[locale]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { useState } from 'react';
import { IssuesView } from '@app/constants';
import { TableCellsIcon, QueueListIcon, Squares2X2Icon } from '@heroicons/react/24/solid';
import { useNetworkState } from '@uidotdev/usehooks';
import KanbanIcon from '@components/ui/svgs/kanaban';
import KanbanIcon from '@components/ui/svgs/kanban';
import Offline from '@components/pages/offline';
import UserTeamTableHeader from 'lib/features/team/user-team-table/user-team-table-header';
import { useTranslations } from 'next-intl';
Expand Down Expand Up @@ -51,7 +51,10 @@ function MainPage({ pageProps }: AppProps<MyAppProps>) {

const { isTeamMember, isTrackingEnabled, activeTeam } = useOrganizationTeams();

const breadcrumb = [{title: JSON.parse(t('pages.home.BREADCRUMB')), href: '/'}, { title: activeTeam?.name || '', href:'/'}];
const breadcrumb = [
{ title: JSON.parse(t('pages.home.BREADCRUMB')), href: '/' },
{ title: activeTeam?.name || '', href: '/' }
];
const [view, setView] = useState<IssuesView>(IssuesView.CARDS);
const { online } = useNetworkState();

Expand Down Expand Up @@ -137,7 +140,7 @@ function MainPage({ pageProps }: AppProps<MyAppProps>) {
</Tooltip>
<Tooltip label={'Kanban'} placement="top-start">
<Link
href={'/en/kanban'}
href={'/kanban'}
className={clsxm(
'rounded-md px-3 py-1 text-sm font-medium',
view === IssuesView.KANBAN
Expand Down
File renamed without changes.
7 changes: 4 additions & 3 deletions apps/web/middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@ export const config = {
matcher: [
'/',
'/(en|de|ar|bg|zh|nl|de|he|it|pl|pt|ru|es|fr)/:path*',
// '/((?!_next|_vercel|.*\\..*).*)',
'/((?!api|_next|_vercel|.*\\..*).*)',
'/auth/(.*)',
'/profile/:path*',
'/settings/(.*)',
'/task(.*)',
'/meet(.*)',
'/board(.*)'
'/board(.*)',
'/kanban(.*)'
]
};

Expand All @@ -31,7 +32,7 @@ export async function middleware(request: NextRequest) {
defaultLocale: 'en',
locales: ['en', 'de', 'ar', 'bg', 'zh', 'nl', 'de', 'he', 'it', 'pl', 'pt', 'ru', 'es', 'fr'],
// pathnames,
localePrefix: 'never'
localePrefix: 'as-needed'
});

// Setting cookies on the response
Expand Down

0 comments on commit c54fe3e

Please sign in to comment.