openrat-cms

commit 9ed3aac26d0bf17754c79cdf3914efe20dc9d0b0
parent d33d839ce1f465578e3c0ce9f4269102d03758f1
Author: dankert <devnull@localhost>
Date:   Wed, 17 Feb 2010 00:48:57 +0100

Sprachschlüssel ohne \"GLOBAL_\" ansprechen.

Diffstat:
actionClasses/ElementAction.class.php
 | 
2
+-
actionClasses/GroupAction.class.php
 | 
2
+-
actionClasses/IndexAction.class.php
 | 
2
+-
actionClasses/LinkAction.class.php
 | 
2
+-
actionClasses/MainmenuAction.class.php
 | 
4
++--
actionClasses/ModelAction.class.php
 | 
2
+-
actionClasses/ObjectAction.class.php
 | 
2
+-
actionClasses/PageelementAction.class.php
 | 
6
+++---
actionClasses/SearchAction.class.php
 | 
4
++--
actionClasses/TitleAction.class.php
 | 
4
++--

10 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/actionClasses/ElementAction.class.php b/actionClasses/ElementAction.class.php
@@ -518,7 +518,7 @@ class ElementAction extends Action
 								continue 2;
 						}
 
-						$objects[ $id ]  = lang( 'GLOBAL_'.$o->getType() ).': ';
+						$objects[ $id ]  = lang( $o->getType() ).': ';
 						
 						if	( !$o->isRoot )
 						{
diff --git a/actionClasses/GroupAction.class.php b/actionClasses/GroupAction.class.php
@@ -227,7 +227,7 @@ class GroupAction extends Action
 
 		global $conf;
 		if	($conf['security']['authorize']['type']=='ldap')
-			$this->addNotice('user',$this->user->name,'GROUPS_MAY_CONFLICT_WITH_LDAP',OR_NOTICE_WARN);
+			$this->addNotice('group',$this->group->name,'GROUPS_MAY_CONFLICT_WITH_LDAP',OR_NOTICE_WARN);
 	}
 	
 	
diff --git a/actionClasses/IndexAction.class.php b/actionClasses/IndexAction.class.php
@@ -1142,7 +1142,7 @@ class IndexAction extends Action
 		{
 			if ( $project->projectid == PROJECTID_ADMIN )
 			{
-				$project->name = lang('GLOBAL_ADMINISTRATION');
+				$project->name = lang('ADMINISTRATION');
 				Session::setProject( $project );
 	
 				Session::setProjectLanguage( '' );
diff --git a/actionClasses/LinkAction.class.php b/actionClasses/LinkAction.class.php
@@ -183,7 +183,7 @@ class LinkAction extends ObjectAction
 				$folder = new Folder( $o->parentid );
 				$folder->linknames = false;
 				$folder->load();
-				$list[$oid]  = lang( 'GLOBAL_'.$o->getType() ).': ';
+				$list[$oid]  = lang( $o->getType() ).': ';
 				$list[$oid] .= implode( FILE_SEP,$folder->parentObjectNames( false,true ) );
 				$list[$oid] .= FILE_SEP.$o->name;
 			}
diff --git a/actionClasses/MainmenuAction.class.php b/actionClasses/MainmenuAction.class.php
@@ -462,7 +462,7 @@ class MainmenuAction extends Action
 		}
 		else
 		{
-			$this->setTemplateVar('text',lang('GLOBAL_PROJECTS') );
+			$this->setTemplateVar('text',lang('PROJECTS') );
 		}
 		
 		if	( count( Project::getAllProjectIds() ) > 0 )
@@ -522,7 +522,7 @@ class MainmenuAction extends Action
 	{
 		$this->addSubaction('prop'   );
 		$this->addSubaction('content');
-		$this->setTemplateVar('text',lang('GLOBAL_SEARCH'));
+		$this->setTemplateVar('text',lang('SEARCH'));
 		$this->setTemplateVar('windowMenu',$this->subActionList);
 		$this->setTemplateVar('param','objectid');
 	}
diff --git a/actionClasses/ModelAction.class.php b/actionClasses/ModelAction.class.php
@@ -93,7 +93,7 @@ class ModelAction extends Action
 		if	( empty($model->name) )
 		{
 			// Name ist "Variante <id>"
-			$model->name = lang('GLOBAL_MODEL').' '.$model->modelid;
+			$model->name = lang('MODEL').' '.$model->modelid;
 			$model->save();
 		}
 	}
diff --git a/actionClasses/ObjectAction.class.php b/actionClasses/ObjectAction.class.php
@@ -310,7 +310,7 @@ class ObjectAction extends Action
 		$this->setTemplateVar('users'    ,User::listAll()   );
 		$this->setTemplateVar('groups'   ,Group::getAll()   );
 
-		$languages = array(0=>lang('GLOBAL_ALL_LANGUAGES'));
+		$languages = array(0=>lang('ALL_LANGUAGES'));
 		$languages += Language::getAll();
 		$this->setTemplateVar('languages',$languages       );
 		$this->setTemplateVar('objectid' ,$o->objectid     );
diff --git a/actionClasses/PageelementAction.class.php b/actionClasses/PageelementAction.class.php
@@ -398,7 +398,7 @@ class PageelementAction extends Action
 			$f = new Folder( $o->parentid );
 			//					$f->load();
 
-			$objects[ $id ]  = lang( 'GLOBAL_'.$o->getType() ).': ';
+			$objects[ $id ]  = lang( $o->getType() ).': ';
 			$objects[ $id ] .=  implode( FILE_SEP,$f->parentObjectNames(false,true) );
 			$objects[ $id ] .= FILE_SEP.$o->name;
 			//			}
@@ -453,7 +453,7 @@ class PageelementAction extends Action
 				$f = new Folder( $o->parentid );
 				//					$f->load();
 
-				$objects[ $id ]  = lang( 'GLOBAL_'.$o->getType() ).': ';
+				$objects[ $id ]  = lang( $o->getType() ).': ';
 				$objects[ $id ] .=  implode( FILE_SEP,$f->parentObjectNames(false,true) );
 				$objects[ $id ] .= FILE_SEP.$o->name;
 				//			}
@@ -521,7 +521,7 @@ class PageelementAction extends Action
 				$f = new Folder( $id );
 				$f->load();
 					
-				$objects[ $id ]  = lang( 'GLOBAL_'.$f->getType() ).': ';
+				$objects[ $id ]  = lang( $f->getType() ).': ';
 				$objects[ $id ] .=  implode( ' &raquo; ',$f->parentObjectNames(false,true) );
 			}
 
diff --git a/actionClasses/SearchAction.class.php b/actionClasses/SearchAction.class.php
@@ -99,7 +99,7 @@ class SearchAction extends Action
 			if	( $o->desc != '' )
 				$resultList[$objectid]['desc'] = $o->desc;
 			else
-				$resultList[$objectid]['desc'] = lang('GLOBAL_NO_DESCRIPTION_AVAILABLE');
+				$resultList[$objectid]['desc'] = lang('NO_DESCRIPTION_AVAILABLE');
 		}
 
 		foreach( $listTemplateIds as $templateid )
@@ -110,7 +110,7 @@ class SearchAction extends Action
 			$resultList['t'.$templateid]['url' ]  = Html::url('main','template',$templateid);
 			$resultList['t'.$templateid]['type'] = 'template';
 			$resultList['t'.$templateid]['name'] = $t->name;
-			$resultList['t'.$templateid]['desc'] = lang('GLOBAL_NO_DESCRIPTION_AVAILABLE');
+			$resultList['t'.$templateid]['desc'] = lang('NO_DESCRIPTION_AVAILABLE');
 			$resultList['t'.$templateid]['lastchange_date'] = 0;
 		}
 
diff --git a/actionClasses/TitleAction.class.php b/actionClasses/TitleAction.class.php
@@ -58,12 +58,12 @@ class TitleAction extends Action
 		if	( Session::get('showtree') )
 		{
 			$this->setTemplateVar('showtree_url' ,Html::url('index','hidetree') );
-			$this->setTemplateVar('showtree_text',lang('GLOBAL_HIDETREE')       );
+			$this->setTemplateVar('showtree_text',lang('HIDETREE')       );
 		}
 		else
 		{
 			$this->setTemplateVar('showtree_url' ,Html::url('index','showtree') );
-			$this->setTemplateVar('showtree_text',lang('GLOBAL_SHOWTREE')       );
+			$this->setTemplateVar('showtree_text',lang('SHOWTREE')       );
 		}
 		
 		if	( config('interface','session','auto_extend') )