Skip to content

#1982- Improve error message "Something happened" #1983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ssethupathy merged 1 commit into from
Jan 26, 2023
Merged

#1982- Improve error message "Something happened" #1983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sourcecode/www/src/components/ResourceModal/ResourceModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ const ResourceModal = ({ isOpen, onClose, resource }) => {
}

if (error) {
return <div>Noe skjedde</div>;
return <div>{t('something went wrong')}</div>;
}

return (
Expand Down
2 changes: 1 addition & 1 deletion sourcecode/www/src/components/ResourcePage/ResourcePage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ const ResourcePage = ({ filters, showDeleteButton = false }) => {
<Content>
<div style={{ marginTop: 20 }}>
{loading && <CircularProgress />}
{error && <div>{t('Noe skjedde')}</div>}
{error && <div>{t('something went wrong')}</div>}
{!loading && !error && resources && !isGridView && (
<ResourceTable
totalCount={pagination.totalCount}
Expand Down
4 changes: 3 additions & 1 deletion sourcecode/www/src/containers/DefaultFetcher.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import React from 'react';
import { CircularProgress, Alert } from '@mui/material';
import useTranslation from '../hooks/useTranslation';

const DefaultFetcher = ({ useFetchData, children }) => {
const { error, loading, response } = useFetchData;
const { t } = useTranslation();

return (
<>
{loading && !error && <CircularProgress />}
{error && <Alert>Noe skjedde</Alert>}
{error && <Alert>{t('something went wrong')}</Alert>}
{response && children({ response })}
</>
);
Expand Down
1 change: 1 addition & 0 deletions sourcecode/www/src/i18n/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"explanation": "Here you see content that you can use in your course. Drag and drop resources into your modules."
},
"Noe skjedde": "Something happened",
"something went wrong": "A server error occurred. Please try again later. If the problem persists, please contact the site administrator.",
"Fant ingen ressurser": "Didn't find any resources",
"source": {
"h5p": "H5P",
Expand Down