Updated env settings

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

diff --git a/gosa-plugins/goto/personal/environment/class_environment.inc b/gosa-plugins/goto/personal/environment/class_environment.inc
index bfca1cf09d9cfbfdb9b31219fb2ac730f31bc6be..775cd3ed1040a39d90f72932d8247bcc9a202380 100644 (file)
--- a/gosa-plugins/goto/personal/environment/class_environment.inc
+++ b/gosa-plugins/goto/personal/environment/class_environment.inc
@@ -399,8 +399,8 @@ class environment extends plugin
       }
       /* Group Dialog with enabled environment options */
       if ($this->is_account){
-        $display= $this->show_enable_header(_("Remove environment extension"),
-            _("Environment extension enabled. You can disable it by clicking below."));
+        $display= $this->show_enable_header(msgPool::removeFeaturesButton(_("Environment")),
+            msgPool::featuresEnabled(_("Environment")));
       } else {
 
         /* Environment is disabled 
@@ -408,14 +408,12 @@ class environment extends plugin
            environment extensions
          */
         if((isset($this->parent->by_object['group']))||(isset($this->attrs['objectClass']))&&((in_array("posixAccount",$this->attrs['objectClass'])))){
-          // 4. There is a PosixAccount
-          $display= $this->show_enable_header(_("Add environment extension"),
-              _("Environment extension disabled. You can enable it by clicking below."));
+          $display= $this->show_enable_header(msgPool::addFeaturesButton(_("Environment")),
+              msgPool::featuresDisabled(_("Environment")));
           return $display;
         }else{
-          // 4. There is no PosixAccount
-          $display= $this->show_enable_header(_("Add environment extension"),
-              _("Environment extension disabled. You have to setup a posix account before you can enable this feature."));
+          $display= $this->show_enable_header(msgPool::addFeaturesButton(_("Environment")),
+              msgPool::featuresDisabled(_("Environment"), _("POSIX")), TRUE);
           return $display;
         }
       }
@@ -437,19 +435,17 @@ class environment extends plugin
 
         // 3. Account enabled . Editing from adminmenu
         if ($this->is_account){
-          $display= $this->show_disable_header(_("Remove environment extension"),
-              _("Environment extension enabled. You can disable it by clicking below."));
+          $display= $this->show_enable_header(msgPool::removeFeaturesButton(_("Environment")),
+              msgPool::featuresEnabled(_("Environment")));
         } else {
 
           if($this->parent->by_object['posixAccount']->is_account==true){
-            // 4. There is a PosixAccount
-            $display= $this->show_disable_header(_("Add environment extension"),
-                _("Environment extension disabled. You can enable it by clicking below."));
+            $display= $this->show_enable_header(msgPool::addFeaturesButton(_("Environment")),
+                msgPool::featuresDisabled(_("Environment")));
             return $display;
           }else{
-            // 4. There is a PosixAccount
-            $display= $this->show_disable_header(_("Add environment extension"),
-                _("Environment extension disabled. You have to setup a posix account before you can enable this feature."),TRUE,TRUE);
+            $display= $this->show_enable_header(msgPool::addFeaturesButton(_("Environment")),
+                msgPool::featuresDisabled(_("Environment"), _("POSIX")), TRUE);
             return $display;
           }
         }
@@ -640,11 +636,11 @@ class environment extends plugin
 
       /* We assign a share to this user, if we don't know where to mount the share */
       if(!isset($_POST['gotoShareSelection']) || get_post('gotoShareSelection') == ""){
-        msg_dialog::display(_("Error"), _("Please select a valid share!"), ERROR_DIALOG);
+        msg_dialog::display(_("Error"), msgPool::invalid(_("Share")), ERROR_DIALOG);
       }elseif((!isset($_POST['gotoShareMountPoint']))||(empty($_POST['gotoShareMountPoint']))||(preg_match("/[\|]/i",$_POST['gotoShareMountPoint']))){
-        msg_dialog::display(_("Error"), _("Please specify a valid mount point!"), ERROR_DIALOG);
+        msg_dialog::display(_("Error"), msgPool::invalid(_("Mount point")), ERROR_DIALOG);
       }elseif(preg_match('/ /', $_POST['gotoShareMountPoint'])){
-        msg_dialog::display(_("Error"), _("You cannot use spaces in the mount path!"), ERROR_DIALOG);
+        msg_dialog::display(_("Error"), msgPool::invalid(_("Mount point"), "/[^\s]/"), ERROR_DIALOG);
       }elseif(!(
             preg_match("/^\//",$_POST['gotoShareMountPoint'])  ||
             preg_match("/^~/",$_POST['gotoShareMountPoint']) ||
@@ -655,7 +651,7 @@ class environment extends plugin
             preg_match("/^%/",$_POST['gotoShareMountPoint'])
             )
           ){
-        msg_dialog::display(_("Error"), _("Please specify a valid mount point!"), ERROR_DIALOG);
+        msg_dialog::display(_("Error"), msgPool::invalid(_("Mount point")), ERROR_DIALOG);
       }else{
         $a_share = $this->gotoAvailableShares[$_POST['gotoShareSelection']];
         $s_mount = $_POST['gotoShareMountPoint'];
@@ -758,7 +754,7 @@ class environment extends plugin
             title='"._("Reset password hash")."'>";
           $img.= " ";
         }
-        $img.= "<input type='image' name='gotoShareDel_".base64_encode($key)." 'src='images/edittrash.png' alt='"._("Delete")."' 
+        $img.= "<input type='image' name='gotoShareDel_".base64_encode($key)." 'src='images/edittrash.png' alt='".msgPool::delButton()."' 
           title='"._("Delete share entry")."'>";
         $field1 = array("string" => $value , "attach" => "style='".$color."'");
         $field2 = array("string" => $img   , "attach" => "style='border-right:0px;'");
@@ -1112,7 +1108,7 @@ class environment extends plugin
     } 
     if(!$this->is_group){
       if((!((in_array("posixAccount",$this->attrs['objectClass']))||($this->parent->by_object['posixAccount']->is_account==true)))&&(!$this->is_group)){
-        $message[]=(_("You need to setup a valid posix extension in order to enable evironment features."));  
+        $message[]=(_("You need to enable POSIX features in order to enable evironment features!"));  
       }
     }
     return ($message);

diff --git a/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc b/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc
index a3bac86f052b53c981f10c07881e8c9e30f00197..b804ce2fb06b6070cc3d63dd1ecbd401e1158ea9 100644 (file)
--- a/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc
+++ b/gosa-plugins/goto/personal/environment/class_selectPrinterDialog.inc
@@ -104,7 +104,7 @@ class selectPrinterDialog extends plugin
     $message= plugin::check();
 
     if(empty($_POST['gotoPrinter'])){
-      $message[] = _("Please select a printer or press cancel.");
+      $message[] = _("Please select a printer!");
     }
     return $message;
   }

diff --git a/gosa-plugins/goto/personal/environment/main.inc b/gosa-plugins/goto/personal/environment/main.inc
index d21438fbde74ed2282ead5bb80ecec6b5d981d1c..f999db040f5a7ae0e8ba9d532a2e9bc5297783f9 100644 (file)
--- a/gosa-plugins/goto/personal/environment/main.inc
+++ b/gosa-plugins/goto/personal/environment/main.inc
@@ -99,9 +99,9 @@ if (!$remove_lock){
 
     /* Are we in edit mode? */
     if ((session::is_set('edit'))&&($environment->dialog===NULL)){
-      $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
+      $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\"".msgPool::okButton()."\">\n";
       $display.= "&nbsp;";
-      $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
+      $display.= "<input type=submit name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">\n";
       $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png').
              "\"> ".$ui->dn."&nbsp;";
     } else {
@@ -109,8 +109,8 @@ if (!$remove_lock){
         "\"> ".$ui->dn."&nbsp;";
       if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/environment"))){
         $info.= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lamp.png').
-          "\"> "._("Click the 'Edit' button below to change informations in this dialog");
-        $display.= "<input type=submit name=\"edit\" value=\""._("Edit")."\">\n";
+          "\"> ".msgPool::clickEditToChange();
+        $display.= "<input type=submit name=\"edit\" value=\"".msgPool::editButton()."\">\n";
       }
       $display.= "<input type=\"hidden\" name=\"ignore\">\n";
     }