From 2aa34f98ce5cfbf72da178c61f96d8d9a384d3b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= Date: Fri, 4 May 2001 21:39:50 +0000 Subject: [PATCH] Marc outsource some strings in main.php3 & kill the bug in main.php3 about Create privilege --- ChangeLog | 4 ++++ lang/english.inc.php3 | 2 ++ lang/french.inc.php3 | 7 +++++-- main.php3 | 22 +++++++++++++--------- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index e6ba863d1..e3f38b7e0 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2001-05-04 Marc Delisle + * outsource some strings in main.php3 + * kill the bug in main.php3 about Create privilege + 2001-05-03 Loïc Chapeaux * build a js library that contains all the functions used to collapse/expand databases list stuff and improve them diff --git a/lang/english.inc.php3 b/lang/english.inc.php3 index 0a86fe805..1b6f3c28c 100644 --- a/lang/english.inc.php3 +++ b/lang/english.inc.php3 @@ -57,6 +57,8 @@ $strHasBeenCreated = "has been created."; $strHasBeenDropped = "has been dropped."; $strHasBeenEmptied = "has been emptied."; $strHome = "Home"; +$strHomepageOfficial = "Official phpMyAdmin Homepage"; //lem9 +$strHomepageSourceforge = "new (but still unofficial) phpMyAdmin Homepage"; //lem9 $strHost = "Host"; $strIfYouWish = "If you wish to load only some of a table's columns, specify a comma separated field list."; $strIndex = "Index"; diff --git a/lang/french.inc.php3 b/lang/french.inc.php3 index 246977c4e..0b89b9ed0 100644 --- a/lang/french.inc.php3 +++ b/lang/french.inc.php3 @@ -15,7 +15,7 @@ $strAnd = "et"; $strAscending = "Croissant"; $strAtBeginningOfTable = "En début de Table"; $strAtEndOfTable = "En fin de Table"; -$strAttr = "Attributes"; +$strAttr = "Attributs"; $strBack = "Retour"; $strBrowse = "Afficher"; $strCarriage = "Retour de chariot: \\r"; @@ -30,7 +30,7 @@ $strCreateNewTable = "Cr $strCriteria = "Critère"; $strDatabase = "Base de données"; $strDatabases = "bases de données"; -$strDefault = "Defaut"; +$strDefault = "Défaut"; $strDelete = "Effacer"; $strDeleted = "L'enregistrement a été effacé"; $strDescending = "Décroissant"; @@ -60,6 +60,8 @@ $strHasBeenCreated = "a $strHasBeenDropped = "a été effacé."; $strHasBeenEmptied = "a été vidé."; $strHome = "Accueil"; +$strHomepageOfficial = "Site officiel de phpMyAdmin"; +$strHomepageSourceforge = "Nouveau site (non encore officiel) de phpMyAdmin"; $strHost = "Serveur"; $strIfYouWish = "Si vous désirez ne charger que certaines colonnes, indiquez leurs noms, séparés par des virgules."; $strIndex = "Index"; @@ -130,6 +132,7 @@ $strSuccess = "Votre requ $strTable = "table "; $strTableComments = "Commentaires sur la table"; $strTableStructure = "Structure de la table"; +$strTableType = "Table en format"; // Robbat2, lem9 $strTerminatedBy = "terminé(e)s par"; $strTheContent = "Le contenu de votre fichier a été inséré."; $strTheContents = "Le contenu du fichier remplacera le contenu de la table pour les enregistrements ayant une valeur de clé primaire ou unique identique."; diff --git a/main.php3 b/main.php3 index c6be75a45..b2d03e206 100755 --- a/main.php3 +++ b/main.php3 @@ -89,13 +89,17 @@ if($server > 0) { $result_db=mysql_fetch_array($rs_db); } - if($result_usr['Create_priv']=='Y') { - $CREATE=TRUE; - } elseif(!empty($result_db) && $result_db['Create_priv']=='Y') { - $CREATE=TRUE; - } else { - $CREATE=FALSE; - } + if($result_usr['Create_priv']=='Y') { + $CREATE=TRUE; +// BEGIN +// 2001-05-04, Lem9: The create_priv on a single database does not allow +// to create a database +// } elseif(!empty($result_db) && $result_db['Create_priv']=='Y') { +// $CREATE=TRUE; +// END + } else { + $CREATE=FALSE; + } if($CREATE) { ?> @@ -151,10 +155,10 @@ if($server > 0) { ?>
  • -new (but still unofficial) phpMyAdmin-Homepage (sourceforge) + (sourceforge)      [ ChangeLog ]
  • -Official phpMyAdmin-Homepage +
  • phpMyAdmin