openrat-cms

commit 41889ee0c7b8afd121bb41d256ec423b961f6598
parent 29d78e6a9bf0824d0e6acda1e7935994f44ee88e
Author: dankert <devnull@localhost>
Date:   Sun, 28 Nov 2004 20:26:07 +0100

Anpassen an neue Sprachdatei-Konventionen

Diffstat:
actionClasses/ObjectAction.class.php
 | 
7
+++++--
objectClasses/Acl.class.php
 | 
7
+++++--
themes/default/pages/html/object/rights.tpl.php
 | 
12
++++++------

3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/actionClasses/ObjectAction.class.php b/actionClasses/ObjectAction.class.php
@@ -20,7 +20,10 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // ---------------------------------------------------------------------------
 // $Log$
-// Revision 1.2  2004-11-28 16:55:20  dankert
+// Revision 1.3  2004-11-28 19:25:38  dankert
+// Anpassen an neue Sprachdatei-Konventionen
+//
+// Revision 1.2  2004/11/28 16:55:20  dankert
 // Berechtigungen f?r "alle" hinzufuegen
 //
 // Revision 1.1  2004/11/27 13:08:22  dankert
@@ -140,7 +143,7 @@ class ObjectAction extends Action
 		$this->setTemplateVar('users'    ,User::listAll()   );
 		$this->setTemplateVar('groups'   ,Group::getAll()   );
 
-		$languages = array(0=>lang('ALL_LANGUAGES'));
+		$languages = array(0=>lang('GLOBAL_ALL_LANGUAGES'));
 		$languages += Language::getAll();
 		$this->setTemplateVar('languages',$languages       );
 		$this->setTemplateVar('objectid' ,$o->objectid     );
diff --git a/objectClasses/Acl.class.php b/objectClasses/Acl.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 11:22:55  dankert
+// Revision 1.7  2004-11-28 19:25:51  dankert
+// Anpassen an neue Sprachdatei-Konventionen
+//
+// Revision 1.6  2004/11/28 11:22:55  dankert
 // Speichern einer Berechtigung fuer "alle"
 //
 // Revision 1.5  2004/11/15 21:02:32  dankert
@@ -221,7 +224,7 @@ class Acl
 		$this->setDatabaseRow( $row );		
 
 		if	( intval($this->languageid)==0 )
-			$this->languagename = lang('ALL_LANGUAGES');
+			$this->languagename = lang('GLOBAL_ALL_LANGUAGES');
 		else	$this->languagename = $row['languagename'];
 		$this->username     = $row['username'    ];
 		$this->groupname    = $row['groupname'   ];
diff --git a/themes/default/pages/html/object/rights.tpl.php b/themes/default/pages/html/object/rights.tpl.php
@@ -9,7 +9,7 @@
   <th colspan="15"><?php echo lang('ACL') ?></th>
 </tr>
   <tr>
-    <td class="help"><?php echo lang('GLOBAL_NAME') ?></td>
+    <td class="help"><?php echo lang('GLOBAL_NAME')     ?></td>
     <td class="help"><?php echo lang('GLOBAL_LANGUAGE') ?></td>
     <?php foreach( $show as $t ) { ?>
     <td class="help"><span title="<?php echo lang('ACL_'.strtoupper($t)) ?>"><strong><?php echo lang('ACL_'.strtoupper($t).'_ABBREV') ?></strong></span></td>
@@ -44,12 +44,12 @@
 
 <?php if (isset($z['delete_url']))
       { ?>
-<td class="<?php echo $fx ?>"><a href="<?php echo $z['delete_url'] ?>"><?php echo lang('DELETE') ?></a></td>
+<td class="<?php echo $fx ?>"><a href="<?php echo $z['delete_url'] ?>"><?php echo lang('GLOBAL_DELETE') ?></a></td>
 <?php }
       else
       { ?>
 
-<td class="<?php echo $fx ?>"><?php echo lang('inherited') ?></td>
+<td class="<?php echo $fx ?>"><?php echo lang('ACL_INHERITED') ?></td>
 <?php } ?>
 </tr>
 <?php }
@@ -71,20 +71,20 @@
 <td class="<?php echo $fx ?>"><input type="radio" name="type" value="all" checked="checked" /></td>
 </tr>
 <tr>
-<td class="<?php echo $fx ?>" colspan="2"><?php echo lang('USER') ?></td>
+<td class="<?php echo $fx ?>" colspan="2"><?php echo lang('GLOBAL_USER') ?></td>
 <td class="<?php echo $fx ?>"><input type="radio" name="type" value="user" />&nbsp;<?php echo Html::selectBox( 'userid',$users,0,array('onfocus'=>'document.forms[0].type[1].checked=true')); ?></td>
 </tr>
 
 <?php if (count($groups)>0)
       { ?>
 <tr>
-<td class="<?php echo $fx ?>" colspan="2"><?php echo lang('GLOBAL_OR').' '.lang('GROUP') ?></td>
+<td class="<?php echo $fx ?>" colspan="2"><?php echo lang('GLOBAL_GROUP') ?></td>
 <td class="<?php echo $fx ?>"><input type="radio" name="type" value="group" />&nbsp;<?php echo Html::selectBox( 'groupid',$groups,0,array('onfocus'=>'document.forms[0].type[2].checked=true')); ?></td>
 </tr>
 <?php } ?>
 
 <tr>
-<td class="<?php echo $fx ?>" colspan="2"><?php echo lang('LANGUAGE') ?></td>
+<td class="<?php echo $fx ?>" colspan="2"><?php echo lang('GLOBAL_LANGUAGE') ?></td>
 <td class="<?php echo $fx ?>"><?php echo Html::selectBox( 'languageid',$languages); ?></td>
 </tr>
 <tr>