Skip to content

Commit

Permalink
Use consistent spelling of licentiate
Browse files Browse the repository at this point in the history
  • Loading branch information
rikurauhala committed Jul 4, 2024
1 parent c88029c commit ee43ec8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion documentation/numeric_types.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
8 changes: 4 additions & 4 deletions services/frontend/src/common/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down

0 comments on commit ee43ec8

Please sign in to comment.