iritmaximus/oodikone
1
0
Fork 0
mirror of https://github.com/UniversityOfHelsinkiCS/oodikone.git synced 2026-10-12 19:03:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use consistent spelling of licentiate

Browse Source
This commit is contained in:
Riku Rauhala
2024-07-04 10:56:40 +03:00
parent c88029c5a1
commit ee43ec89ac
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
documentation/numeric_types.md
+1 -1
View File
@@ -10,7 +10,7 @@ Appears in model Studyright (db: `studyright`) as _extentcode_ (db: `extentcode`
| ----: | :-------------------------------------------------- |
| 1 | Bachelor's degree |
| 2 | Master's degree |
| 3 | Licensiate |
| 3 | Licentiate |
| 4 | Doctor |
| 5 | Bachelor's and Master's degree |
| 6 | Continuing education |
services/frontend/src/common/index.js
+4 -4
View File
@@ -31,13 +31,13 @@ export const getGraduationGraphTitle = (studyProgramme, doCombo = false) => {
return 'Doctoral studyright'
}
export const getUnifiedProgrammeName = (bachelor, masterLisentiate, language) => {
export const getUnifiedProgrammeName = (bachelor, masterLicentiate, language) => {
if (language === 'fi')
return `${bachelor} ja ${
masterLisentiate?.includes('lisensiaatin') ? 'lisensiaatin koulutusohjelma' : 'maisterin koulutusohjelma'
masterLicentiate?.includes('lisensiaatin') ? 'lisensiaatin koulutusohjelma' : 'maisterin koulutusohjelma'
}`
if (language === 'en') return `${bachelor?.split(' ')[0]} and ${masterLisentiate}`
if (language === 'sv') return `${bachelor?.split('programmet')[0]}- och ${masterLisentiate}`
if (language === 'en') return `${bachelor?.split(' ')[0]} and ${masterLicentiate}`
if (language === 'sv') return `${bachelor?.split('programmet')[0]}- och ${masterLicentiate}`
return bachelor
}