From: hzerres <hzerres@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 13 Sep 2010 09:38:28 +0000 (+0000)
Subject: corrected translation to vacationstart vacationstop ... was ambiguous
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c5852914b84fd712fc707b5c21991320e6227a39;p=gosa.git

corrected translation to vacationstart vacationstop ... was ambiguous

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19617 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/groupware/personal/groupware/class_groupware.inc b/gosa-plugins/groupware/personal/groupware/class_groupware.inc
index 4c33d27b2..dc8dc4b90 100644
--- a/gosa-plugins/groupware/personal/groupware/class_groupware.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_groupware.inc
@@ -311,7 +311,7 @@ class groupware extends plugin
                 }
             }
         }
-		$this->check();
+		
         /****************
           Forward addresses 
          ****************/
@@ -720,10 +720,10 @@ class groupware extends plugin
         //required vacationEnabled
 		if($this->vacationEnabled){
 	        if(!tests::is_date($this->vacationStart)){
-		        $messages[] = msgPool::invalid(_("von"),$this->vacationStart , "", _("Example of date : 01.03.2010"));
+		        $messages[] = msgPool::invalid(_("vacationstart"),$this->vacationStart , "", _("Example of date : 01.03.2010"));
 	        }
 	        if(!tests::is_date($this->vacationStop)){
-		        $messages[] = msgPool::invalid(_("bis"),$this->vacationStop , "", _("Example of date : 01.03.2010"));
+		        $messages[] = msgPool::invalid(_("vacationstop"),$this->vacationStop , "", _("Example of date : 01.03.2010"));
 	        }
 	        $diff = tests::compareDate($this->vacationStart, $this->vacationStop);
 	       
@@ -746,6 +746,13 @@ class groupware extends plugin
 				}
 			}
 		}
+		if(isset($this->alternateAddresses) && is_array($this->alternateAddresses)){
+			foreach($this->alternateAddresses as $fAddress){
+				if(!tests::is_email ($fAddress)){
+					$messages[] = msgPool::invalid(_("Email"),$fAddress, "", _("Example: user@excom.intranet.gonicus.de"));
+				}
+			}
+		}
 		
         return($messages);
     }