diff --git a/application/controllers/system/Messages.php b/application/controllers/system/Messages.php index dd112d204..9d66dac4d 100644 --- a/application/controllers/system/Messages.php +++ b/application/controllers/system/Messages.php @@ -20,6 +20,13 @@ class Messages extends VileSci_Controller $this->load->library('WidgetLib'); $this->load->model('person/Person_model', 'PersonModel'); + + $this->loadPhrases(array( + 'global', + 'person', + 'lehre', + 'ui', + 'infocenter')); $this->_setAuthUID(); // sets property uid } diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php index 4bafe591b..835cac464 100644 --- a/application/controllers/system/infocenter/InfoCenter.php +++ b/application/controllers/system/infocenter/InfoCenter.php @@ -74,6 +74,14 @@ class InfoCenter extends VileSci_Controller $this->load->library('PersonLogLib'); $this->load->library('WidgetLib'); + $this->loadPhrases(array( + 'global', + 'person', + 'lehre', + 'ui', + 'infocenter', + 'filter')); + $this->_setAuthUID(); // sets property uid $this->load->library('PermissionLib'); @@ -591,13 +599,13 @@ class InfoCenter extends VileSci_Controller $filtersarray = array( 'abgeschickt' => array( 'link' => '#', - 'description' => 'Abgeschickt', + 'description' => ucfirst($this->p->t('global', 'abgeschickt')), 'expand' => true, 'children' => array() ), 'nichtabgeschickt' => array( 'link' => '#', - 'description' => 'Nicht abgeschickt', + 'description' => ucfirst($this->p->t('global', 'nichtAbgeschickt')), 'expand' => true, 'children' => array() ) diff --git a/application/views/system/infocenter/addNotiz.php b/application/views/system/infocenter/addNotiz.php index a8396fe40..f8f02570a 100644 --- a/application/views/system/infocenter/addNotiz.php +++ b/application/views/system/infocenter/addNotiz.php @@ -2,11 +2,11 @@
- +
- +
@@ -21,8 +21,8 @@
- - + +
\ No newline at end of file diff --git a/application/views/system/infocenter/anmerkungenZurBewerbung.php b/application/views/system/infocenter/anmerkungenZurBewerbung.php index 565db79db..ee21b55e8 100644 --- a/application/views/system/infocenter/anmerkungenZurBewerbung.php +++ b/application/views/system/infocenter/anmerkungenZurBewerbung.php @@ -5,7 +5,7 @@ - + diff --git a/application/views/system/infocenter/dokpruefung.php b/application/views/system/infocenter/dokpruefung.php index 8261a2ebd..b599b6b06 100644 --- a/application/views/system/infocenter/dokpruefung.php +++ b/application/views/system/infocenter/dokpruefung.php @@ -2,11 +2,11 @@
Anmerkungen zur Bewerbungp->t('infocenter','anmerkungenZurBewerbung')) ?>
- - - - - + + + + + @@ -35,14 +35,14 @@ 0): ?>
-

Nachzureichende Dokumente:

+

p->t('infocenter','nachzureichendeDokumente')) ?>

NameTypUploaddatumAusstellungsnationFormal geprüftp->t('global','name')) ?>p->t('global','typ')) ?>p->t('global','uploaddatum')) ?>p->t('infocenter','ausstellungsnation')) ?>p->t('infocenter','formalGeprueft')) ?>
- - - - + + + + diff --git a/application/views/system/infocenter/infocenter.php b/application/views/system/infocenter/infocenter.php index ab9746a8e..38268aa4d 100644 --- a/application/views/system/infocenter/infocenter.php +++ b/application/views/system/infocenter/infocenter.php @@ -24,7 +24,7 @@
- +
diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php index 2d9d30cf2..6dd10b4ef 100755 --- a/application/views/system/infocenter/infocenterData.php +++ b/application/views/system/infocenter/infocenterData.php @@ -189,8 +189,22 @@ 'fhc_controller_id' => $fhc_controller_id, 'checkboxes' => 'PersonId', 'additionalColumns' => array('Details'), - 'columnsAliases' => array('PersonID','Vorname','Nachname','GebDatum','Nation', 'Letzte Aktion','Letzter Bearbeiter', - 'StSem','GesendetAm','NumAbgeschickt','StgSent','StgNotSent','StgAktiv', 'Sperrdatum','GesperrtVon'), + 'columnsAliases' => array( + 'PersonID', + ucfirst($this->p->t('person','vorname')) , + ucfirst($this->p->t('person','nachname')), + ucfirst($this->p->t('person','geburtsdatum')), + ucfirst($this->p->t('person','nation')), + ucfirst($this->p->t('global','letzteAktion')), + ucfirst($this->p->t('global','letzterBearbeiter')), + ucfirst($this->p->t('lehre','studiensemester')), + ucfirst($this->p->t('global','gesendetAm')), + ucfirst($this->p->t('global','abgeschickt')) . ' (' . $this->p->t('global','anzahl') . ')', + ucfirst($this->p->t('lehre','studiengang')) . ' (' . $this->p->t('global','gesendet') . ')', + ucfirst($this->p->t('lehre','studiengang')) . ' (' . $this->p->t('global','nichtGesendet') . ')', + ucfirst($this->p->t('lehre','studiengang')) . ' (' . $this->p->t('global','aktiv') . ')', + ucfirst($this->p->t('global','sperrdatum')), + ucfirst($this->p->t('global','gesperrtVon'))), 'formatRaw' => function($datasetRaw) { $datasetRaw->{'Details'} = sprintf( @@ -259,7 +273,7 @@ } } ); - + $filterId = isset($_GET[InfoCenter::FILTER_ID]) ? $_GET[InfoCenter::FILTER_ID] : null; if (isset($filterId) && is_numeric($filterId)) diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php index 7038031a0..0abe9b6b1 100755 --- a/application/views/system/infocenter/infocenterDetails.php +++ b/application/views/system/infocenter/infocenterDetails.php @@ -40,14 +40,14 @@
- wird bearbeitet von: + p->t('global', 'wirdBearbeitetVon') . ' :' ?>     Freigeben + class="fa fa-sign-out"> p->t('ui', 'freigeben')) ?>
@@ -57,7 +57,7 @@
-

Stammdaten

+

p->t('global','stammdaten')) ?>

load->view('system/infocenter/stammdaten.php'); ?> load->view('system/infocenter/anmerkungenZurBewerbung.php'); ?> @@ -71,7 +71,7 @@
-

Dokumentenprüfung

+

p->t('infocenter','dokumentenpruefung')) ?>

load->view('system/infocenter/dokpruefung.php'); ?>
@@ -85,7 +85,7 @@
-

ZGV-Prüfung

+

p->t('infocenter', 'zgv') . ' - ' . ucfirst($this->p->t('lehre','pruefung'))?>

load->view('system/infocenter/zgvpruefungen.php'); ?> @@ -100,7 +100,7 @@
-

Nachrichten

+

p->t('global','nachrichten')) ?>

@@ -119,7 +119,7 @@
-

Notizen & Aktivitäten

+

p->t('global','notizen')) . ' & ' . ucfirst($this->p->t('global','aktivitaeten')) ?>

diff --git a/application/views/system/infocenter/logs.php b/application/views/system/infocenter/logs.php index 65b67624e..a45034818 100644 --- a/application/views/system/infocenter/logs.php +++ b/application/views/system/infocenter/logs.php @@ -1,19 +1,19 @@ -
TypNachzureichen amAusstellungsnationAnmerkungp->t('global','typ')) ?>p->t('infocenter','nachzureichenAm')) ?>p->t('infocenter','ausstellungsnation')) ?>p->t('global','anmerkung')) ?>
- - - - - - - - - - - - - - - - +
DatumAktivitätUser
zeitpunkt), 'd.m.Y H:i:s') ?>logdata->name) ? $log->logdata->name : '' ?>insertvon ?>
+ + + + + + + + + + + + + + + +
p->t('global', 'datum')) ?>p->t('global', 'aktivitaet')) ?>User
zeitpunkt), 'd.m.Y H:i:s') ?>logdata->name) ? $log->logdata->name : '' ?>insertvon ?>
\ No newline at end of file diff --git a/application/views/system/infocenter/notizen.php b/application/views/system/infocenter/notizen.php index 683a9b3d9..f0d155f82 100644 --- a/application/views/system/infocenter/notizen.php +++ b/application/views/system/infocenter/notizen.php @@ -1,8 +1,8 @@ - - + + diff --git a/application/views/system/infocenter/stammdaten.php b/application/views/system/infocenter/stammdaten.php index daf0b7d24..45c2326e9 100755 --- a/application/views/system/infocenter/stammdaten.php +++ b/application/views/system/infocenter/stammdaten.php @@ -2,41 +2,41 @@
DatumNotizp->t('global', 'datum')) ?>p->t('global', 'notiz')) ?> User
- + - + - + - + - + - + - + - +
Vornamep->t('person','vorname')) ?> vorname ?>
Nachnamep->t('person','nachname')) ?> nachname ?>
Geburtsdatump->t('person','geburtsdatum')) ?> gebdatum), 'd.m.Y') ?>
Sozialversicherungsnrp->t('person','svnr')) ?> svnr ?>
Staatsbürgerschaftp->t('person','staatsbuergerschaft')) ?> staatsbuergerschaft ?>
Geschlechtp->t('person','geschlecht')) ?> geschlecht ?>
Geburtsnationp->t('person','geburtsnation')) ?> geburtsnation ?>
Geburtsortp->t('person','geburtsort')) ?> gebort ?>
@@ -45,18 +45,22 @@ - + - - - + + + kontakte as $kontakt): ?> - + kontakttyp === 'email'): ?> + + kontakttyp === 'telefon'): ?> + +
Kontaktep->t('global','kontakt')) ?>
TypKontaktAnmerkungp->t('global','typ')) ?>p->t('global','kontakt')) ?>p->t('global','anmerkung')) ?>
kontakttyp); ?>p->t('person','email')) ?>p->t('person','telefon')) ?> kontakttyp.'">';?> kontakttyp === 'email'): ?> @@ -76,7 +80,7 @@ adressen as $adresse): ?>
- Adresse + p->t('person','adresse')) ?> strasse.', '.$adresse->plz.' '.$adresse->ort : '' ?> @@ -97,13 +101,13 @@  Nachricht senden + class="fa fa-envelope"> p->t('ui','nachrichtSenden') ?> zugangscode)): ?>
 Zugang Bewerbung + target='_blank'> p->t('infocenter','zugangBewerbung') ?>
diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php index c8091a5dc..08624e62c 100644 --- a/application/views/system/infocenter/zgvpruefungen.php +++ b/application/views/system/infocenter/zgvpruefungen.php @@ -21,14 +21,14 @@ prestudentstatus->bestaetigtam)): ?>
- An Studiengang freigegeben + p->t('global', 'anStudiengangFreigegeben') ?>
- prestudentstatus->bewerbung_abgeschicktamum) ? '' : ''); ?> - prestudentstatus->bewerbungsnachfrist) ? ' | Nachfrist: '. date_format(date_create($zgvpruefung->prestudentstatus->bewerbungsnachfrist), 'd.m.Y') : ''); ?> - prestudentstatus->bewerbungstermin) ? ' | Bewerbungsfrist: '. date_format(date_create($zgvpruefung->prestudentstatus->bewerbungstermin), 'd.m.Y') : ''); ?> + p->t('infocenter','bewerbung')) . ' ' . $this->p->t('global','abgeschickt') . ': '.(isset($zgvpruefung->prestudentstatus->bewerbung_abgeschicktamum) ? '' : ''); ?> + prestudentstatus->bewerbungsnachfrist) ? ' | ' . $this->p->t('infocenter', 'nachfrist') . ': ' . date_format(date_create($zgvpruefung->prestudentstatus->bewerbungsnachfrist), 'd.m.Y') : ''); ?> + prestudentstatus->bewerbungstermin) ? ' | ' . $this->p->t('infocenter', 'bewerbungsfrist') . ': ' . date_format(date_create($zgvpruefung->prestudentstatus->bewerbungstermin), 'd.m.Y') : ''); ?>
@@ -43,7 +43,7 @@
- + prestudentstatus->status_kurzbz)) { @@ -54,7 +54,7 @@
- + prestudentstatus->studiensemester_kurzbz) ? $zgvpruefung->prestudentstatus->studiensemester_kurzbz : '' ?>
@@ -67,7 +67,7 @@
- + prestudentstatus->orgform)) ? ', ' : ''; @@ -84,18 +84,18 @@
- + zgv_bez; ?>
- +
- + zgvort); else: @@ -121,7 +121,7 @@
- + zgvdatum) ? "" : date_format(date_create($zgvpruefung->zgvdatum), 'd.m.Y'); if ($infoonly): @@ -137,7 +137,7 @@
- + zgvnation_bez; else @@ -153,7 +153,7 @@ studiengangtyp === 'm') : ?>
-
+
zgvmas_bez; @@ -167,7 +167,7 @@
- + zgvmaort; else: @@ -180,7 +180,7 @@
- + zgvmadatum) ? "" : date_format(date_create($zgvpruefung->zgvmadatum), 'd.m.Y'); if ($infoonly): @@ -195,8 +195,7 @@
-
+
zgvmanation_bez; @@ -215,12 +214,12 @@
@@ -243,8 +242,7 @@ class="d-inline float-right" required> @@ -255,7 +253,7 @@ class="btn btn-default" data-toggle="modal" data-target="#absageModal_prestudent_id ?>"> - Absage + p->t('ui', 'absagen') ?>
@@ -274,33 +272,20 @@ × + id="absageModalLabel">p->t('infocenter', 'absageBestaetigen') ?>
@@ -331,7 +316,7 @@ data-toggle="modal" data-target="#freigabeModal_prestudent_id ?>" data-toggle="tooltip" title=""> - Freigabe an Studiengang + p->t('ui', 'freigabeAnStudiengang') ?>
@@ -348,29 +333,20 @@ + p->t('global', 'freigabeBestaetigen') ?>
@@ -384,7 +360,7 @@
prestudentstatus->bestaetigtam) ? '' : '' ?> - +
diff --git a/application/views/system/messageList.php b/application/views/system/messageList.php index d549d68a4..44779ad2c 100644 --- a/application/views/system/messageList.php +++ b/application/views/system/messageList.php @@ -1,97 +1,97 @@ - 0; -$widthColumn = $msgExists === true ? 8 : 12; -?> -
- - - - - - - - - - - - - - - - - - - - - -
Gesendet amSenderEmpfängerBetreffGelesen am
insertamum) ? date_format(date_create($message->insertamum), 'd.m.Y H:i:s') : '' ?>sevorname.' '.$message->senachname ?>revorname.' '.$message->renachname ?>subject ?>statusamum) ? date_format(date_create($message->statusamum), 'd.m.Y H:i:s') : '' ?>
-
- -
-
-
-
- -
-
- - \ No newline at end of file diff --git a/application/views/system/messageWrite.php b/application/views/system/messageWrite.php index 3f9ed5254..85c003cfd 100644 --- a/application/views/system/messageWrite.php +++ b/application/views/system/messageWrite.php @@ -32,14 +32,14 @@ $href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER[
- +
- +
- +
 
- +
- + 1) diff --git a/application/views/widgets/filter/filter.php b/application/views/widgets/filter/filter.php index 5fbff4953..d3dbb1918 100644 --- a/application/views/widgets/filter/filter.php +++ b/application/views/widgets/filter/filter.php @@ -168,7 +168,7 @@
diff --git a/application/widgets/Nation_widget.php b/application/widgets/Nation_widget.php index 8337a92c1..79059c84f 100644 --- a/application/widgets/Nation_widget.php +++ b/application/widgets/Nation_widget.php @@ -1,22 +1,21 @@ -load->model('codex/nation_model', 'NationModel'); - $this->NationModel->addOrder('nation_code'); - - $this->addSelectToModel($this->NationModel, 'nation_code', 'kurztext'); - - $this->setElementsArray( - $this->NationModel->load(), - true, - 'Nation wählen...', - 'keine Nation gefunden' - ); - - $this->loadDropDownView($widgetData); - } +load->model('codex/nation_model', 'NationModel'); + $this->NationModel->addOrder('nation_code'); + + $this->addSelectToModel($this->NationModel, 'nation_code', 'kurztext'); + + $this->setElementsArray( + $this->NationModel->load(), + true, + $this->p->t('ui', 'bitteEintragWaehlen') + ); + + $this->loadDropDownView($widgetData); + } } \ No newline at end of file diff --git a/application/widgets/Vorlage_widget.php b/application/widgets/Vorlage_widget.php index 2bf8f95dc..9c9abe430 100644 --- a/application/widgets/Vorlage_widget.php +++ b/application/widgets/Vorlage_widget.php @@ -27,8 +27,7 @@ class Vorlage_widget extends DropdownWidget $this->setElementsArray( $vorlage, true, - 'Select a vorlage...', - 'No vorlage found' + $this->p->t('ui', 'vorlageWaehlen') ); $this->loadDropDownView($widgetData); diff --git a/application/widgets/Zgv_widget.php b/application/widgets/Zgv_widget.php index a2500a1e9..b34bb27b6 100644 --- a/application/widgets/Zgv_widget.php +++ b/application/widgets/Zgv_widget.php @@ -1,22 +1,21 @@ -load->model('codex/zgv_model', 'ZgvModel'); - $this->ZgvModel->addOrder('zgv_bez'); - - $this->addSelectToModel($this->ZgvModel, 'zgv_code', 'zgv_bez'); - - $this->setElementsArray( - $this->ZgvModel->load(), - true, - 'Zgv wählen...', - 'keine Zgv gefunden' - ); - - $this->loadDropDownView($widgetData); - } +load->model('codex/zgv_model', 'ZgvModel'); + $this->ZgvModel->addOrder('zgv_bez'); + + $this->addSelectToModel($this->ZgvModel, 'zgv_code', 'zgv_bez'); + + $this->setElementsArray( + $this->ZgvModel->load(), + true, + $this->p->t('ui', 'bitteEintragWaehlen') + ); + + $this->loadDropDownView($widgetData); + } } \ No newline at end of file