From 94f91dd5c225aaa3b41bd7659637128bac38debf Mon Sep 17 00:00:00 2001
From: Manfred Kindl <kindlm@technikum-wien.at>
Date: Wed, 20 Dec 2017 10:27:24 +0100
Subject: [PATCH] Phrasenkorrektur Incoming-Plattform

---
 cis/public/incoming/incoming.php     | 16 ++++++++--------
 cis/public/incoming/registration.php |  4 ++--
 locale/de-AT/incoming.php            |  2 ++
 locale/en-US/incoming.php            |  2 ++
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/cis/public/incoming/incoming.php b/cis/public/incoming/incoming.php
index 2238d775a..fa7748433 100644
--- a/cis/public/incoming/incoming.php
+++ b/cis/public/incoming/incoming.php
@@ -1535,17 +1535,17 @@ echo'					<td>'.$p->t('incoming/masterstudiengang').'</td>
 						<td colspan="2"><b>Department Coordinator</b></td>
 						<td colspan="2"><b>International Coordinator</b></td></tr>
 					<tr>
-						<td width="25%">'.$p->t('global/vorname').' </td>
+						<td width="25%">'.$p->t('incoming/vorname').' </td>
 						<td width="25%"><input type="text" name="vorname_coordinator" size="20" maxlength="256" value="'.$depCoordinator->vorname.'">
 						<input type="hidden" name = "dep_coordinator_id" id="dep_coordinator_id" value="'.$preincoming->person_id_coordinator_dep.'"></td>
-						<td width="25%">'.$p->t('global/vorname').' </td>
+						<td width="25%">'.$p->t('incoming/vorname').' </td>
 						<td width="25%"><input type="text" name="vorname_intcoordinator" size="20" maxlength="256" value="'.$intCoordinator->vorname.'">
 						<input type="hidden" name = "int_coordinator_id" id="int_coordinator_id" value="'.$preincoming->person_id_coordinator_int.'"></td>
 					</tr>
 					<tr>
-						<td width="25%">'.$p->t('global/nachname').' </td>
+						<td width="25%">'.$p->t('incoming/nachname').' </td>
 						<td width="25%"><input type="text" name="nachname_coordinator" size="20"  value="'.$depCoordinator->nachname.'"></td>
-						<td width="25%">'.$p->t('global/nachname').' </td>
+						<td width="25%">'.$p->t('incoming/nachname').' </td>
 						<td width="25%"><input type="text" name="nachname_intcoordinator" size="20"  value="'.$intCoordinator->nachname.'"></td>
 					</tr>
 					<tr>
@@ -1868,13 +1868,13 @@ else if ($method == "profil")
 				<td><input type="text" name="zgv_master" value="'.$preincoming->zgvmaster.'" size=40></td>
             </tr>
 			<tr>
-				<td>'.$p->t('global/vorname').'</td>
+				<td>'.$p->t('incoming/vorname').'</td>
 				<td><input type="text" size="20" maxlength="32" name="vorname" value="'.$person->vorname.'"></td>
                 <td>'.$p->t('incoming/abgelegtin').'</td>
 				<td><input type="text" name="zgv_master_name" size=40 value="'.$preincoming->zgvmaster_name.'"></td>
             </tr>
 			<tr>
-                <td>'.$p->t('global/nachname').'</td>
+                <td>'.$p->t('incoming/nachname').'</td>
 				<td><input type="text" size="20" maxlength="64" name="nachname" value="'.$person->nachname.'" required></td>
 				<td>'.$p->t('incoming/abgelegtinort').'</td>
 				<td><input type="text" name="zgv_master_ort" size=40 value="'.$preincoming->zgvmaster_ort.'"></td>
@@ -1923,14 +1923,14 @@ echo'			</SELECT></td>
     					<input type="radio" name="geschlecht" value="w" checked>'.$p->t('global/frau').'
     			</td>';
 
-        echo    '<td>'.$p->t('global/vorname').'</td>
+        echo    '<td>'.$p->t('incoming/vorname').'</td>
 				<td><input type="text" size="40" name="emergency_vorname" value="'.$personEmergency->vorname.'">
 				<input type="hidden" name="emergency_name_id" id="emergency_name_id" value="'.$preincoming->person_id_emergency.'"></td>
             </tr>
 			<tr>
 				<td></td>
                 <td></td>
-				<td>'.$p->t('global/nachname').'</td>
+				<td>'.$p->t('incoming/nachname').'</td>
 				<td><input type="text" size="40" name="emergency_nachname" value="'.$personEmergency->nachname.'"></td>
 			</tr>
 			<tr>
diff --git a/cis/public/incoming/registration.php b/cis/public/incoming/registration.php
index 4943e439b..71ff33a69 100644
--- a/cis/public/incoming/registration.php
+++ b/cis/public/incoming/registration.php
@@ -83,11 +83,11 @@ echo '	<form action="registration.php" method="POST" name="RegistrationForm">
 					<td><input type="text" size="20" maxlength="64" name="titel_pre"></td>
 				</tr>
 				<tr>
-					<td>'.$p->t('global/vorname').'*</td>
+					<td>'.$p->t('incoming/vorname').'*</td>
 					<td><input type="text" size="40" maxlength="32" name="vorname"></td>
 				</tr>
 				<tr>
-					<td>'.$p->t('global/nachname').'*</td>
+					<td>'.$p->t('incoming/nachname').'*</td>
 					<td><input type="text" size="40" maxlength="64" name="nachname"></td>
 				</tr>
 				<tr>
diff --git a/locale/de-AT/incoming.php b/locale/de-AT/incoming.php
index c2a83a3b2..5a9479770 100644
--- a/locale/de-AT/incoming.php
+++ b/locale/de-AT/incoming.php
@@ -1,4 +1,6 @@
 <?php
+$this->phrasen['incoming/vorname']='Vorname';
+$this->phrasen['incoming/nachname']='Nachname';
 $this->phrasen['incoming/persönlichedateneditieren']='Persönliche Daten';
 $this->phrasen['incoming/lehrveranstaltungenauswählen']='Lehrveranstaltungen auswählen';
 $this->phrasen['incoming/learningagreementerstellen']='Learning Agreement erstellen';
diff --git a/locale/en-US/incoming.php b/locale/en-US/incoming.php
index 411b962df..a9f944573 100644
--- a/locale/en-US/incoming.php
+++ b/locale/en-US/incoming.php
@@ -1,4 +1,6 @@
 <?php
+$this->phrasen['incoming/vorname']='Name';
+$this->phrasen['incoming/nachname']='Surname (Family Name)';
 $this->phrasen['incoming/persönlichedateneditieren']='Profile';
 $this->phrasen['incoming/lehrveranstaltungenauswählen']='Course Registration';
 $this->phrasen['incoming/learningagreementerstellen']='Create Learning Agreement (print)';