steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include locale.php, NONE, 1.1 auth.class.php, 1.8, 1.9 form.class.php, 1.16, 1.17 ldap.class.php, 1.21, 1.22 menu.php, 1.11, 1.12 mysmarty.php.in, 1.2, 1.3

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv2701/kolab-webadmin/php/admin/include

Modified Files:
	auth.class.php form.class.php ldap.class.php menu.php 
	mysmarty.php.in 
Added Files:
	locale.php 
Log Message:
Integrated i18n code from Romain, bumped version to 0.4.0

--- NEW FILE: locale.php ---
(This appears to be a binary file; contents omitted.)

Index: auth.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/auth.class.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- auth.class.php	16 Dec 2004 21:03:29 -0000	1.8
+++ auth.class.php	10 Mar 2005 21:58:19 -0000	1.9
@@ -21,6 +21,7 @@
 require_once('ldap.class.php');
 require_once('debug.php');
 require_once('mysmarty.php');
+require_once('locale.php');
 
 class KolabAuth {
 	function KolabAuth( $do_auth = true ) {
@@ -112,7 +113,7 @@
 		$smarty->assign( 'topdir', $topdir );
 		$smarty->assign( 'uid', '' );
 		$smarty->assign( 'group', '' );
-		$smarty->assign( 'page_title', 'Login' );
+		$smarty->assign( 'page_title', _('Login') );
 		$smarty->assign( 'menuitems', array() );
 		$smarty->assign( 'errors', array( $this->error() ) );
 		$smarty->assign( 'maincontent', 'login.tpl' );

Index: form.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- form.class.php	24 Feb 2005 12:59:04 -0000	1.16
+++ form.class.php	10 Mar 2005 21:58:19 -0000	1.17
@@ -18,6 +18,8 @@
  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
  */
 
+require_once('mysmarty.php');
+
 class KolabForm {
   /*
    * $entries should be an array of the form:

Index: ldap.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ldap.class.php	21 Jan 2005 11:29:47 -0000	1.21
+++ ldap.class.php	10 Mar 2005 21:58:19 -0000	1.22
@@ -18,6 +18,7 @@
  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
  */
 
+require_once('mysmarty.php');
 require_once('session_vars.php');
 require_once('debug.php');
 

Index: menu.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/menu.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- menu.php	26 Jan 2005 00:37:00 -0000	1.11
+++ menu.php	10 Mar 2005 21:58:19 -0000	1.12
@@ -18,6 +18,8 @@
  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
  */
 
+require_once('locale.php');
+
 $menuitems = array();
 
 if( $auth->group() == "admin" || $auth->group() == "maintainer" ) {
@@ -59,7 +61,7 @@
 									   'title' => _('Manage Distribution Lists'),
 									   'submenu' => array(
 														  array( 'name' => _('Create New List'),
-   															 'url'   => _('list.php?action=create') ) ) );
+   															 'url'   => 'list.php?action=create' ) ) );
 }
 if( $auth->group() == 'admin' ) {
   $menuitems['administrator'] = array( 'name' => _('Administrators'),

Index: mysmarty.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/mysmarty.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mysmarty.php.in	19 Jul 2004 01:36:59 -0000	1.2
+++ mysmarty.php.in	10 Mar 2005 21:58:19 -0000	1.3
@@ -20,8 +20,10 @@
 
 require_once('Smarty/Smarty.class.php');
 
+/* PENDING(steffen): Move variables unrelated to Smarty to a separate file */
 $topdir = '/admin';
 $kolab_prefix = '@prefix@';
+$locale_dir = '@phpdir@/admin/locale/';
 
 // PENDING: Remove this before production(!)
 //function count_bytes($tpl_output, &$smarty) {
@@ -38,6 +40,8 @@
 	$this->compile_dir = $basedir.'templates_c/';
 	$this->config_dir = $basedir.'configs/';
 	$this->cache_dir = $basedir.'cache/';
+	// Added for i18n management (Romain 05-03-03)
+	$this->register_function("tr", "translate");
 
 	//$this->register_outputfilter("count_bytes");