new lang system fixes

diff --git a/constraints.php b/constraints.php
index 693fce5af338eefce80a800e2f342fb1ecabf363..920a092b2ee869cc676302f57aa4062e192b4c16 100644 (file)
--- a/constraints.php
+++ b/constraints.php
@@ -3,7 +3,7 @@
        /**
         * List constraints on a table
         *
-        * $Id: constraints.php,v 1.6 2003/03/17 05:20:29 chriskl Exp $
+        * $Id: constraints.php,v 1.7 2003/03/18 09:15:49 chriskl Exp $
         */
 
        // Include application functions
@@ -17,22 +17,20 @@
         */
        function addCheck($confirm, $msg = '') {
                global $PHP_SELF, $data, $localData, $misc;
-               global $strAddCheck, $strTables, $strOK, $strCancel;
-               global $strName, $strDefinition, $strCheckNeedsDefinition;
-               global $strCheckAdded, $strCheckAddedBad;
+               global $lang;
 
                if (!isset($_POST['name'])) $_POST['name'] = '';
                if (!isset($_POST['definition'])) $_POST['definition'] = '';
 
                if ($confirm) {
-                       echo "<h2>", htmlspecialchars($_REQUEST['database']), ": {$strTables}: ",
-                               htmlspecialchars($_REQUEST['table']), ": {$strAddCheck}</h2>\n";
+                       echo "<h2>", htmlspecialchars($_REQUEST['database']), ": {$lang['strtables']}: ",
+                               htmlspecialchars($_REQUEST['table']), ": {$lang['straddcheck']}</h2>\n";
                        $misc->printMsg($msg);
 
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
                        echo "<table>\n";
-                       echo "<tr><th class=\"data\">{$strName}</th>\n";
-                       echo "<th class=\"data\">{$strDefinition}</th></tr>\n";
+                       echo "<tr><th class=\"data\">{$lang['strname']}</th>\n";
+                       echo "<th class=\"data\">{$lang['strdefinition']}</th></tr>\n";
 
                        echo "<tr><td class=\"data1\"><input name=\"name\" size=\"16\" maxlength=\"{$data->_maxNameLen}\" value=\"",
                                htmlspecialchars($_POST['name']), "\"></td>\n";
@@ -44,20 +42,20 @@
                        echo "<input type=\"hidden\" name=\"action\" value=\"save_add_check\">\n";
                        echo "<input type=\"hidden\" name=\"table\" value=\"", htmlspecialchars($_REQUEST['table']), "\">\n";
                        echo $misc->form;
-                       echo "<p><input type=\"submit\" name=\"ok\" value=\"{$strOK}\"> <input type=\"submit\" name=\"cancel\" value=\"{$strCancel}\"></p>\n";
+                       echo "<p><input type=\"submit\" name=\"ok\" value=\"{$lang['strok']}\"> <input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\"></p>\n";
                        echo "</form>\n";
 
                }
                else {
                        if (trim($_POST['definition']) == '')
-                               addCheck(true, $strCheckNeedsDefinition);
+                               addCheck(true, $lang['strcheckneedsdefinition']);
                        else {
                                $status = $localData->addCheckConstraint($_POST['table'],
                                        $_POST['definition'], $_POST['name']);
                                if ($status == 0)
-                                       doDefault($strCheckAdded);
+                                       doDefault($lang['strcheckadded']);
                                else
-                                       addCheck(true, $strCheckAddedBad);
+                                       addCheck(true, $lang['strcheckaddedbad']);
                        }
                }
        }
@@ -68,10 +66,9 @@
        function doDrop($confirm) {
                global $localData, $misc;
                global $PHP_SELF, $lang;
-               global $strTables;
 
                if ($confirm) {
-                       echo "<h2>", htmlspecialchars($_REQUEST['database']), ": {$strTables}: ",
+                       echo "<h2>", htmlspecialchars($_REQUEST['database']), ": {$lang['strtables']}: ",
                                htmlspecialchars($_REQUEST['table']), ": " , htmlspecialchars($_REQUEST['constraint']), ": {$lang['strdrop']}</h2>\n";
 
                        echo "<p>", sprintf($lang['strconfdropconstraint'], htmlspecialchars($_REQUEST['constraint']),

diff --git a/database.php b/database.php
index bbe5a61721de58a5615e2e6492cee99b01674593..0a7c3a3555dd5dc219975fb1877ad1c5d1b4e319 100755 (executable)
--- a/database.php
+++ b/database.php
@@ -3,7 +3,7 @@
        /**
         * Manage schemas within a database
         *
-        * $Id: database.php,v 1.8 2003/03/17 05:20:29 chriskl Exp $
+        * $Id: database.php,v 1.9 2003/03/18 09:14:25 chriskl Exp $
         */
 
        // Include application functions
@@ -18,27 +18,26 @@
         */
        function doAdmin($action = '', $msg = '') {
                global $PHP_SELF, $localData, $misc;
-               global $strAdmin, $strVacuum, $strAnalyze, $strCluster, $strReindex;
-               global $strVacuumGood, $strVacuumBad, $strAnalyzeGood, $strAnalyzeBad;
+               global $lang;
 
                switch ($action) {
                        case 'vacuum':
                                $status = $localData->vacuumDB($_REQUEST['database']);
-                               if ($status == 0) doAdmin('', $strVacuumGood);
-                               else doAdmin('', $strVacuumBad);
+                               if ($status == 0) doAdmin('', $lang['strvacuumgood']);
+                               else doAdmin('', $lang['strvacuumbad']);
                                break;
                        case 'analyze':
                                $status = $localData->analyzeDB($_REQUEST['database']);
-                               if ($status == 0) doAdmin('', $strAnalyzeGood);
-                               else doAdmin('', $strAnalyzeBad);
+                               if ($status == 0) doAdmin('', $lang['stranalyzegood']);
+                               else doAdmin('', $lang['stranalyzebad']);
                                break;
                        default:
                                $misc->printDatabaseNav();
-                               echo "<h2>", htmlspecialchars($_REQUEST['database']), ": {$strAdmin}</h2>\n";
+                               echo "<h2>", htmlspecialchars($_REQUEST['database']), ": {$lang['stradmin']}</h2>\n";
                                $misc->printMsg($msg);
                                echo "<ul>\n";
-                               echo "<li><a href=\"{$PHP_SELF}?{$misc->href}&action=vacuum\">{$strVacuum}</a></li>\n";
-                               echo "<li><a href=\"{$PHP_SELF}?{$misc->href}&action=analyze\">{$strAnalyze}</a></li>\n";
+                               echo "<li><a href=\"{$PHP_SELF}?{$misc->href}&action=vacuum\">{$lang['strvacuum']}</a></li>\n";
+                               echo "<li><a href=\"{$PHP_SELF}?{$misc->href}&action=analyze\">{$lang['stranalyze']}</a></li>\n";
                                echo "</ul>\n";
 
                                break;

diff --git a/lang/english.php b/lang/english.php
index 7930597170ae409878a1754dc06311bcc0446a3c..dd4d6266fcec8efae26a6ca03dca8de835de9bb7 100755 (executable)
--- a/lang/english.php
+++ b/lang/english.php
@@ -4,7 +4,7 @@
         * Language template file for WebDB. Use this to base language
         * files.
         *
-        * $Id: english.php,v 1.61 2003/03/18 08:11:26 chriskl Exp $
+        * $Id: english.php,v 1.62 2003/03/18 09:15:49 chriskl Exp $
         */
 
        // Language and character set
@@ -285,9 +285,9 @@
        $lang['strconstraintdropped'] = 'Constraint dropped.';
        $lang['strconstraintdroppedbad'] = 'Constraint drop failed.';
        $lang['straddcheck'] = 'Add Check';
-       $strCheckNeedsDefinition = 'Check constraint needs a definition.';
-       $strCheckAdded = 'Check constraint added.';
-       $strCheckAddedBad = 'Failed to add check constraint.';
+       $lang['strcheckneedsdefinition'] = 'Check constraint needs a definition.';
+       $lang['strcheckadded'] = 'Check constraint added.';
+       $lang['strcheckaddedbad'] = 'Failed to add check constraint.';
 
        // Functions
        $lang['strfunction'] = 'Function';

diff --git a/lang/recoded/english.php b/lang/recoded/english.php
index d63468e4cea4afd8572b5c3652c396e0f1fb8dda..fc1c41437d53899b401fcd4324dc2743914719cc 100644 (file)
--- a/lang/recoded/english.php
+++ b/lang/recoded/english.php
@@ -4,7 +4,7 @@
         * Language template file for WebDB. Use this to base language
         * files.
         *
-        * $Id: english.php,v 1.16 2003/03/18 08:11:27 chriskl Exp $
+        * $Id: english.php,v 1.17 2003/03/18 09:15:50 chriskl Exp $
         */
 
        // Language and character set
@@ -285,9 +285,9 @@
        $lang['strconstraintdropped'] = 'Constraint dropped.';
        $lang['strconstraintdroppedbad'] = 'Constraint drop failed.';
        $lang['straddcheck'] = 'Add Check';
-       $strCheckNeedsDefinition = 'Check constraint needs a definition.';
-       $strCheckAdded = 'Check constraint added.';
-       $strCheckAddedBad = 'Failed to add check constraint.';
+       $lang['strcheckneedsdefinition'] = 'Check constraint needs a definition.';
+       $lang['strcheckadded'] = 'Check constraint added.';
+       $lang['strcheckaddedbad'] = 'Failed to add check constraint.';
 
        // Functions
        $lang['strfunction'] = 'Function';