openrat-cms

commit d83bf20425ca8f74fa06f82e4258cc380356718f
parent 93719f352950d21443ee50dd453efe242bbad889
Author: dankert <devnull@localhost>
Date:   Sun, 28 Nov 2004 19:39:18 +0100

Anpassen an neue Sprachdatei-Konventionen

Diffstat:
actionClasses/MainmenuAction.class.php
 | 
17
++++++++++-------
serviceClasses/AdministrationTree.class.php
 | 
22
+++++++++++-----------

2 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/actionClasses/MainmenuAction.class.php b/actionClasses/MainmenuAction.class.php
@@ -20,7 +20,10 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // ---------------------------------------------------------------------------
 // $Log$
-// Revision 1.6  2004-11-28 16:54:56  dankert
+// Revision 1.7  2004-11-28 18:39:18  dankert
+// Anpassen an neue Sprachdatei-Konventionen
+//
+// Revision 1.6  2004/11/28 16:54:56  dankert
 // Abfrage der Berechtigungen bei Menueaufbau
 //
 // Revision 1.5  2004/11/27 13:07:34  dankert
@@ -74,7 +77,7 @@ class MainmenuAction extends Action
 
 	function addSubAction( $name,$aclbit=0 )
 	{
-		if   ( $this->obj->hasRight($aclbit) )
+		if   ( $aclbit==0 || $this->obj->hasRight($aclbit) )
 			$this->subActionList[ $name ] = lang( 'MENU_'.strtoupper($name) );
 	}
 
@@ -304,13 +307,13 @@ class MainmenuAction extends Action
 	{
 		$this->setTemplateVar('folder',array() );
 
-		$list = array();	
-		$list['listing'] = lang('LISTING');
+		$this->addSubaction('listing');
 
 		if   ( intval($this->getSessionVar('projectid')) != 0 )
 		{
-			$list['edit'] = lang('EDIT');
-			$project = new Project($this->getSessionVar('projectid'));
+			$this->addSubaction('edit');
+
+			$project = new Project( $this->getSessionVar('projectid') );
 			$project->load();
 			$this->setTemplateVar('text',$project->name );
 		}
@@ -319,7 +322,7 @@ class MainmenuAction extends Action
 			$this->setTemplateVar('text','' );
 		}
 
-		$this->setTemplateVar('subaction',$list);
+		$this->setTemplateVar('subaction',$this->subActionList);
 		$this->setTemplateVar('param','projectid');
 
 		$this->callSubAction('show');
diff --git a/serviceClasses/AdministrationTree.class.php b/serviceClasses/AdministrationTree.class.php
@@ -34,8 +34,8 @@ class AdministrationTree extends AbstractTree
 	function root()
 	{
 		$treeElement = new TreeElement();
-		$treeElement->text        = lang('ADMINISTRATION');
-		$treeElement->description = lang('ADMINISTRATION');
+		$treeElement->text        = lang('GLOBAL_ADMINISTRATION');
+		$treeElement->description = lang('GLOBAL_ADMINISTRATION');
 		$treeElement->type        = 'administration';
 		$treeElement->icon        = 'project_list';
 		
@@ -47,8 +47,8 @@ class AdministrationTree extends AbstractTree
 	function administration()
 	{
 		$treeElement = new TreeElement();
-		$treeElement->text        = lang('PROJECTS');
-		$treeElement->description = lang('PROJECTS');
+		$treeElement->text        = lang('GLOBAL_PROJECTS');
+		$treeElement->description = lang('GLOBAL_PROJECTS');
 		$treeElement->url         = Html::url(array('action'       =>'main',
 		                                            'callSubaction'=>'listing',
 		                                            'callAction'   =>'project',
@@ -93,8 +93,8 @@ class AdministrationTree extends AbstractTree
 	function userandgroups( $id )
 	{
 		$treeElement = new TreeElement();
-		$treeElement->text        = lang('USER');
-		$treeElement->description = lang('USER');
+		$treeElement->text        = lang('GLOBAL_USER');
+		$treeElement->description = lang('GLOBAL_USER');
 		$treeElement->url         = Html::url(array('action'       =>'main',
 		                                            'callSubaction'=>'listing',
 		                                            'callAction'   =>'user',
@@ -106,8 +106,8 @@ class AdministrationTree extends AbstractTree
 		$this->addTreeElement( $treeElement );
 
 		$treeElement = new TreeElement();
-		$treeElement->text        = lang('GROUPS');
-		$treeElement->description = lang('GROUPS');
+		$treeElement->text        = lang('GLOBAL_GROUPS');
+		$treeElement->description = lang('GLOBAL_GROUPS');
 		$treeElement->url         = Html::url(array('action'       =>'main',
 		                                            'callSubaction'=>'listing',
 		                                            'callAction'   =>'group',
@@ -161,9 +161,9 @@ class AdministrationTree extends AbstractTree
 			$desc =  $u->fullname;
 
 			if	( $u->isAdmin )
-				$desc .= ' ('.lang('ADMIN').') ';
+				$desc .= ' ('.lang('GLOBAL_ADMIN').') ';
 			if	( $u->desc == "" )
-				$desc .= ' - '.lang('NO_DESCRIPTION_AVAILABLE');
+				$desc .= ' - '.lang('GLOBAL_NO_DESCRIPTION_AVAILABLE');
 			else
 				$desc .= ' - '.$u->desc;
 
@@ -191,7 +191,7 @@ class AdministrationTree extends AbstractTree
 		                                                                 'callAction'   =>'group',
 		                                                                 'groupid'    =>$id       ));
 			$treeElement->icon        = 'group';
-	     	$treeElement->description = lang('GROUP').' '.$g->name.': '.implode(', ',$g->getUsers());
+	     	$treeElement->description = lang('GLOBAL_GROUP').' '.$g->name.': '.implode(', ',$g->getUsers());
 			$treeElement->target      = 'cms_main';
 			$treeElement->type        = 'userofgroup';