More translations, use instead of hardcoded charset. From Rafal Slubowski (rafal...

diff --git a/lang/english.php b/lang/english.php
index 556c1cfc4034da8522e2597633a50d345765df42..49ab46e043585966114f4245bf2bf0558ccd0bb7 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.24 2002/12/24 07:35:25 chriskl Exp $
+        * $Id: english.php,v 1.25 2003/01/02 02:27:47 chriskl Exp $
         */
 
        $appLang = 'English';
@@ -53,6 +53,7 @@
        $strDefault = 'Default';
        $strAlter = 'Alter';
        $strCancel = 'Cancel';
+       $strSave = 'Save';
        $strPrivileges = 'Privileges';
        $strInsert = 'Insert';
        $strSelect = 'Select';
@@ -66,7 +67,8 @@
        $strEdit = 'Edit';
        $strInvalidParam = 'Invalid script parameters.';
        $strRows = 'row(s)';
-
+       $strExample = 'eg.';
+       
        // Error handling
        $strSQLError = 'SQL error:';
        $strInStatement = 'In statement:';
@@ -110,6 +112,15 @@
        $strColumnName = 'Column Name';
        $strUniqueKey = 'Unique Key';
        $strPrimaryKey = 'Primary Key';
+       $strShowAllIndicies = 'Show All Indicies';
+       $strCreateIndex = 'Create Index';
+       $strIndexNeedsName = 'You must give a name for your index';
+       $strIndexNeedsCols = 'You must give a valid number of columns.';
+       $strIndexCreated = 'Index created';
+       $strIndexCreatedBad = 'Index creation failed.';
+       $strConfDropIndex = 'Are you sure you want to drop the index "%s"?';
+       $strIndexDropped = 'Index dropped.';
+       $strIndexDroppedBad = 'Index drop failed.';
        
        // Tables
        $strField = 'Field';

diff --git a/lang/polish.php b/lang/polish.php
index 863212e4b40656fb4732aab41fc8d21d24d1ac39..03be0022242b36984616e4443ec120f33a0bfd04 100644 (file)
--- a/lang/polish.php
+++ b/lang/polish.php
@@ -4,14 +4,15 @@
         * Polish language file for WebDB.
         * @maintainer Rafal Slubowski [rafal@gem.pl]
         *
-        * $Id: polish.php,v 1.2 2002/12/24 02:44:21 chriskl Exp $
+        * $Id: polish.php,v 1.3 2003/01/02 02:27:47 chriskl Exp $
         */
 
        $appLang = 'Polish';
-       $appCharset = 'ISO-8859-1';
+       $appCharset = 'ISO-8859-2';
 
        $strNoFrames = 'Aby u¿ywaæ tej aplikacji potrzebujesz przegl±darki obs³uguj±cej ramki.';
        $strLogin = '- Zaloguj';
+       $strLoginFailed = 'Próba zalogowania nie powiod³a siê';
        $strNoTables = 'Nie znaleziono tablic.';
        $strNoTable = 'Nie znaleziono tablicy.';
        $strNoViews = 'Nie znaleziono widoków.';
@@ -25,6 +26,7 @@
        $strView = 'Widok';
        $strViews = 'Widoki';
        $strDefinition = 'Definicja';
+       $strTriggers = 'Wiêzy integralno¶ci';
        $strRules = 'Regu³y';
        $strSequence = 'Sekwencja';
        $strSequences = 'Sekwencje';
@@ -32,7 +34,7 @@
        $strFunctions = 'Funkcje';
        $strOperators = 'Operatory';
        $strTypes = 'Typy';
-       $strAggregates = 'Aggregates';
+       $strAggregates = 'Funkcje agreguj±ce';
        $strIndicies = 'Indeksy';
        $strProperties = 'W³a¶ciwo¶ci';
        $strBrowse = 'Przegl±daj';
@@ -46,9 +48,12 @@
        $strNotLoaded = 'Nie wkompilowa³e¶ do PHP obs³ugi tej bazy danych.';
        $strCreate = 'Utwórz';
        $strComment = 'Skomentuj';
+       $strNext = 'Nastêpny';
        $strLength = 'D³ugo¶æ';
        $strDefault = 'Domy¶lny';
        $strAlter = 'Zmieñ';
+       $strCancel = 'Anuluj';
+       $strSave = 'Zapisz';
        $strPrivileges = 'Uprawnienia';
        $strInsert = 'Wstaw';
        $strSelect = 'Wybierz';
@@ -57,9 +62,17 @@
        $strRule = 'Regu³a';
        $strReferences = 'Odno¶niki';
        $strTrigger = 'Trigger';
+       $strYes = 'Tak';
+       $strNo = 'Nie';
+       $strEdit = 'Edycja';
+       $strInvalidScriptParam = 'B³êdny parametr skryptu.';
+       $strRows = 'wiersz(y)';
+       $strExample = 'np.';
 
-
-               
+       // Error handling
+        $strSQLError = 'B³±d SQL:';
+        $strInStatement = 'W poleceniu:';
+                       
        // Users
        $strUser = 'U¿ytkownik';
        $strGroup = 'Grupa';
@@ -99,9 +112,19 @@
        $strColumnName = 'Nazwa Kolumny';
        $strUniqueKey = 'Klucz Unikatowy';
        $strPrimaryKey = 'Klucz G³ówny';
+       $strShowAllIndicies = 'Poka¿ wszystkie indeksy';
+       $strCreateIndex = 'Utwórz indeks';
+       $strIndexNeedsName = 'Musisz nazwaæ indeks.';
+       $strIndexNeedsCols = 'W sk³ad indeksu musi wchodziæ przynajmniej jedna kolumna.';
+       $strIndexCreated = 'Indeks utworzony';
+       $strIndexCreatedBad = 'Próba utworzenia indeksu siê nie powiod³a.';
+       $strConfDropIndex = 'Czy na pewno chcesz usun±æ indeks "%s"?';
+       $strIndexDropped = 'Indeks usuniêty.';
+       $strIndexDroppedBad = 'Próba usuniêcia indeksu siê nie powiod³a.';
        
        // Tables
        $strField = 'Pole';
+       $strFields = 'Pola';
        $strType = 'Typ';
        $strValue = 'Warto¶æ';
        $strShowAllTables = 'Poka¿ wszystkie tablice';
@@ -113,7 +136,9 @@
        $strTableNeedsName = 'Musisz nazwaæ tabelê.';
        $strTableNeedsCols = 'Musisz podaæ prawid³ow± liczbê kolumn.';
        $strExport = 'Eksport';
-       
+        $strConstraints = 'Wiêzy integralno¶ci';
+        $strColumns = 'Kolumny';
+               
        // Functions
        $strReturns = 'Zwraca';
        $strArguments = 'Parametry';
@@ -125,7 +150,26 @@
        $strTriggers = 'Triggery';
        $strNoTriggers = 'Nie znaleziono triggerów.';
        $strCreateTrigger = 'Utwórz Trigger';
-       
-       $strColumns = 'Kolumny';
-       $strConstraints = 'Wiêzy integralno¶ci';
+
+       // Types
+       $strType = 'Typ';
+       $strTypes = 'Typy';
+       $strNoTypes = 'Nie znaleziono typów.';
+       $strCreateType = 'Utwórz Typ';
+       $strConfDropType = 'Czy na pewno chcesz usun±æ typ "%s"?';
+       $strTypeDropped = 'Typ usuniêty.';
+       $strTypeDroppedBad = 'Próba usuniêcia typu siê nie powiod³a.';
+       $strTypeCreated = 'Typ utworzony';
+       $strTypeCreatedBad = 'Próba utworzenia typu siê nie powiod³a.';
+       $strShowAllTypes = 'Poka¿ wszystkie typy';
+       $strInputFn = 'Funkcja wej¶ciowa';
+       $strOutputFn = 'Funkcja wyj¶ciowa';
+       $strPassByVal = 'Przekazywany przez warto¶æ?';
+       $strAlignment = 'Wyrównanie bajtowe';
+       $strElement = 'Typ elementów';
+       $strDelimiter = 'Znak oddzielaj±cy elementy tablicy';
+       $strStorage = 'Technika przechowywania';
+       $strTypeNeedsName = 'Musisz nazwaæ typ.';
+       $strTypeNeedsLen = 'Musisz podaæ d³ugo¶æ typu.';
+                                                                                                                                                               
 ?>

diff --git a/public_html/index.php b/public_html/index.php
index 440e170779a74b058dcc5d35f7cf18af32fae142..b9ee3b824b7826a1c4e94ed59f6bfa561aa22b00 100755 (executable)
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -3,7 +3,7 @@
        /**
         * Main access point to WebDB.
         *
-        * $Id: index.php,v 1.9 2002/12/23 10:40:31 jmpoure Exp $
+        * $Id: index.php,v 1.10 2003/01/02 02:27:47 chriskl Exp $
         */
 
        // Include application functions
@@ -12,7 +12,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $appCharset ?>" >
 <title><?php echo $appName ?></title>
 </head>
 

diff --git a/public_html/intro.php b/public_html/intro.php
index 435fdf83715f6cf05f0ebd11871ec93d5029fdc5..dd1c05d26cdd97b4b3bb75b876f1dfc348e015ac 100755 (executable)
--- a/public_html/intro.php
+++ b/public_html/intro.php
@@ -3,7 +3,7 @@
        /**
         * Intro screen
         *
-        * $Id: intro.php,v 1.7 2002/12/23 10:41:32 jmpoure Exp $
+        * $Id: intro.php,v 1.8 2003/01/02 02:27:47 chriskl Exp $
         */
 
        // Include application functions
@@ -12,7 +12,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $appCharset ?>" />
 <title><?php echo $appName ?></title>
 </head>
 <body>

diff --git a/public_html/tblproperties.php b/public_html/tblproperties.php
index bb35226ad07322d4a783b575eebd415c37ffbe04..a837d21eae80c8304d0a96e5a229ff2386d926dc 100644 (file)
--- a/public_html/tblproperties.php
+++ b/public_html/tblproperties.php
@@ -3,7 +3,7 @@
        /**
         * List tables in a database
         *
-        * $Id: tblproperties.php,v 1.14 2002/12/24 07:35:26 chriskl Exp $
+        * $Id: tblproperties.php,v 1.15 2003/01/02 02:27:47 chriskl Exp $
         */
 
        // Include application functions
@@ -56,12 +56,12 @@
         */
        function doCreateIndex($msg = '') {
                global $data, $localData, $misc;
-               global $PHP_SELF, $strName, $strDefinition;
+               global $PHP_SELF, $strName, $strDefinition, $strCreateIndex, $strIndicies, $strShowAllIndicies, $strColumns, $strSave, $strReset, $strExample;
 
                if (!isset($_POST['formIndex'])) $_POST['formIndex'] = '';
                if (!isset($_POST['formCols'])) $_POST['formCols'] = '';
 
-               echo "<h2>", htmlspecialchars($_REQUEST['database']), ": Indexes: Create Index</h2>\n";
+               echo "<h2>", htmlspecialchars($_REQUEST['database']), ": {$strIndicies} : {$strCreateIndex} </h2>\n";
                $misc->printMsg($msg);
                
                echo "<form action=\"$PHP_SELF\" method=post>\n";
@@ -69,18 +69,18 @@
                echo "<tr><th class=data>{$strName}</th></tr>\n";
                echo "<tr><td class=data1><input name=formIndex size={$data->_maxNameLen} maxlength={$data->_maxNameLen} value=\"",
                        htmlspecialchars($_POST['formIndex']), "\"></td></tr>\n";
-               echo "<tr><th class=data>Columns</th></tr>\n";
+               echo "<tr><th class=data>{$strColumns}</th></tr>\n";
                echo "<tr><td class=data1><input name=formCols size={$data->_maxNameLen} value=\"",
-                       htmlspecialchars($_POST['formCols']), "\"> (eg. col1, col2)</td></tr>\n";
+                       htmlspecialchars($_POST['formCols']), "\"> ({$strExample} col1, col2)</td></tr>\n";
                echo "</table>\n";
                echo "<p><input type=hidden name=action value=save_create_index>\n";
                echo "<input type=hidden name=database value=\"", htmlspecialchars($_REQUEST['database']), "\">\n";
                echo "<input type=hidden name=table value=\"", htmlspecialchars($_REQUEST['table']), "\">\n";
-               echo "<input type=submit value=Save> <input type=reset></p>\n";
+               echo "<input type=submit value=\"{$strSave}\"> <input type=reset value=\"{$strReset}\"></p>\n";
                echo "</form>\n";
                
                echo "<p><a class=navlink href=\"$PHP_SELF?database=", urlencode($_REQUEST['database']),
-                       "&table=", urlencode($_REQUEST['table']), "&action=indicies\">Show All Indexes</a></p>\n";
+                       "&table=", urlencode($_REQUEST['table']), "&action=indicies\">{$strShowAllIndicies}</a></p>\n";
        }
 
        /**
@@ -89,16 +89,17 @@
         */
        function doSaveCreateIndex() {
                global $localData;
-
+               global $strIndexNeedsName, $strIndexNeedsCols, $strIndexCreated, $strIndexCreatedBad;
+               
                // Check that they've given a name and at least one column
-               if ($_POST['formIndex'] == '') doCreateIndex("Index needs a name.");
-               elseif ($_POST['formCols'] == '') doCreate("Index needs at least one column.");
+               if ($_POST['formIndex'] == '') doCreateIndex("{$strIndexNeedsName}");
+               elseif ($_POST['formCols'] == '') doCreate("{$strIndexNeedsCols}");
                else {
                        $status = $localData->createIndex($_POST['formIndex'], $_POST['table'], explode(',', $_POST['formCols']));
                        if ($status == 0)
-                               doIndicies('Index created.');
+                               doIndicies("{$strIndexCreated}");
                        else
-                               doCreateIndex('Index creation failed.');
+                               doCreateIndex("{$strIndexCreatedBad}");
                }
        }
 
@@ -107,13 +108,13 @@
         */
        function doDropIndex($confirm) {
                global $localData, $database;
-               global $PHP_SELF;
+               global $PHP_SELF, $strConfDropIndex, $strIndexDropped, $strIndexDroppedBad, $strYes, $strNo;
 
                if ($confirm) {
                        echo "<h2>", htmlspecialchars($_REQUEST['database']), ": Tables: ",
                                htmlspecialchars($_REQUEST['table']), ": " , htmlspecialchars($_REQUEST['index']), ": Drop</h2>\n";
 
-                       echo "<p>Are you sure you want to drop the index \"", htmlspecialchars($_REQUEST['index']),
+                       echo "<p>{$strConfDropIndex} \"", htmlspecialchars($_REQUEST['index']),
                                "\" from table \"", htmlspecialchars($_REQUEST['table']), "\"?</p>\n";
                        
                        echo "<form action=\"$PHP_SELF\" method=\"post\">\n";
@@ -121,15 +122,15 @@
                        echo "<input type=hidden name=table value=\"", htmlspecialchars($_REQUEST['table']), "\">\n";
                        echo "<input type=hidden name=index value=\"", htmlspecialchars($_REQUEST['index']), "\">\n";
                        echo "<input type=hidden name=database value=\"", htmlspecialchars($_REQUEST['database']), "\">\n";
-                       echo "<input type=submit name=choice value=\"Yes\"> <input type=submit name=choice value=\"No\">\n";
+                       echo "<input type=submit name=choice value=\"{$strYes}\"> <input type=submit name=choice value=\"{$strNo}\">\n";
                        echo "</form>\n";
                }
                else {
                        $status = $localData->dropIndex($_POST['index'], 'RESTRICT');
                        if ($status == 0)
-                               doIndicies('Index dropped.');
+                               doIndicies("{$strIndexDropped}");
                        else
-                               doIndicies('Index drop failed.');
+                               doIndicies("{$strIndexDroppedBad}");
                }
 
        }
@@ -137,7 +138,7 @@
        function doIndicies($msg = '') {
                global $data, $localData, $misc;
                global $PHP_SELF;
-               global $strNoIndicies, $strIndicies, $strActions, $strName, $strDefinition ;
+               global $strNoIndicies, $strIndicies, $strActions, $strName, $strDefinition, $strCreateIndex, $strDrop, $strPrivileges;
 
                doNav();
                echo "<h2>", htmlspecialchars($_REQUEST['database']), ": ", htmlspecialchars($_REQUEST['table']), ": {$strIndicies}</h2>\n";
@@ -156,9 +157,9 @@
                                echo "<td class=\"data{$id}\">", htmlspecialchars( $indexes->f[$data->ixFields['idxdef']]), "</td>";
                                echo "<td class=\"data{$id}\">";
                                echo "<a href=\"$PHP_SELF?action=confirm_drop_index&database=", htmlspecialchars($_REQUEST['database']), "&index=", htmlspecialchars( $indexes->f[$data->ixFields['idxname']]), 
-                                       "&table=", htmlspecialchars($_REQUEST['table']), "\">Drop</td>\n";
+                                       "&table=", htmlspecialchars($_REQUEST['table']), "\">{$strDrop}</td>\n";
                                echo "<td class=\"data{$id}\">";
-                               echo "<a href=\"$PHP_SELF?action=priviledges_index&database=", htmlspecialchars($_REQUEST['database']), "&index=", htmlspecialchars( $indexes->f[$data->ixFields['idxname']]), "\">Privileges</td></tr>\n";
+                               echo "<a href=\"$PHP_SELF?action=priviledges_index&database=", htmlspecialchars($_REQUEST['database']), "&index=", htmlspecialchars( $indexes->f[$data->ixFields['idxname']]), "\">{$strPrivileges}</td></tr>\n";
                                
                                $indexes->movenext();
                                $i++;
@@ -170,7 +171,7 @@
                        echo "<p>{$strNoIndicies}</p>\n";
                
                echo "<p><a class=\"navlink\" href=\"$PHP_SELF?action=create_index&database=",
-                       urlencode( $_REQUEST['database'] ), "&table=", htmlspecialchars($_REQUEST['table']), "\">Create Index</a></p>\n";               
+                       urlencode( $_REQUEST['database'] ), "&table=", htmlspecialchars($_REQUEST['table']), "\">{$strCreateIndex}</a></p>\n";          
        }       
 
        function doExport($msg = '') {
@@ -201,7 +202,7 @@
                echo "<p><input type=hidden name=action value=export>\n";
                echo "<input type=hidden name=database value=\"", htmlspecialchars($_REQUEST['database']), "\">\n";
                echo "<input type=hidden name=table value=\"", htmlspecialchars($_REQUEST['table']), "\">\n";
-               echo "<input type=submit value=\"{$strExport}\"> <input type=reset></p>\n";
+               echo "<input type=submit value=\"{$strExport}\"> <input type=reset value=\"{$strReset}\"></p>\n";
                echo "</form>\n";
        }       
 

diff --git a/public_html/topbar.php b/public_html/topbar.php
index 4c17b54602d2cf2a952c5fc658cbbe607e825bf9..4ca6c805754564f1b23c6c8656c6fb14a3198178 100755 (executable)
--- a/public_html/topbar.php
+++ b/public_html/topbar.php
@@ -3,7 +3,7 @@
        /**
         * Top menu for WebDB
         *
-        * $Id: topbar.php,v 1.9 2002/12/23 10:43:34 jmpoure Exp $
+        * $Id: topbar.php,v 1.10 2003/01/02 02:27:47 chriskl Exp $
         */
 
        // Include application functions
@@ -12,7 +12,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $appCharset ?>" />
 <title><?php echo $appName ?></title>
 </head>
 <body class="topbar">

diff --git a/public_html/users.php b/public_html/users.php
index 7b59eac3e639e11907f1fd64e33030323388d034..a1f9c050f51d602752b62a2b700e12f2e6282201 100644 (file)
--- a/public_html/users.php
+++ b/public_html/users.php
@@ -3,7 +3,7 @@
        /**
         * Manage users in a database cluster
         *
-        * $Id: users.php,v 1.5 2002/12/23 10:44:15 jmpoure Exp $
+        * $Id: users.php,v 1.6 2003/01/02 02:27:47 chriskl Exp $
         */
 
        // Include application functions
@@ -12,7 +12,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $appCharset ?>" />
 <?php
 
        $action = (isset($_REQUEST['action'])) ? $_REQUEST['action'] : '';