openrat-cms

commit f33072b8588d382a6dceb5c9ce33cf05e730e3cb
parent 95b8610beccfc9aa7dc5b452b98c3dbee8c92a99
Author: dankert <devnull@localhost>
Date:   Sat, 17 Nov 2007 13:58:39 +0100

In "message:..." auch Variablen erlauben.

Diffstat:
serviceClasses/TemplateEngine.class.php
 | 
9
++++++---
themes/default/templates/user/rights.tpl.src.php
 | 
2
+-

2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/serviceClasses/TemplateEngine.class.php b/serviceClasses/TemplateEngine.class.php
@@ -168,16 +168,19 @@ class TemplateEngine
 				// Siehe http://de.php.net/manual/de/language.types.boolean.php
 				if	( $value == 'true' || $value == 'false' )
 					return $value;
-				else
+				else
+					// macht aus "text1{var}text2" => "text1".$var."text2"
 					return "'".preg_replace('/{(\w+)\}/','\'.$\\1.\'',$value)."'";
-			case 'method':
+			case 'method':
 				return $invert.'$this->'.$value.'()';
 			case 'size':
 				return 'count($'.$value.')';
 			case 'property':
 				return $invert.'$this->'.$value;
 			case 'message':
-				return 'lang('."'".$value."'".')';
+//				return 'lang('."'".$value."'".')';
+					// macht aus "text1{var}text2" => "text1".$var."text2"
+				return 'lang('."'".preg_replace('/{(\w+)\}/','\'.$\\1.\'',$value)."'".')';
 			case 'messagevar':
 				return 'lang($'.$value.')';
 			case 'arrayvar':
diff --git a/themes/default/templates/user/rights.tpl.src.php b/themes/default/templates/user/rights.tpl.src.php
@@ -22,7 +22,7 @@ page
 						
 					list list:show value:t
 						cell class:help
-							text key:var:t prefix:acl_ suffix:_abbrev
+							text key:var:t prefix:acl_ suffix:_abbrev title:message:acl_{t}
 	
 			list list:rights key:aclid value:acl extract:true
 				row