Skip to content

Commit

Permalink
Merge pull request #276 from graasp/271/importZipNotification
Browse files Browse the repository at this point in the history
refactor(import-zip): add translations, update on upload notifications
  • Loading branch information
pyphilia authored Feb 3, 2022
2 parents 617c217 + 2f4c732 commit 9ae44ac
Show file tree
Hide file tree
Showing 4 changed files with 336 additions and 268 deletions.
12 changes: 9 additions & 3 deletions src/components/main/ImportZip.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const ImportZip = () => {
notifier({ type: routines.importZipRoutine.FAILURE, payload: { error } });
};

const onFileAdded = () => {
const onUpload = () => {
notifier({ type: routines.importZipRoutine.REQUEST });
};

Expand All @@ -39,7 +39,7 @@ const ImportZip = () => {
itemId,
onComplete,
onError,
onFileAdded,
onUpload,
}),
);

Expand All @@ -65,11 +65,17 @@ const ImportZip = () => {
return (
<>
<Typography variant="h6">{t('Import a Graasp Archive')}</Typography>
<Typography variant="caption">
<Typography variant="body">
{t(
'You can download your resources from graasp.eu by right clicking and choosing "Download as ZIP".',
)}
</Typography>
<br />
<Typography variant="body">
{t(
'Once your file is accepted, it will take several minutes for all imported files to be available.',
)}
</Typography>
<div id={ZIP_DASHBOARD_UPLOADER_ID}>
<Dashboard
uppy={uppy}
Expand Down
5 changes: 4 additions & 1 deletion src/langs/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@
"Show Item": "Show Item",
"We use cookies and other tracking technologies to improve your browsing experience on our website, to analyze our website traffic, and to understand where our visitors are coming from. By browsing our website, you consent to our use of cookies and other tracking technologies.": "We use cookies and other tracking technologies to improve your browsing experience on our website, to analyze our website traffic, and to understand where our visitors are coming from. By browsing our website, you consent to our use of cookies and other tracking technologies.",
"Accept all": "Accept all",
"Reject non-essential": "Reject non-essential"
"Reject non-essential": "Reject non-essential",
"Import a Graasp Archive": "Import a Graasp Archive",
"You can download your resources from graasp.eu by right clicking and choosing \"Download as ZIP\".": "You can download your resources from graasp.eu by right clicking and choosing \"Download as ZIP\".",
"Once your file is accepted, it will take several minutes for all imported files to be available.": "Once your file is accepted, it will take several minutes for all imported files to be available."
}
}
5 changes: 4 additions & 1 deletion src/langs/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@
"Show Item": "Montrer l'élément",
"We use cookies and other tracking technologies to improve your browsing experience on our website, to analyze our website traffic, and to understand where our visitors are coming from. By browsing our website, you consent to our use of cookies and other tracking technologies.": "Nous utilisons des cookies et d'autres technologies de traçage pour améliorer votre expérience de navigation sur notre site, pour analyser le traffic et d'où viennent nos visiteurs. En naviguant sur notre site web, vous acceptez l'utilisation des cookies et d'autres technologies de traçage.",
"Accept all": "Tout accepter",
"Reject non-essential": "Refuser les cookies optionnels"
"Reject non-essential": "Refuser les cookies optionnels",
"Import a Graasp Archive": "Importer une archive Graasp",
"You can download your resources from graasp.eu by right clicking and choosing \"Download as ZIP\".": "Pour télécharger vos fichiers depuis la plateforme graasp.eu, faites un clique droit et choisissez \"Télécharger en tant que ZIP\".",
"Once your file is accepted, it will take several minutes for all imported files to be available.": "Une fois que votre fichier est accepté, attendez quelques minutes pour que tous vos fichiers soient disponibles."
}
}
Loading

0 comments on commit 9ae44ac

Please sign in to comment.