Merge pull request 'ok last one I promise' (#175 ) from prank into master

Reviewed-on: #175
Merge branch 'master' into prank
2024-04-22 00:55:40 +02:00 · 2024-04-22 00:51:58 +02:00 · 2024-04-22 00:50:44 +02:00
3 changed files with 3 additions and 3 deletions
--- a/frontend/public/i18n/EN.txt
+++ b/frontend/public/i18n/EN.txt
@ -284,7 +284,7 @@ rereg=Reregister in the next year of one of my cursus
 reregsup=Register in a supplementary cursus
 chcur=Change from a cursus to another
 iwouldlike=I would like to :
-newcurr=New curriculum
+newcurr=Actual curriculums
 cursusprereq=The cursus you selected has some prerequisites ensure that your external curriculum data is updated in your profile
 imposecurriculum=Impose a curriculum
 impose=Impose
--- a/frontend/public/i18n/FR.txt
+++ b/frontend/public/i18n/FR.txt
@ -282,7 +282,7 @@ rereg=Me réinscrire dans l'année supérieure
 reregsup=M'inscrire dans un cursus supplémentaire
 chcur=Changer d'un cursus vers un autre
 iwouldlike=Je voudrais :
-newcurr=Nouveau cursus
+newcurr=Cursus actuels
 cursusprereq=Le cursus que vous avez selectionné a des prérequis assurez vous que votre dossier de parcours est a jour dans votre profil
 imposecurriculum=Imposer un cursusgotimposed
 impose=Imposer
--- a/frontend/src/Apps/Profil.vue
+++ b/frontend/src/Apps/Profil.vue
@ -369,7 +369,7 @@
          </div>
        </div>
      </div>
-      <div v-if="windowState === 0" class="moreInfos">
+      <div v-if="windowState === 0 && user.role==='Student'" class="moreInfos">
        <div class = "oldcursus">
            <div class="listTitle">
              {{ i18n("oldcursus") }}
Author	SHA1	Message	Date
LeoMoulin	bd3b03dfea	Merge pull request 'ok last one I promise' (#175 ) from prank into master All checks were successful Build and test backend / Build-backend (push) Successful in 1m28s Details deploy to production / deploy-frontend (push) Successful in 34s Details deploy to production / deploy-backend (push) Successful in 19s Details Build and test FrontEnd / Build-frontend (push) Successful in 30s Details Reviewed-on: #175	2024-04-22 00:55:40 +02:00
LeoMoulin	b38b1ab6b8	Merge branch 'master' into prank All checks were successful Build and test backend / Build-backend (pull_request) Successful in 1m26s Details Build and test FrontEnd / Build-frontend (pull_request) Successful in 32s Details	2024-04-22 00:51:58 +02:00
LeoMoulin	6e0a9a46e5	ok last one I promise All checks were successful Build and test backend / Build-backend (pull_request) Successful in 1m25s Details Build and test FrontEnd / Build-frontend (pull_request) Successful in 31s Details	2024-04-22 00:50:44 +02:00