From 010c9fde63805ac855f595ecd21e9ff0aedbb43e Mon Sep 17 00:00:00 2001 From: cajus Date: Sat, 8 Mar 2008 13:16:40 +0000 Subject: [PATCH] Updated msgPools git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9462 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../personal/netatalk/class_netatalk.inc | 19 ++++++++----------- .../netatalk/personal/netatalk/main.inc | 8 ++++---- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/gosa-plugins/netatalk/personal/netatalk/class_netatalk.inc b/gosa-plugins/netatalk/personal/netatalk/class_netatalk.inc index 5b6ced7dc..59b67c257 100644 --- a/gosa-plugins/netatalk/personal/netatalk/class_netatalk.inc +++ b/gosa-plugins/netatalk/personal/netatalk/class_netatalk.inc @@ -167,7 +167,7 @@ class netatalk extends plugin { /* Do we represent a valid account? */ if (!$this->is_account && $this->parent === NULL) { - $display = "\"\"src=\"images/stop.png\" "._("This account has no netatalk extensions.").""; + $display = "\"\"src=\"images/stop.png\" ".msgPool::noValidExtension(_("netatalk")).""; $display .= back_to_main(); return ($display); @@ -176,20 +176,17 @@ class netatalk extends plugin { /* Show tab dialog headers */ if ($this->parent !== NULL) { if ($this->is_account) { - $display = $this->show_disable_header(_("Remove netatalk account"), _("This account has netatalk features enabled. You can disable them by clicking below.")); + $display = $this->show_disable_header(msgPool::removeFeaturesButton(_("netatalk")), msgPool::featuresEnabled(_("netatalk"))); } else { $errmsg=""; $obj = $this->parent->by_object['posixAccount']; if (!($obj->is_account) ) { - $errmsg.="Posix features are needed for netatalk accounts, enable them first. "; - } - if (count($this->shares)== 0) { - $errmsg.="At least one share with netatalk or NFS mount entry needed."; - } - if($errmsg==""){ - $display = $this->show_enable_header(_("Create netatalk account"), _("This account has netatalk features disabled. You can enable them by clicking below.")); + $display = $this->show_enable_header(msgPool::addFeaturesButton(_("netatalk")), msgPool::featuresDisabled(_("netatalk"), _("POSIX")), TRUE); + } elseif (count($this->shares)== 0) { + $display = $this->show_enable_header(msgPool::addFeaturesButton(_("netatalk")), msgPool::featuresDisabled(_("netatalk"), _("netatalk or NFS share")), TRUE); } else { - $display = $this->show_enable_header(_("Create netatalk account"), _($errmsg), TRUE); + $display = $this->show_enable_header(msgPool::addFeaturesButton(_("netatalk")), msgPool::featuresDisabled(_("netatalk")), TRUE); + } } return ($display); } @@ -222,7 +219,7 @@ class netatalk extends plugin { $message = array (); if (strlen($this->apple_user_share) == 0) { - $message[] = _("You must select a share to use."); + $message[] = msgPool::required(_("Share")); } return ($message); diff --git a/gosa-plugins/netatalk/personal/netatalk/main.inc b/gosa-plugins/netatalk/personal/netatalk/main.inc index bc73a396b..043da09d9 100644 --- a/gosa-plugins/netatalk/personal/netatalk/main.inc +++ b/gosa-plugins/netatalk/personal/netatalk/main.inc @@ -93,15 +93,15 @@ if (!$remove_lock) { /* Are we in edit mode? */ if (session::is_set('edit')) { - $display .= "\n"; + $display .= "\n"; $display .= " "; - $display .= "\n"; + $display .= "\n"; $info = "\"\" ".$ui->dn." "; } else { $info = "\"\" ".$ui->dn." "; if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/netatalk"))){ - $info .= "\"\" "._("Click the 'Edit' button below to change informations in this dialog"); - $display .= "\n"; + $info .= "\"\" ".msgPool::clickEditToChange()); + $display .= "\n"; } $display .= "\n"; -- 2.30.2