0
@@ -24,132 +24,50 @@ require_once("../include.php");
0
 
0
 check_login();
0
 
0
-include_once("header.php");
0
-
0
-?>
0
-
0
-<div class="pagecontainer">
0
-	<div class="pageoverflow">
0
-
0
-<?php
0
-
0
-	$userid = get_userid();
0
-	$perm = check_permission($userid, 'Modify Permissions');
0
-	$assign = check_permission($userid, 'Modify Group Assignments');
0
-	$edit = check_permission($userid, 'Modify Groups');
0
-	$remove = check_permission($userid, 'Remove Groups');
0
-
0
-	#$query = "SELECT group_id, group_name, active FROM ".cms_db_prefix()."groups ORDER BY group_id";
0
-	#$result = $db->Execute($query);
0
-
0
-	$grouplist = cms_orm()->cms_group->find_all(array('order' => 'name'));
0
-
0
-	$page = 1;
0
-	if (isset($_GET['page'])) $page = $_GET['page'];
0
-	$limit = 20;
0
-	if (count($grouplist) > $limit)
0
-	{
0
-		echo "<p class=\"pageshowrows\">".pagination($page, count($grouplist), $limit)."</p>";
0
-	}
0
-	echo $themeObject->ShowHeader('currentgroups').'</div>';
0
-	if (count($grouplist) > 0) {
0
-
0
-		echo "<table cellspacing=\"0\" class=\"pagetable\">\n";
0
-		echo '<thead>';
0
-		echo "<tr>\n";
0
-		echo "<th class=\"pagew60\">".lang('name')."</th>\n";
0
-		echo "<th class=\"pagepos\">".lang('active')."</th>\n";
0
-		if ($perm)
0
-			echo "<th class=\"pageicon\">&nbsp;</th>\n";
0
-		if ($assign)
0
-			echo "<th class=\"pageicon\">&nbsp;</th>\n";
0
-		if ($edit)
0
-			echo "<th class=\"pageicon\">&nbsp;</th>\n";
0
-		if ($remove)
0
-			echo "<th class=\"pageicon\">&nbsp;</th>\n";
0
-		echo "</tr>\n";
0
-		echo '</thead>';
0
-		echo '<tbody>';
0
-
0
-		$currow = "row1";
0
+//$grouplist = cms_orm()->cms_group->find_all(array('order' => 'name'));
0
 
0
-		// construct true/false button images
0
-        $image_true = $themeObject->DisplayImage('icons/system/true.gif', lang('true'),'','','systemicon');
0
-        $image_false = $themeObject->DisplayImage('icons/system/false.gif', lang('false'),'','','systemicon');
0
-        $image_groupassign = $themeObject->DisplayImage('icons/system/groupassign.gif', lang('assignments'),'','','systemicon');
0
-        $image_permissions = $themeObject->DisplayImage('icons/system/permissions.gif', lang('permissions'),'','','systemicon');
0
+//
0
+// PROCESS Any GET or POST results here
0
+//
0
+$page = 1;
0
+if (isset($_GET['page'])) $page = $_GET['page'];
0
 
0
-		$counter=0;
0
-		foreach ($grouplist as $onegroup)
0
-		{
0
-			if ($counter < $page*$limit && $counter >= ($page*$limit)-$limit)
0
-			{
0
-				echo "<tr class=\"$currow\" onmouseover=\"this.className='".$currow.'hover'."';\" onmouseout=\"this.className='".$currow."';\">\n";
0
-				echo "<td><a href=\"editgroup.php?group_id=".$onegroup->id."\">".$onegroup->name."</a></td>\n";
0
-				echo "<td class=\"pagepos\">".($onegroup->active == 1?$image_true:$image_false)."</td>\n";
0
-				if ($perm)
0
-					echo "<td class=\"pagepos icons_wide\"><a href=\"changegroupperm.php?group_id=".$onegroup->id."\">".$image_permissions."</a></td>\n";
0
-				if ($assign)
0
-					echo "<td class=\"pagepos icons_wide\"><a href=\"changegroupassign.php?group_id=".$onegroup->id."\">".$image_groupassign."</a></td>\n";
0
-				if ($onegroup->name != 'Admin' && $onegroup->name != 'Anonymous')
0
-				{
0
-					if ($edit)
0
-					{
0
-						echo "<td class=\"icons_wide\"><a href=\"editgroup.php?group_id=".$onegroup->id."\">";
0
-	                    echo $themeObject->DisplayImage('icons/system/edit.gif', lang('edit'),'','','systemicon');
0
-	                    echo "</a></td>\n";
0
-					}
0
-					else
0
-					{
0
-						echo '<td></td>';
0
-					}
0
-					if ($remove)
0
-					{
0
-						echo "<td class=\"icons_wide\"><a href=\"deletegroup.php?group_id=".$onegroup->id."\" onclick=\"return confirm('".lang('deleteconfirm')."');\">";
0
-						echo $themeObject->DisplayImage('icons/system/delete.gif', lang('delete'),'','','systemicon');
0
-						echo "</a></td>\n";
0
-					}
0
-					else
0
-					{
0
-						echo '<td></td>';
0
-					}
0
-				}
0
-				else
0
-				{
0
-					echo '<td></td><td></td>';
0
-				}
0
-				echo "</tr>\n";
0
-
0
-				($currow == "row1"?$currow="row2":$currow="row1");
0
-			}
0
-			$counter++;
0
-		}
0
-
0
-		echo '</tbody>';
0
-		echo "</table>\n";
0
-
0
-	}
0
-
0
-if (check_permission($userid, 'Add Groups')) {
0
-?>
0
-	<div class="pageoptions">
0
-		<p class="pageoptions">
0
-			<a href="addgroup.php">
0
-				<?php 
0
-					echo $themeObject->DisplayImage('icons/system/newobject.gif', lang('addgroup'),'','','systemicon').'</a>';
0
-					echo ' <a class="pageoptions" href="addgroup.php">'.lang("addgroup");
0
-				?>
0
-			</a>
0
-		</p>
0
-	</div>
0
-</div>
0
-
0
-<p class="pageback"><a class="pageback" href="<?php echo $themeObject->BackUrl(); ?>">&#171; <?php echo lang('back')?></a></p>
0
+// 
0
+// Begin Output
0
+//
0
+include_once("header.php");
0
+$smarty = cms_smarty();
0
+$smarty->assign('header_name',$themeObject->ShowHeader('currentgroups'));
0
+local_setup_smarty( $themeObject, $page );
0
+//$smarty->assign('group_list',$smarty->fetch('listgroups-list.tpl'));
0
+$smarty->display('listgroups.tpl');
0
+include_once("footer.php");
0
 
0
-<?php
0
+function local_setup_smarty( &$themeObject, $page )
0
+{
0
+  $gCms = cmsms();
0
+  $groupops = $gCms->GetGroupOperations();
0
+  $grouplist = $groupops->load_groups();
0
+  $smarty = cms_smarty();
0
+
0
+  $userid = get_userid();
0
+  $perm = check_permission($userid, 'Modify Permissions');
0
+  $assign = check_permission($userid, 'Modify Group Assignments');
0
+  $edit = check_permission($userid, 'Modify Groups');
0
+  $remove = check_permission($userid, 'Remove Groups');
0
+
0
+  // Set permissions to smarty
0
+  $smarty->assign('modify_permissions',$perm);
0
+  $smarty->assign('modify_group_assignments',$assign);
0
+  $smarty->assign('modify_groups',$edit);
0
+  $smarty->assign('remove_groups',$remove);
0
+
0
+  $limit = get_preference($userid,'pagelimit',20);
0
+  $smarty->assign('pagination',$page,count($grouplist),$limit);
0
+  $smarty->assign('pagelimit',$limit);
0
+  $smarty->assign('page',$page);
0
+  $smarty->assign('groups',$grouplist);
0
 }
0
 
0
-include_once("footer.php");
0
-
0
 # vim:ts=4 sw=4 noet
0
 ?>

0
@@ -6,7 +6,7 @@
0
   <meta name="Generator" content="CMS Made Simple - Copyright (C) 2004-2007 Ted Kulp. All rights reserved." />
0
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
0
   <meta name="robots" content="noindex, nofollow" />
0
-	<title>{translate}CMS Admin{/translate} - Tags</title>
0
+	<title>{sitename} - Tags</title>
0
   <link rel="stylesheet" type="text/css" href="style.php" />
0
   <link rel="stylesheet" href="../lib/jquery/tabs/jquery.tabs.css" type="text/css" media="print, projection, screen" />
0
 

0
@@ -1,16 +1,16 @@
0
-<h3>{translate}Account Setup{/translate}</h3>
0
+<h3>{tr}Account Setup{/tr}</h3>
0
 
0
 <p>
0
-  {translate}This is a paragraph about the wonders of account setup.{/translate}
0
+  {tr}This is a paragraph about the wonders of account setup.{/tr}
0
 </p>
0
 
0
 <form action="index.php" method="post" id="accountform">
0
 <div class="callout">
0
   <fieldset>
0
-    <legend>{translate}Admin Account{/translate}</legend>
0
+    <legend>{tr}Admin Account{/tr}</legend>
0
     <p>
0
       <span class="go_left">
0
-        {translate}Username{/translate}:
0
+        {tr}Username{/tr}:
0
       </span>
0
       <span class="go_right">
0
         <input type="text" id="admin_account_username" name="admin_account[username]" value="{$smarty.session.admin_account.username}" />
0
@@ -18,7 +18,7 @@
0
     </p>
0
     <p>
0
       <span class="go_left">
0
-        {translate}Password{/translate}:
0
+        {tr}Password{/tr}:
0
       </span>
0
       <span class="go_right">
0
         <input type="password" id="admin_account_password" name="admin_account[password]" value="{$smarty.session.admin_account.password}" />
0
@@ -26,7 +26,7 @@
0
     </p>
0
     <p>
0
       <span class="go_left">
0
-        {translate}Password Again{/translate}:
0
+        {tr}Password Again{/tr}:
0
       </span>
0
       <span class="go_right">
0
         <input type="password" id="admin_account_password_again" name="admin_account[password_again]" value="{$smarty.session.admin_account.password_again}" />
0
@@ -35,10 +35,10 @@
0
     <!--
0
     <p>
0
       <span class="go_left">
0
-        {translate}Click here to create this account{/translate}:
0
+        {tr}Click here to create this account{/tr}:
0
       </span>
0
       <span class="go_right">
0
-        <input type="submit" name="test_connection" value="{translate}Create Account{/translate}" onclick="xajax_create_account(xajax.getFormValues('accountform')); return false;" />
0
+        <input type="submit" name="test_connection" value="{tr}Create Account{/tr}" onclick="xajax_create_account(xajax.getFormValues('accountform')); return false;" />
0
       </span>
0
     </p>
0
     -->
0
@@ -49,8 +49,8 @@
0
 <br style="clear: both;" />
0
 
0
 <p>
0
-  <input type="submit" name="back" value="{translate}Back{/translate}" />
0
-  <input type="submit" name="next" value="{translate}Next{/translate}" />
0
+  <input type="submit" name="back" value="{tr}Back{/tr}" />
0
+  <input type="submit" name="next" value="{tr}Next{/tr}" />
0
 </p>
0
 
0
 </form>
0
\ No newline at end of file

0
@@ -5,7 +5,7 @@
0
 <head>
0
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
0
 
0
-	<title>{translate}CMS Made Simple Installation System{/translate}</title>
0
+	<title>{tr}CMS Made Simple Installation System{/tr}</title>
0
   
0
   {literal}
0
   <style>

0
@@ -1,34 +1,34 @@
0
-<h3>{translate}Environment Check{/translate}</h3>
0
+<h3>{tr}Environment Check{/tr}</h3>
0
 
0
 <p>
0
-  {translate}Here is a paragraph about the environment check.{/translate}
0
+  {tr}Here is a paragraph about the environment check.{/tr}
0
 </p>
0
 
0
 <div class="callout">
0
   <fieldset>
0
-    <legend>{translate}Required Settings{/translate}</legend>
0
+    <legend>{tr}Required Settings{/tr}</legend>
0
     <p>
0
-      <span class="go_left">{translate}PHP version 5.0.4+{/translate}</span>
0
+      <span class="go_left">{tr}PHP version 5.0.4+{/tr}</span>
0
       <span class="go_right">{$php_version}</span>
0
     </p>
0
     <p>
0
-      <span class="go_left">{translate}At least 1 database module{/translate}</span>
0
+      <span class="go_left">{tr}At least 1 database module{/tr}</span>
0
       <span class="go_right">({$which_database}) {$has_database}</span>
0
     </p>
0
     <p>
0
-      <span class="go_left">{translate}XML module{/translate}</span>
0
+      <span class="go_left">{tr}XML module{/tr}</span>
0
       <span class="go_right">{$has_xml}</span>
0
     </p>
0
     <p>
0
-      <span class="go_left">{translate}SimpleXML module{/translate}</span>
0
+      <span class="go_left">{tr}SimpleXML module{/tr}</span>
0
       <span class="go_right">{$has_simplexml}</span>
0
     </p>
0
     <p>
0
-      <span class="go_left">{translate}Write permission on{/translate} {$templates_path}</span>
0
+      <span class="go_left">{tr}Write permission on{/tr} {$templates_path}</span>
0
       <span class="go_right">{$canwrite_templates}</span>
0
     </p>
0
     <p>
0
-      <span class="go_left">{translate}Write permission on{/translate} {$cache_path}</span>
0
+      <span class="go_left">{tr}Write permission on{/tr} {$cache_path}</span>
0
       <span class="go_right">{$canwrite_cache}</span>
0
     </p>
0
   </fieldset>
0
@@ -36,33 +36,33 @@
0
 
0
 <div class="callout">
0
   <fieldset>
0
-    <legend>{translate}Recommended Settings{/translate}</legend>
0
+    <legend>{tr}Recommended Settings{/tr}</legend>
0
     <p>
0
-      <span class="go_left">{translate}File Uploads{/translate} {translate}(recommended: On){/translate}</span></span>
0
+      <span class="go_left">{tr}File Uploads{/tr} {tr}(recommended: On){/tr}</span></span>
0
       <span class="go_right">{$file_uploads}</span>
0
     </p>
0
     <p>
0
-      <span class="go_left">{translate}Safe Mode{/translate} {translate}(recommended: Off){/translate}</span>
0
+      <span class="go_left">{tr}Safe Mode{/tr} {tr}(recommended: Off){/tr}</span>
0
       <span class="go_right">{$safe_mode}</span>
0
     </p>
0
     <p>
0
-      <span class="go_left">{translate}Output Buffering{/translate} {translate}(recommended: Off){/translate}</span>
0
+      <span class="go_left">{tr}Output Buffering{/tr} {tr}(recommended: Off){/tr}</span>
0
       <span class="go_right">{$output_buffering}</span>
0
     </p>
0
     <p>
0
-      <span class="go_left">{translate}Register Globals{/translate} {translate}(recommended: Off){/translate}</span>
0
+      <span class="go_left">{tr}Register Globals{/tr} {tr}(recommended: Off){/tr}</span>
0
       <span class="go_right">{$register_globals}</span>
0
     </p>
0
     <p>
0
-      <span class="go_left">{translate}Magic Quotes Runtime{/translate} {translate}(recommended: Off){/translate}</span>
0
+      <span class="go_left">{tr}Magic Quotes Runtime{/tr} {tr}(recommended: Off){/tr}</span>
0
       <span class="go_right">{$magic_quotes_runtime}</span>
0
     </p>
0
     <p>
0
-      <span class="go_left">{translate}Write permission on{/translate} {$uploads_path} {translate}(recommended: On){/translate}</span>
0
+      <span class="go_left">{tr}Write permission on{/tr} {$uploads_path} {tr}(recommended: On){/tr}</span>
0
       <span class="go_right">{$canwrite_uploads}</span>
0
     </p>
0
     <p>
0
-      <span class="go_left">{translate}Write permission on{/translate} {$modules_path} {translate}(recommended: On){/translate}</span>
0
+      <span class="go_left">{tr}Write permission on{/tr} {$modules_path} {tr}(recommended: On){/tr}</span>
0
       <span class="go_right">{$canwrite_modules}</span>
0
     </p>
0
   </fieldset>
0
@@ -71,16 +71,16 @@
0
 <p>
0
     {if $failure or $failure2}
0
       <form action="index.php" method="get" style="display: inline;">
0
-        <input type="submit" name="check_again" value="{translate}Check Again{/translate}" />
0
+        <input type="submit" name="check_again" value="{tr}Check Again{/tr}" />
0
         <input type="hidden" name="action" value="check" />
0
       </form>
0
     {/if}
0
     <form action="index.php" method="get" style="display: inline;">
0
-      <input type="submit" name="back" value="{translate}Back{/translate}" />
0
+      <input type="submit" name="back" value="{tr}Back{/tr}" />
0
       <input type="hidden" name="action" value="intro" />
0
     </form>
0
     <form action="index.php" method="get" style="display: inline;">
0
-      <input type="submit" name="next" value="{translate}Next{/translate}" />
0
+      <input type="submit" name="next" value="{tr}Next{/tr}" />
0
       <input type="hidden" name="action" value="database" />
0
     </form>
0
   </form>

0
@@ -1,16 +1,16 @@
0
-<h3>{translate}Account Setup{/translate}</h3>
0
+<h3>{tr}Account Setup{/tr}</h3>
0
 
0
 <p>
0
-  {translate}This is a paragraph about the wonders of config setup.{/translate}
0
+  {tr}This is a paragraph about the wonders of config setup.{/tr}
0
 </p>
0
 
0
 <form action="index.php" method="post" id="configform">
0
 <div class="callout">
0
   <fieldset>
0
-    <legend>{translate}Config Setup{/translate}</legend>
0
+    <legend>{tr}Config Setup{/tr}</legend>
0
     <p>
0
       <span class="go_left">
0
-        {translate}Root file path{/translate}:
0
+        {tr}Root file path{/tr}:
0
       </span>
0
       <span class="go_right">
0
         <input type="text" id="config_rootpath" name="config[rootpath]" value="{$smarty.session.config.rootpath}" />
0
@@ -18,7 +18,7 @@
0
     </p>
0
     <p>
0
       <span class="go_left">
0
-        {translate}Root URL{/translate}:
0
+        {tr}Root URL{/tr}:
0
       </span>
0
       <span class="go_right">
0
         <input type="text" id="config_rooturl" name="config[rooturl]" value="{$smarty.session.config.rooturl}" />
0
@@ -30,8 +30,8 @@
0
 <br style="clear: both;" />
0
 
0
 <p>
0
-  <input type="submit" name="back" value="{translate}Back{/translate}" />
0
-  <input type="submit" name="next" value="{translate}Next{/translate}" />
0
+  <input type="submit" name="back" value="{tr}Back{/tr}" />
0
+  <input type="submit" name="next" value="{tr}Next{/tr}" />
0
 </p>
0
 <input type="hidden" name="action" value="create_config" />
0
 </form>
0
\ No newline at end of file

0
@@ -1,15 +1,15 @@
0
 {if $installed}
0
-  <p>{translate}The database was properly installed.{/translate}</p>
0
+  <p>{tr}The database was properly installed.{/tr}</p>
0
   {if $user_created}
0
-    <p>{translate}The user account was created successfully.{/translate}</p>
0
+    <p>{tr}The user account was created successfully.{/tr}</p>
0
   {if $config_created}
0
-		<p>{translate}The config file was created.{/translate}</p>
0
+		<p>{tr}The config file was created.{/tr}</p>
0
   {else}
0
-		<p>{translate}The config file could not be created{/translate}</p>
0
+		<p>{tr}The config file could not be created{/tr}</p>
0
   {/if}
0
   {else}
0
-    <p>{translate}The user account could not be created.{/translate}</p>
0
+    <p>{tr}The user account could not be created.{/tr}</p>
0
   {/if}
0
 {else}
0
-  <p>{translate}The database could not be created.{/translate}</p>
0
+  <p>{tr}The database could not be created.{/tr}</p>
0
 {/if}

0
@@ -1,16 +1,16 @@
0
-<h3>{translate}Database Setup{/translate}</h3>
0
+<h3>{tr}Database Setup{/tr}</h3>
0
 
0
 <p>
0
-  {translate}This is a paragraph about the wonders of database setup.{/translate}
0
+  {tr}This is a paragraph about the wonders of database setup.{/tr}
0
 </p>
0
 
0
 <form action="index.php" method="post" id="connectionform">
0
 <div class="callout">
0
   <fieldset>
0
-    <legend>{translate}Connection Details{/translate}</legend>
0
+    <legend>{tr}Connection Details{/tr}</legend>
0
     <p>
0
       <span class="go_left">
0
-        {translate}Database Driver{/translate}:
0
+        {tr}Database Driver{/tr}:
0
       </span>
0
       <span class="go_right">
0
         <select id="connection_driver" name="connection[driver]">
0
@@ -20,7 +20,7 @@
0
     </p>
0
     <p>
0
       <span class="go_left">
0
-        {translate}Hostname{/translate}:
0
+        {tr}Hostname{/tr}:
0
       </span>
0
       <span class="go_right">
0
         <input type="text" id="connection_hostname" name="connection[hostname]" value="{$smarty.session.connection.hostname}" />
0
@@ -28,7 +28,7 @@
0
     </p>
0
     <p>
0
       <span class="go_left">
0
-        {translate}Username{/translate}:
0
+        {tr}Username{/tr}:
0
       </span>
0
       <span class="go_right">
0
         <input type="text" id="connection_username" name="connection[username]" value="{$smarty.session.connection.username}" />
0
@@ -36,7 +36,7 @@
0
     </p>
0
     <p>
0
       <span class="go_left">
0
-        {translate}Password{/translate}:
0
+        {tr}Password{/tr}:
0
       </span>
0
       <span class="go_right">
0
         <input type="password" id="connection_password" name="connection[password]" value="{$smarty.session.connection.password}" />
0
@@ -44,7 +44,7 @@
0
     </p>
0
     <p>
0
       <span class="go_left">
0
-        {translate}Database Name{/translate}:
0
+        {tr}Database Name{/tr}:
0
       </span>
0
       <span class="go_right">
0
         <input type="text" id="connection_dbname" name="connection[dbname]" value="{$smarty.session.connection.dbname}" />
0
@@ -52,7 +52,7 @@
0
     </p>
0
     <p>
0
       <span class="go_left">
0
-        {translate}Drop Existing Tables{/translate}:
0
+        {tr}Drop Existing Tables{/tr}:
0
       </span>
0
       <span class="go_right">
0
         <input type="hidden" name="connection[drop_tables]" value="0" />
0
@@ -61,7 +61,7 @@
0
     </p>
0
     <p>
0
       <span class="go_left">
0
-        {translate}Table Prefix{/translate}:
0
+        {tr}Table Prefix{/tr}:
0
       </span>
0
       <span class="go_right">
0
         <input type="text" id="connection_table_prefix" name="connection[table_prefix]" value="{$smarty.session.connection.table_prefix}" />
0
@@ -69,10 +69,10 @@
0
     </p>
0
     <p>
0
       <span class="go_left">
0
-        {translate}Click here to test your connection settings{/translate}:
0
+        {tr}Click here to test your connection settings{/tr}:
0
       </span>
0
       <span class="go_right">
0
-        <input type="submit" name="test_connection" value="{translate}Test{/translate}" onclick="{literal}$('#connection_options').hide(); xajax_test_connection(xajax.getFormValues('connectionform')); return false;{/literal}" />
0
+        <input type="submit" name="test_connection" value="{tr}Test{/tr}" onclick="{literal}$('#connection_options').hide(); xajax_test_connection(xajax.getFormValues('connectionform')); return false;{/literal}" />
0
       </span>
0
     </p>
0
     <input type="hidden" name="action" value="database" />
0
@@ -83,7 +83,7 @@
0
 
0
 <div class="callout">
0
   <fieldset>
0
-    <legend>{translate}Test Results{/translate}</legend>
0
+    <legend>{tr}Test Results{/tr}</legend>
0
     <div id="connection_options" style="display: none;">
0
     </div>
0
   </fieldset>
0
@@ -92,8 +92,8 @@
0
 <br style="clear: both;" />
0
 
0
 <p>
0
-  <input type="submit" name="back" value="{translate}Back{/translate}" />
0
-  <input type="submit" name="next" value="{translate}Next{/translate}" />
0
+  <input type="submit" name="back" value="{tr}Back{/tr}" />
0
+  <input type="submit" name="next" value="{tr}Next{/tr}" />
0
 </p>
0
 
0
 </form>
0
\ No newline at end of file

0
@@ -1,14 +1,14 @@
0
 {if $databasetestresult.have_connection}
0
-  <p>{translate}You've successfully connected to the database server.{/translate}</p>
0
+  <p>{tr}You've successfully connected to the database server.{/tr}</p>
0
   {if $databasetestresult.have_existing_db}
0
-    <p>{translate}The database name you've entered already exists.{/translate}</p>
0
+    <p>{tr}The database name you've entered already exists.{/tr}</p>
0
   {else}
0
     {if $databasetestresult.have_create_ability}
0
-      <p>{translate}You have permissions to create the database.{/translate}</p>
0
+      <p>{tr}You have permissions to create the database.{/tr}</p>
0
     {else}
0
-      <p>{translate}You do not have permission to create this database.  Please have a system administrator create it, and then click "Test" above again to recheck your settings.{/translate}</p>
0
+      <p>{tr}You do not have permission to create this database.  Please have a system administrator create it, and then click "Test" above again to recheck your settings.{/tr}</p>
0
     {/if}
0
   {/if}
0
 {else}
0
-  <p>{translate}We could not make a connection.  Please make sure your connection settings are correct.{/translate}</p>
0
+  <p>{tr}We could not make a connection.  Please make sure your connection settings are correct.{/tr}</p>
0
 {/if}