From 9038910303ea0af3827ee98dce7b5ee8212a12d4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 22 Mar 2024 10:36:57 +0100
Subject: [PATCH] phrases

---
 .../controllers/components/stv/Prestudent.php |   5 +-
 .../Studentenverwaltung/Details/Prestudent.js |  92 +--
 .../Details/Prestudent/History.js             |  11 +
 .../Details/Prestudent/Status.js              | 131 ++--
 system/phrasesupdate.php                      | 727 +++++++++++++++---
 5 files changed, 751 insertions(+), 215 deletions(-)

diff --git a/application/controllers/components/stv/Prestudent.php b/application/controllers/components/stv/Prestudent.php
index 7cc6bc768..3b71ff73e 100644
--- a/application/controllers/components/stv/Prestudent.php
+++ b/application/controllers/components/stv/Prestudent.php
@@ -136,6 +136,7 @@ class Prestudent extends FHC_Controller
 		$update_prestudent['updateamum'] = date('c');
 		$update_prestudent['updatevon'] = $uid;
 
+		//utf8-decode for special chars (eg tag der offenen Tür, FH-Führer)
 		function utf8_decode_if_string($value) {
 			if (is_string($value)) {
 				return utf8_decode($value);
@@ -145,9 +146,7 @@ class Prestudent extends FHC_Controller
 		}
 		$update_prestudent_encoded = array_map('utf8_decode_if_string', $update_prestudent);
 
-		//utf8-decode for special chars (eg tag der offenen Tür, FH-Führer)
-		//$update_prestudent_encoded = array_map('utf8_decode', $update_prestudent);
-		var_dump($update_prestudent_encoded);
+
 		if (count($update_prestudent) && $prestudent_id === null) {
 			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
 			// TODO(manu): phrase
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index c56ef4286..008e581fa 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -28,10 +28,6 @@ export default {
 			from: 'hasPrestudentPermission',
 			default: false
 		},
-/*		hasPermissionToSkipStatusCheck: {
-			from: 'hasPermissionToSkipStatusCheck',
-			default: false
-		},*/
 		hasAssistenzPermission: {
 			from: 'hasAssistenzPermission',
 			default: false
@@ -126,29 +122,9 @@ export default {
 						window.scrollTo(0, 0);
 					});
 		},
-/* //besser im watch teil, dann wird Änderung immer verfolgt
-detectChanges() {
-			const delta = {};
-			for (const key in this.data) {
-				if (this.data[key] !== this.initialFormData[key]) {
-					delta[key] = this.data[key];
-					this.actionUpdate = true;
-				}
-			}
-			this.deltaArray.push(delta);
-		},*/
 	},
 	created() {
 		this.loadPrestudent();
-/*		CoreRESTClient
-			.get('components/stv/Prestudent/getHistoryPrestudents/'+ this.modelValue.person_id)
-			.then(result => CoreRESTClient.getData(result.data) || [])
-			.then(result => {
-				this.historyPrestudents = result;
-			})
-			.catch(this.$fhcAlert.handleSystemError);*/
-		//initiale Daten nach dem Laden
-		//this.initialFormData = {...this.data};
 		CoreRESTClient
 			.get('components/stv/Prestudent/getBezeichnungZGV')
 			.then(result => CoreRESTClient.getData(result.data) || [])
@@ -206,7 +182,6 @@ detectChanges() {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	mounted(){},
 	template: `
 	<div class="stv-details-details h-100 pb-3">
 <!--	TEST: {{modelValue}} -->
@@ -215,7 +190,7 @@ detectChanges() {
 			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!deltaLength">Speichern</button>
 		</div>
 			<fieldset class="overflow-hidden">
-				<legend>Zugangsvoraussetzungen für {{modelValue.nachname}} {{modelValue.vorname}}</legend>
+				<legend>{{$p.t('lehre', 'title_zgv')}} {{modelValue.nachname}} {{modelValue.vorname}}</legend>
 
 						<div class="row mb-3">
 							<form-input
@@ -249,7 +224,7 @@ detectChanges() {
 							</form-input>
 							<form-input
 								container-class="col-3"
-								label="ZGV Ort"
+								:label="$p.t('infocenter', 'zgvOrt')"
 								type="text"
 								v-model="data.zgvort"
 								name="zgvort"
@@ -257,7 +232,7 @@ detectChanges() {
 							</form-input>
 							<form-input
 								container-class="col-3"
-								label="ZGV Datum"
+								:label="$p.t('infocenter', 'zgvDatum')"
 								type="DatePicker"
 								v-model="data.zgvdatum"
 								name="zgvdatum"
@@ -271,7 +246,7 @@ detectChanges() {
 							</form-input>
 							<form-input
 								container-class="col-3"
-								label="ZGV Nation"
+								:label="$p.t('infocenter', 'zgvNation')"
 								type="select"
 								v-model="data.zgvnation"
 								name="zgvnation"
@@ -283,7 +258,7 @@ detectChanges() {
 						<div class="row mb-3">
 							<form-input
 								container-class="col-3"
-								label="ZGV Master"
+								:label="$p.t('lehre', 'zgvMaster')"
 								type="select"
 								v-model="data.zgvmas_code"
 								name="zgvmascode"
@@ -292,7 +267,7 @@ detectChanges() {
 							</form-input>
 							<form-input
 								container-class="col-3"
-								label="ZGV Master Ort"
+								:label="$p.t('lehre', 'zgvMasterOrt')"
 								type="text"
 								v-model="data.zgvmaort"
 								name="zgvmaort"
@@ -300,7 +275,7 @@ detectChanges() {
 							</form-input>
 							<form-input
 								container-class="col-3"
-								label="ZGV Master Datum"
+								:label="$p.t('lehre', 'zgvMasterDatum')"
 								type="DatePicker"
 								v-model="data.zgvmadatum"
 								name="zgvmadatum"
@@ -314,7 +289,7 @@ detectChanges() {
 							</form-input>
 							<form-input
 								container-class="col-3"
-								label="ZGV Master Nation"
+								:label="$p.t('lehre', 'zgvMasterNation')"
 								type="select"
 								v-model="data.zgvmanation"
 								name="zgvmanation"
@@ -327,7 +302,7 @@ detectChanges() {
 						<div v-if="showZgvDoktor" class="row mb-3">
 							<form-input
 								container-class="col-3"
-								label="ZGV Doktor"
+								:label="$p.t('lehre', 'zgvDoktor')"
 								type="select"
 								v-model="data.zgvdoktor_code"
 								name="zgvdoktor_code"
@@ -336,7 +311,7 @@ detectChanges() {
 							</form-input>
 							<form-input
 								container-class="col-3"
-								label="ZGV Doktor Ort"
+								:label="$p.t('lehre', 'zgvDoktorOrt')"
 								type="text"
 								v-model="data.zgvdoktorort"
 								name="zgvdoktorort"
@@ -344,7 +319,7 @@ detectChanges() {
 							</form-input>
 							<form-input
 								container-class="col-3"
-								label="ZGV Doktor Datum"
+								:label="$p.t('lehre', 'zgvDoktorDatum')"
 								type="DatePicker"
 								v-model="data.zgvdoktordatum"
 								name="zgvdoktordatum"
@@ -358,7 +333,7 @@ detectChanges() {
 							</form-input>
 							<form-input
 								container-class="col-3"
-								label="ZGV Doktor Nation"
+								:label="$p.t('lehre', 'zgvDoktorNation')"
 								type="select"
 								v-model="data.zgvdoktornation"
 								name="zgvdoktornation"
@@ -372,7 +347,7 @@ detectChanges() {
 							<div class="col-3 pt-4 d-flex align-items-center">
 								<form-input
 									container-class="form-check"
-									label="ZGV erfüllt"
+									:label="$p.t('infocenter', 'zgvErfuellt')"
 									type="checkbox"
 									v-model="data.zgv_erfuellt"
 									name="zgv_erfuellt"
@@ -382,7 +357,7 @@ detectChanges() {
 							<div class="col-3 pt-4 d-flex align-items-center">
 								<form-input
 									container-class="form-check"
-									label="ZGV Master erfüllt"
+									:label="$p.t('infocenter', 'zgvMasterErfuellt')"
 									type="checkbox"
 									v-model="data.zgvmas_erfuellt"
 									name="zgvmas_erfuellt"
@@ -392,7 +367,7 @@ detectChanges() {
 							<div v-if="showZgvDoktor" class="col-3 pt-4 d-flex align-items-center">
 								<form-input
 									container-class="form-check"
-									label="ZGV Doktor erfüllt"
+									:label="$p.t('infocenter', 'zgvDoktorErfuellt')"
 									type="checkbox"
 									v-model="data.zgvdoktor_erfuellt"
 									name="zgvdoktor_erfuellt"
@@ -411,7 +386,7 @@ detectChanges() {
 					<div class="row mb-3">
 						<form-input
 							container-class="col-4"
-							label="Aufmerksam durch"
+							:label="$p.t('person', 'aufmerksamDurch')"
 							type="select"
 							v-model="data.aufmerksamdurch_kurzbz"
 							name="aufmerksamDurch"
@@ -420,7 +395,7 @@ detectChanges() {
 						</form-input>
 						<form-input
 							container-class="col-4"
-							label="Berufstätigkeit"
+							:label="$p.t('person', 'berufstaetigkeit')"
 							type="select"
 							v-model="data.berufstaetigkeit_code"
 							name="berufstaetigkeit_code"
@@ -429,7 +404,7 @@ detectChanges() {
 						</form-input>
 						<form-input
 							container-class="col-4"
-							label="Ausbildung"
+							:label="$p.t('person', 'ausbildung')"
 							type="select"
 							v-model="data.ausbildungcode"
 							name="ausbildungcode"
@@ -452,7 +427,7 @@ detectChanges() {
 						<div class="col-4 pt-4 d-flex align-items-center">
 							<form-input
 								container-class="form-check"
-								label="Facheinschlägig berufstätig"
+								:label="$p.t('person', 'facheinschlaegigBerufstaetig')"
 								type="checkbox"
 								v-model="data.facheinschlberuf"
 								name="facheinschlberuf"
@@ -463,7 +438,7 @@ detectChanges() {
 						<!--Todo(manu) validierung Integer, liste hier null-->
 						<form-input
 							container-class="col-4"
-							label="Bisstandort"
+							:label="$p.t('person', 'bisstandort')"
 							type="text"
 							v-model="data.standort_code"
 							name="standort_code"
@@ -476,7 +451,7 @@ detectChanges() {
 					<div class="row mb-3">
 						<form-input
 							container-class="col-4"
-							label="Studiengang"
+							:label="$p.t('lehre', 'studiengang')"
 							type="select"
 							v-model="data.studiengang_kz"
 							name="studiengang_kz"
@@ -486,7 +461,7 @@ detectChanges() {
 						</form-input>
 						<form-input
 							container-class="col-4"
-							label="Studientyp"
+							:label="$p.t('lehre', 'studientyp')"
 							type="select"
 							v-model="data.gsstudientyp_kurzbz"
 							name="gsstudientyp_kurzbz"
@@ -498,7 +473,7 @@ detectChanges() {
 					<div class="row mb-3">
 						<form-input
 							container-class="col-4"
-							label="Anmerkung"
+							:label="$p.t('global', 'anmerkung')"
 							type="text"
 							v-model="data.anmerkung"
 							name="anmerkung"
@@ -507,7 +482,7 @@ detectChanges() {
 						<div class="col-2 pt-4 d-flex align-items-center">
 							<form-input
 								container-class="form-check"
-								label="Bismelden"
+								:label="$p.t('person', 'bismelden')"
 								type="checkbox"
 								v-model="data.bismelden"
 								name="bismelden"
@@ -517,7 +492,7 @@ detectChanges() {
 						<div class="col-2 pt-4 d-flex align-items-center">
 							<form-input
 								container-class="form-check"
-								label="Duales Studium"
+								:label="$p.t('lehre', 'dual')"
 								type="checkbox"
 								v-model="data.dual"
 								name="dual"
@@ -526,7 +501,7 @@ detectChanges() {
 						</div>
 						<form-input
 							container-class="col-3"
-							label="förderrelevant"
+							:label="$p.t('lehre', 'foerderrelevant')"
 							type="select"
 							v-model="data.foerderrelevant"
 							name="foerderrelevant"
@@ -536,7 +511,7 @@ detectChanges() {
 						
 						<form-input
 							container-class="col-1"
-							label="Priorität"
+							:label="$p.t('lehre', 'prioritaet')"
 							type="text"
 							v-model="data.priorisierung"
 							name="priorisierung"
@@ -544,16 +519,11 @@ detectChanges() {
 							>
 						</form-input>
 						</div>
-					</div>
-									
-			</fieldset>
-		
+					</fieldset>
+										
 		</form-form>
-		
-		<br>
-
-					
-		<div class="col-6 pb-3">
+		<br>				
+		<div class="col-8">
 			<legend>Gesamthistorie</legend>
 			<TblHistory :person_id="modelValue.person_id"></TblHistory>		
 		</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index fd280fd5a..78c004538 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -29,6 +29,17 @@ export default{
 			},
 		}
 	},
+	async mounted(){
+		await this.$p.loadCategory(['lehre']);
+
+		cm.getColumnByField('orgform_kurzbz').component.updateDefinition({
+			title: this.$p.t('lehre', 'Organisationsform')
+		});
+
+		cm.getColumnByField('bezeichnung').component.updateDefinition({
+			title: this.$p.t('lehre', 'studienplan')
+		});
+	},
 	template: `
 		<div class="stv-list h-100 pt-3">
 			<core-filter-cmpt
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
index b2b3eeda3..6a800e4c9 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
@@ -466,45 +466,67 @@ export default{
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
+	async mounted(){
+		await this.$p.loadCategory(['lehre','global','person']);
+
+		let cm = this.$refs.table.tabulator.columnManager;
+
+/*		cm.getColumnByField('lehrverband').component.updateDefinition({
+			title: this.$p.t('lehre', 'lehrverband')
+		});*/
+
+		cm.getColumnByField('format_bestaetigtam').component.updateDefinition({
+			title: this.$p.t('lehre', 'bestaetigt_am')
+		});
+
+		cm.getColumnByField('format_bewerbung_abgeschicktamum').component.updateDefinition({
+			title: this.$p.t('lehre', 'bewerbung_abgeschickt_am')
+		});
+
+		cm.getColumnByField('bezeichnung').component.updateDefinition({
+			title: this.$p.t('lehre', 'studienplan')
+		});
+
+		cm.getColumnByField('actions').component.updateDefinition({
+			title: this.$p.t('global', 'aktionen')
+		});
+
+		cm.getColumnByField('format_datum').component.updateDefinition({
+			title: this.$p.t('global', 'datum')
+		});
+
+		cm.getColumnByField('anmerkung').component.updateDefinition({
+			title: this.$p.t('global', 'anmerkung')
+		});
+
+/*		cm.getColumnByField('format_bestaetigtam').component.updateDefinition({
+			title: this.$p.t('lehre', 'bestaetigt_am')
+		});*/
+
+		cm.getColumnByField('bestaetigtvon').component.updateDefinition({
+			title: this.$p.t('lehre', 'bestaetigt_von')
+		});
+
+		cm.getColumnByField('format_insertamum').component.updateDefinition({
+			title: this.$p.t('lehre', 'insert_am')
+		});
+
+		cm.getColumnByField('insertvon').component.updateDefinition({
+			title: this.$p.t('lehre', 'insert_von')
+		});
+	},
 	template: `
 		<div class="stv-list h-100 pt-3">
 		
-		
-<!--		<p>TestData</p>
-		
-		{{hasPermissionCurrentStg}}
-		<hr>
-
-		
-<!--		isLastStatus: {{isLastStatus}}
-		<br>
-
-		Bismeldestichtag
-		{{dataMeldestichtag }}-->
-		
-<!--		{{arrayStg}}-->
-
-		
-<!--		Berechtigungen:
-			Skip Check: {{hasPermissionToSkipStatusCheck}} |
-			Admin: {{hasAdminPermission}} |
-			Studiengaenge:  |
-			Schreibrecht ASS: {{hasSchreibrechtAss}} ||
-			Basis Prestudent: {{hasPrestudentPermission}} ||
-			Recht für Studiengang {{studiengang_kz}} : {{hasPermissionCurrentStg}}-->
-		
-		<hr>
-<!--		<p>{{hasAssistenzPermissionForStgs}}</p>	
-		{{this.hasAssistenzPermissionForStgs.includes("476")}}-->
-		
+				
 			<!--Modal: Add New Status-->
 			<BsModal ref="newStatusModal">
-				<template #title>Neuen Status hinzufügen</template>
+				<template #title>{{$p.t('lehre', 'status_new')}}</template>
 							
 					<form-form class="row g-3" ref="statusData">
 					
 						<div class="row mb-3">
-							<label for="status_kurzbz" class="form-label col-sm-4">Rolle</label>
+							<label for="status_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'status_rolle')}}</label>
 							<div class="col-sm-6">
 <!--								<form-input type="text" :readonly="readonly" class="form-control" id="status_kurzbz" v-model="statusData['status_kurzbz']">-->
 								<form-input
@@ -526,7 +548,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">									   
-							<label for="studiensemester_kurzbz" class="form-label col-sm-4">Studiensemester</label>
+							<label for="studiensemester_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									:readonly="readonly" 
@@ -540,7 +562,7 @@ export default{
 						</div>
 						<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false) 100 Semester-->
 						<div class="row mb-3">
-							<label for="ausbildungssemester" class="form-label col-sm-4">Ausbildungssemester</label>
+							<label for="ausbildungssemester" class="form-label col-sm-4">{{$p.t('lehre', 'ausbildungssemester')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="select" 
@@ -554,7 +576,7 @@ export default{
 						</div>
 						
 						<div class="row mb-3">
-							<label for="datum" class="form-label col-sm-4">Datum</label>
+							<label for="datum" class="form-label col-sm-4">{{$p.t('global', 'datum')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="DatePicker" 
@@ -570,7 +592,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">									   
-							<label for="bestaetigtam" class="form-label col-sm-4">Bestätigt am</label>
+							<label for="bestaetigtam" class="form-label col-sm-4">{{$p.t('lehre', 'bestaetigt_am')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="DatePicker" 
@@ -586,7 +608,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">
-							<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">Bewerbung abgeschickt am</label>
+							<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">{{$p.t('lehre', 'bewerbung_abgeschickt_am')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="DatePicker" 
@@ -602,7 +624,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">
-							<label for="bezeichnung" class="form-label col-sm-4">Studienplan</label>
+							<label for="bezeichnung" class="form-label col-sm-4">{{$p.t('lehre', 'studienplan')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									:readonly="readonly" 
@@ -615,7 +637,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">
-							<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+							<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="text"
@@ -627,7 +649,7 @@ export default{
 						</div>
 						
 						<div class="row mb-3">									   
-							<label for="aufnahmestufe" class="form-label col-sm-4">Aufnahmestufe</label>
+							<label for="aufnahmestufe" class="form-label col-sm-4">{{$p.t('lehre', 'aufnahmestufe')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 								type="select" 
@@ -641,7 +663,7 @@ export default{
 						</div>
 										
 						<div v-if="gruende.length > 0" class="row mb-3">
-							<label for="grund" class="form-label col-sm-4">Grund</label>
+							<label for="grund" class="form-label col-sm-4">{{$p.t('studierendenantrag', 'antrag_grund')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="select" 
@@ -664,17 +686,17 @@ export default{
 			
 			<!--Modal: Edit Status-->
 			<BsModal ref="editStatusModal">
-				<template #title>Status bearbeiten</template>
+				<template #title>{{$p.t('lehre', 'status_edit')}}</template>
 					<form-form class="row g-3" ref="statusData">
 					
 					<div v-if="statusData.datum < dataMeldestichtag ">
-						<b>Meldestichtag erreicht - Bearbeiten nicht mehr möglich</b>
+						<b>{{$p.t('bismeldestichtag', 'meldestichtag_erreicht')}}</b>
 					</div>
 					
 					 <input type="hidden" id="statusId" name="statusId" value="statusData.statusId">
 					
 						<div class="row mb-3">
-							<label for="status_kurzbz" class="form-label col-sm-4">Rolle</label>
+							<label for="status_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'status_rolle')}}</label>
 							<div class="col-sm-6">
 <!--								<form-input type="text" :readonly="readonly" class="form-control" id="status_kurzbz" v-model="statusData['status_kurzbz']">-->
 								<form-input
@@ -697,7 +719,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">									   
-							<label for="studiensemester_kurzbz" class="form-label col-sm-4">Studiensemester</label>
+							<label for="studiensemester_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									:readonly="readonly" 
@@ -711,7 +733,7 @@ export default{
 						</div>
 						<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false)-->
 						<div class="row mb-3">
-							<label for="ausbildungssemester" class="form-label col-sm-4">Ausbildungssemester</label>
+							<label for="ausbildungssemester" class="form-label col-sm-4">{{$p.t('lehre', 'ausbildungssemester')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="select" 
@@ -725,7 +747,7 @@ export default{
 						</div>
 						
 						<div class="row mb-3">
-							<label for="datum" class="form-label col-sm-4">Datum</label>
+							<label for="datum" class="form-label col-sm-4">{{$p.t('global', 'datum')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="DatePicker" 
@@ -741,7 +763,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">									   
-							<label for="bestaetigtam" class="form-label col-sm-4">Bestätigt am</label>
+							<label for="bestaetigtam" class="form-label col-sm-4">{{$p.t('lehre', 'bestaetigt_am')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="DatePicker" 
@@ -757,7 +779,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">
-							<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">B. abgeschickt am</label>
+							<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">{{$p.t('lehre', 'bewerbung_abgeschickt_am')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="DatePicker" 
@@ -773,7 +795,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">
-							<label for="bezeichnung" class="form-label col-sm-4">Studienplan</label>
+							<label for="bezeichnung" class="form-label col-sm-4">{{$p.t('lehre', 'studienplan')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									:readonly="readonly" 
@@ -786,7 +808,7 @@ export default{
 							</div>
 						</div>
 						<div class="row mb-3">
-							<label for="anmerkung" class="form-label col-sm-4">Anmerkung</label>
+							<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="text"
@@ -798,7 +820,7 @@ export default{
 						</div>
 						
 						<div class="row mb-3">									   
-							<label for="aufnahmestufe" class="form-label col-sm-4">Aufnahmestufe</label>
+							<label for="aufnahmestufe" class="form-label col-sm-4">{{$p.t('lehre', 'aufnahmestufe')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 								type="select" 
@@ -812,7 +834,7 @@ export default{
 						</div>
 						
 						<div v-if="gruende.length > 0" class="row mb-3">
-							<label for="grund" class="form-label col-sm-4">Grund</label>
+							<label for="grund" class="form-label col-sm-4">{{$p.t('studierendenantrag', 'antrag_grund')}}</label>
 							<div class="col-sm-6">
 								<form-input 
 									type="select" 
@@ -835,14 +857,13 @@ export default{
 		
 			<!--Modal: Delete Status-->
 			<BsModal ref="deleteStatusModal">
-				<template #title>Status löschen</template> 
+				<template #title>{{$p.t('lehre', 'status_edit')}}</template> 
 				<template #default>
 				<div v-if="isLastStatus == 1">
-					<p>Das Loeschen der letzten Rolle loescht auch den gesamten Prestudent-Datensatz! Moechten Sie fortfahren?</p>
+					<p>{{$p.t('lehre', 'last_status_confirm_delete')}}</p>
 				</div>
 				<div v-else>
-					<p>Prestudentstatus {{statusData.status_kurzbz}} (id: {{statusData.prestudent_id}}  
-					/ {{statusData.studiensemester_kurzbz}}) im {{statusData.ausbildungssemester}}. Ausbildungssemester wirklich löschen?</p>
+					<p>{{$p.t('lehre', 'status_confirm_delete')}}</p>
 				</div>
 					
 				</template>	
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 706d84a0a..cc09201d5 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -23038,7 +23038,7 @@ array(
 				'insertvon' => 'system'
 				)
 		)
-	)
+	),
 	// Personalverwaltung begin
 	array(
 		'app' => 'core',
@@ -24990,25 +24990,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'person',
-		'phrase' => 'standort',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Standort',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'location',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'person',
@@ -25161,82 +25142,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'person',
-		'phrase' => 'kontonr',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Kontonummer',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Address',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'person',
-		'phrase' => 'anschrift',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Anschrift',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Address',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'person',
-		'phrase' => 'verrechnung',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Verrechnung',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Billing',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'person',
-		'phrase' => 'blz',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'BLZ',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Bank code',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'person',
@@ -25351,6 +25256,636 @@ array(
 			)
 		)
 	),
+	//Status
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'status_rolle',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Rolle',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'role',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'status_new',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neuen Status hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'add new status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'status_edit',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Status bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'edit status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'status_delete',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Status löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'delete status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'bestaetigt_am',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bestätigt am',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'confirmed on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'bestaetigt_von',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bestätigt von',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'confirmed by',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'insert_am',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'InsertAmUm',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'inserted on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'insert_von',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'InsertVon',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'inserted by',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'bewerbung_abgeschickt_am',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bewerbung abgeschickt am',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'application sent on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'aufnahmestufe',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aufnahmestufe',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'entrance level',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'bismeldestichtag',
+		'phrase' => 'meldestichtag_erreicht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Meldestichtag erreicht - Bearbeiten nicht mehr möglich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'report target date reached - editing no longer possible',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+		),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'status_confirm_delete',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Prestudentstatus wirklich löschen?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Really delete prestudent status?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+			'app' => 'core',
+			'category' => 'lehre',
+			'phrase' => 'last_status_confirm_delete',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Das Löschen der letzten Rolle löscht auch den gesamten Prestudent-Datensatz! Möchten Sie fortfahren?',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Deleting the last role also deletes the entire Prestudent record! Do you want to continue?',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+	//Prestudent
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'title_zgv',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zugangsvoraussetzungen für ',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Access requirements for ',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvMaster',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Master',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV master',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvMasterOrt',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Master Ort',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV master place',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvMasterDatum',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Master Datum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV master date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvMasterNation',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Master Nation',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV master nation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvMasterErfuellt',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Master erfüllt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV master fulfilled',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvDoktor',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Doktor',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV doctor',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvDoktorOrt',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Doktor Ort',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV doctor place',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvDoktorDatum',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Doktor Datum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV doctor date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvDoktorNation',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Doktor Nation',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV doctor nation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'zgvDoktorErfuellt',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ZGV Doktor erfüllt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'ZGV doctor fulfilled',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'aufmerksamDurch',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aufmerksam durch',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'been brought to attention by',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'berufstaetigkeit',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Berufstätigkeit',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'professional activity',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'facheinschlaegigBerufstaetig',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Facheinschlägig berufstätig',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'employed in a relevant field',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'bisstandort',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bisstandort',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'bis location',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'studientyp',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studientyp',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'study type',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'dual',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Duales Studium',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'dual study',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'foerderrelevant',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'förderrelevant',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'relevant for funding',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'prioritaet',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Priorität',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'priority',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'title_history',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gesamthistorie',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Overall history',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );