disable auto language detection;

disable languuage switch for now;
Tweak some error logs and messages
This commit is contained in:
Dobromir Popov
2024-04-30 02:51:37 +03:00
parent aa766f4e1e
commit c98b018bb1
7 changed files with 66 additions and 32 deletions

View File

@ -28,26 +28,27 @@ import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs'
export default function App({ Component, pageProps: { session, ...pageProps }, }: AppProps<{ session: Session }>) {
// console.log(pageProps);
const router = useRouter();
const [locale, setLocale] = useState(router.locale || 'bg');
const [messages, setMessages] = useState({});
useEffect(() => {
console.log("Current locale:", router.locale);
async function loadLocaleData() {
// Replace the static import with a fetch request
const res = await fetch(`/api/translations/${router.locale}`);
const res = await fetch(`/api/translations/${locale}`);
if (res.ok) {
const localeMessages = await res.json();
console.log("Loaded messages for locale:", router.locale, localeMessages);
console.log("Loaded messages for locale:", locale, localeMessages);
setMessages(localeMessages);
} else {
const localeMessages = await import(`../content/i18n/${router.locale}.json`); setMessages(localeMessages.default);
const localeMessages = await import(`../content/i18n/${locale}.json`); setMessages(localeMessages.default);
}
console.log("Loaded locale '", router.locale, "' ",);
console.log("Loaded locale '", locale, "' ",);
//console.log("Loaded messages for locale:", router.locale, localeMessages.default);
}
loadLocaleData();
}, [router.locale]);
}, [locale]);
// useEffect(() => {
// async function loadLocaleData() {
@ -101,7 +102,7 @@ export default function App({ Component, pageProps: { session, ...pageProps }, }
return (
<>
<NextIntlClientProvider
locale={router.locale}
locale={'bg'}
timeZone="Europe/Sofia"
messages={messages}
>
@ -110,7 +111,7 @@ export default function App({ Component, pageProps: { session, ...pageProps }, }
<Component {...pageProps} />
</LocalizationProvider>
</SessionProvider>
</NextIntlClientProvider>
</NextIntlClientProvider >
</>
)
}

View File

@ -33,6 +33,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
if (req.method === 'DELETE') {
switch (targetTable) {
case 'publishers':
case 'availabilities':
const targetId = req.query.nextcrud[1];
logger.info('[nextCrud] ' + targetTable + ': ' + targetId + ' DELETED by ' + session.user.email);
break;

View File

@ -49,7 +49,19 @@ export const getServerSideProps = async (context) => {
}
var url = process.env.NEXT_PUBLIC_PUBLIC_URL + "/api/data/publishers/" + context.query.id + "?include=availabilities,assignments,assignments.shift";
console.log("GET PUBLISHER FROM:" + url)
const { data: item } = await axios.get(url);
try {
const { data: item } = await axios.get(url);
} catch (error) {
console.log("error fetching publisher: " + error);
//redirect to message page with message "no account found". get user from session
const user = context.req.session.user;
return {
redirect: {
destination: '/message?message=Този имейл (' + user.email + ') не е регистриран. Моля свържете се с администратора.',
permanent: false,
},
}
}
// item.allShifts = item.assignments.map((a: Assignment[]) => a.shift);