## Summary
- Fixed translation key format compatibility with next-intl
- Fixed pluralization format from i18next to next-intl format
- Fixed dynamic translation key error handling
- Updated server components to match API response structure
- Fixed useSearchParams import location
## Changes
- Changed pluralization from `{{count}} items` to `{count} items` format
- Added proper error handling for missing translation keys
- Fixed import paths for next-intl hooks
- Fixed PartyPageClient trying to set non-existent appState.parties
## Test plan
- [x] Verified translations render correctly
- [x] Tested pluralization works with different counts
- [x] Confirmed no console errors about missing translations
- [x] Tested party page functionality
🤖 Generated with [Claude Code](https://claude.ai/code)
---------
Co-authored-by: Claude <noreply@anthropic.com>
76 lines
No EOL
2.4 KiB
TypeScript
76 lines
No EOL
2.4 KiB
TypeScript
import createMiddleware from 'next-intl/middleware'
|
|
import {locales, defaultLocale, type Locale} from './i18n.config'
|
|
import {NextResponse} from 'next/server'
|
|
import type {NextRequest} from 'next/server'
|
|
|
|
const intl = createMiddleware({
|
|
locales,
|
|
defaultLocale,
|
|
localePrefix: 'as-needed' // Show locale in URL when not default
|
|
})
|
|
|
|
const PROTECTED_PATHS = ['/saved', '/profile'] as const
|
|
const MIXED_AUTH_PATHS = ['/api/parties', '/p/'] as const
|
|
|
|
export default function middleware(request: NextRequest) {
|
|
const {pathname} = request.nextUrl
|
|
|
|
// Skip intl middleware for API routes
|
|
if (!pathname.startsWith('/api/')) {
|
|
// Run next-intl for non-API routes (handles locale detection, redirects, etc.)
|
|
const intlResponse = intl(request)
|
|
if (intlResponse) return intlResponse
|
|
}
|
|
const seg = pathname.split('/')[1]
|
|
const pathWithoutLocale = locales.includes(seg as Locale)
|
|
? pathname.slice(seg.length + 1) || '/'
|
|
: pathname
|
|
|
|
const isProtectedPath = PROTECTED_PATHS.some(
|
|
(p) => pathWithoutLocale === p || pathWithoutLocale.startsWith(p + '/')
|
|
)
|
|
const isMixedAuthPath = MIXED_AUTH_PATHS.some(
|
|
(p) => pathWithoutLocale === p || pathWithoutLocale.startsWith(p)
|
|
)
|
|
|
|
const needsAuth =
|
|
isProtectedPath || (isMixedAuthPath && ['POST', 'PUT', 'DELETE'].includes(request.method))
|
|
|
|
if (!needsAuth) return NextResponse.next()
|
|
|
|
const accountCookie = request.cookies.get('account')
|
|
if (!accountCookie?.value) {
|
|
if (pathWithoutLocale.startsWith('/api/')) {
|
|
return NextResponse.json({error: 'Authentication required'}, {status: 401})
|
|
}
|
|
// Preserve locale in redirect
|
|
const url = request.nextUrl.clone()
|
|
url.pathname = '/teams'
|
|
return NextResponse.redirect(url)
|
|
}
|
|
|
|
try {
|
|
const account = JSON.parse(accountCookie.value)
|
|
if (!account.token) {
|
|
if (pathWithoutLocale.startsWith('/api/')) {
|
|
return NextResponse.json({error: 'Authentication required'}, {status: 401})
|
|
}
|
|
const url = request.nextUrl.clone()
|
|
url.pathname = '/teams'
|
|
return NextResponse.redirect(url)
|
|
}
|
|
} catch {
|
|
if (pathWithoutLocale.startsWith('/api/')) {
|
|
return NextResponse.json({error: 'Authentication required'}, {status: 401})
|
|
}
|
|
const url = request.nextUrl.clone()
|
|
url.pathname = '/teams'
|
|
return NextResponse.redirect(url)
|
|
}
|
|
|
|
return NextResponse.next()
|
|
}
|
|
|
|
export const config = {
|
|
matcher: ['/((?!_next|_vercel|.*\\..*).*)']
|
|
} |