[Mapbender-commits] r10305 - in trunk/mapbender: http/classes http/php resources/locale/de_DE/LC_MESSAGES

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2019-10-28 07:05:03 -0700 (Mon, 28 Oct 2019)
New Revision: 10305

Modified:
   trunk/mapbender/http/classes/class_user.php
   trunk/mapbender/http/php/mod_createUser.php
   trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po
Log:
Alter registration form

Modified: trunk/mapbender/http/classes/class_user.php
===================================================================
--- trunk/mapbender/http/classes/class_user.php	2019-10-28 13:19:42 UTC (rev 10304)
+++ trunk/mapbender/http/classes/class_user.php	2019-10-28 14:05:03 UTC (rev 10305)
@@ -522,18 +522,18 @@
 	
 	public function sendUserLoginMail () {
 		$admin = new administration();
-		$userMessage = "Activation mail for Mapbender Geoportal\n";
-		$userMessage .= "Your login name is: ".$this->name."\n";
-		$userMessage .= "Please activate your account by click on following link: \n";
+		$userMessage = _mb("Activation mail for Mapbender Geoportal")."\n";
+		$userMessage .= _mb("Your login name is").": ".$this->name."\n";
+		$userMessage .= _mb("Please activate your account by click on following link").": \n";
 		$mbUrl = MAPBENDER_PATH."/";
 		$userMessage .= $mbUrl."php/mod_activateUserAccount.php?activationKey=".$this->activationKey."\n";
-		$userMessage .= "Follow this link to login to Mapbender: \n";
+		$userMessage .= _mb("Follow this link to login to Mapbender").": \n";
 		$userMessage .= LOGIN."\n";
 		$userMail = $admin->getEmailByUserId($this->id);
-		if(!$admin->sendEmail("", "", $userMail, $this->name, utf8_decode("Your Mapbender Geoportal account"), utf8_decode($userMessage), $error_msg)) {
-			return "Registry data could not be send. Please check mail address.";
+		if(!$admin->sendEmail("", "", $userMail, $this->name, utf8_decode(_mb("Your Mapbender Geoportal account")), utf8_decode($userMessage), $error_msg)) {
+			return _mb("Registry data could not be send. Please check mail address.");
 		}
-		return "Registry data has been sent successfully.";
+		return _mb("Registry data has been sent successfully.");
 	}
 	
     /*

Modified: trunk/mapbender/http/php/mod_createUser.php
===================================================================
--- trunk/mapbender/http/php/mod_createUser.php	2019-10-28 13:19:42 UTC (rev 10304)
+++ trunk/mapbender/http/php/mod_createUser.php	2019-10-28 14:05:03 UTC (rev 10305)
@@ -205,7 +205,7 @@
 }
 #name
 echo "<tr>";
-   echo "<td>Name*:</td>";
+   echo "<td>"._mb('Name')."*:</td>";
    echo "<td>";
       echo "<input type='text' size='30' name='name' value='".$name."'>";
    echo "</td>";
@@ -213,7 +213,7 @@
 
 #password
 echo "<tr>";
-	echo "<td>Password*: </td>";
+	echo "<td>"._mb('Password')."*: </td>";
 	echo "<td>";
 		echo "<input type='password' size='30' name='password' value='";
 		if(isset($selected_user) && $selected_user != 'new'){
@@ -225,7 +225,7 @@
 
 #password
 echo "<tr>";
-	echo "<td>Confirm password*: </td>";
+	echo "<td>"._mb('Confirm password')."*: </td>";
 	echo "<td>";
 		echo "<input type='password' size='30' name='v_password' value='";
 		echo "'>";
@@ -233,42 +233,46 @@
 echo "</tr>";
 
 #description
-echo "<tr>";
+/*echo "<tr>";
 	echo "<td>Description: </td>";
 	echo "<td>";
 		echo "<input type='text' size='30' name='description' value='".$description."'>";
 	echo "</td>";
 echo "</tr>";
-
+*/
 #email
 echo "<tr>";
-	echo "<td>Email <A HREF='http://wms1.ccgis.de/ewiki/index.php?id=CreateUser' target='_blank'><b>(Why?): </b></A><BR></td>";
+	//echo "<td>Email <A HREF='http://wms1.ccgis.de/ewiki/index.php?id=CreateUser' target='_blank'><b>(Why?): </b></A><BR></td>";
+        echo "<td>Email*<BR></td>";
 	echo "<td>";
 		echo "<input type='text' size='30' name='email' value='".$email."'>";
 	echo "</td>";
 echo "</tr>";
 
+
+
+
 #phone
-echo "<tr>";
+/*echo "<tr>";
 	echo "<td>Phone: </td>";
 	echo "<td>";
 		echo "<input type='text' size='30' name='phone' value='".$phone."'>";
 	echo "</td>";
-echo "</tr>";
+echo "</tr>";*/
 
 #department
-echo "<tr>";
+/*echo "<tr>";
 	echo "<td>Department: </td>";
 	echo "<td>";
 		echo "<input type='text' size='30' name='department' value='".$department."'>";
 	echo "</td>";
-echo "</tr>";
+echo "</tr>";*/
 
 echo "<tr>";
 	echo "<td></td>";
 	echo "<td>";
 if($selected_user == 'new' || !isset($selected_user)){
-	echo "<input type='button' class='myButton' value='save'  onclick='validate(\"save\")'>";
+	echo "<input type='button' class='myButton' value='save'  onclick='validate(\""._mb('Save')."\")'>";
 }
 	echo "</td>";
 echo "</tr>";

Modified: trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po
===================================================================
--- trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po	2019-10-28 13:19:42 UTC (rev 10304)
+++ trunk/mapbender/resources/locale/de_DE/LC_MESSAGES/Mapbender.po	2019-10-28 14:05:03 UTC (rev 10305)
@@ -4368,6 +4368,24 @@
 msgid "Terms of Use / Constraints"
 msgstr "Nutzungsbedingungen / Zugangsbeschränkungen"
 
+msgid "Activation mail for Mapbender Geoportal"
+msgstr "Aktivierungsmail für Mapbender Geoportal"
 
+msgid "Your login name is"
+msgstr "Dein Login Name ist"
 
+msgid "Please activate your account by click on following link"
+msgstr "Bitte aktiviere deinen Account über folgenden Link"
 
+msgid "Follow this link to login to Mapbender"
+msgstr "Link zum Mapbender Login"
+
+msgid "Your Mapbender Geoportal account"
+msgstr "Dein Mapbender Geoportal Account"
+
+msgid "Registry data could not be send. Please check mail address."
+msgstr "Die Registrierungsdaten konnten nicht gesendet werden. Bitte check Deine Emailadresse."
+
+msgid "Registry data has been sent successfully."
+msgstr "Die Registrierungsdaten wurden erfolgreich versendet."
+