Commit 3aeb5ec3 authored by chealer's avatar chealer

[ENH]Database: Use "schema" rather than "database"

parent 54abdd62
......@@ -14,7 +14,7 @@ might be enough to get you running Tiki. For more details, please see:
Before you get started, it is a good idea to know:
* Your database name, database user name and password
* Your database schema name, database user name and password
* Your Apache user and group ID (e.g. www-user and www-data)
If not, Tiki will detect
......@@ -49,10 +49,10 @@ Step three: create the database
* create a database for Tiki
- either using PhpMyAdmin and MySQL
- or on the command line "mysqladmin create dbname"
the database name is usually called "tiki"
the database schema name is usually called "tiki"
Be sure to record the following items:
- The database name
- The database schema name
- The user name and password that has admin authority in the database.
......
......@@ -14563,7 +14563,7 @@ $lang = array(
"Tiki cannot find a database connection" => "Tiki ne peut pas accéder à la base de données",
"This is normal for a new installation" => "Ceci est normal pour une première installation",
"Tiki found an existing database connection in your local.php file" => "Tiki a trouvé des informations de connexion à une base de données existante dans votre fichier local.php",
"Database name: "%0&quot" => "Nom de la base de données : "%0&quot",
"Schema name: "%0&quot" => "Nom du schéma : "%0&quot",
// "Tiki found an automatic database connection for your environment" => "Tiki found an automatic database connection for your environment",
"Use Existing Connection" => "Utiliser la connexion existante",
"Modify database connection" => "Modifier la connexion à la base de données",
......@@ -14571,14 +14571,14 @@ $lang = array(
"Database information" => "Configuration de la base de données",
"Enter your database connection information" => "Entrez les informations pour se connecter à la base de données",
"DBMS driver" => "Pilote SGBD",
"Select the type of database to use with Tiki" => "Selectionnez le type de base de données à utiliser avec Tiki",
"Only databases supported by your PHP installation are listed here. If your database is not in the list, try to install the appropriate PHP extension." => "Les seuls moteurs de bases de données qui sont listés ici sont ceux acceptés par votre installation PHP. Si votre moteur de base de données ne figure pas dans cette liste, essayez d'installer les bonnes extensions PHP.",
"Select the database driver to use with Tiki" => "Sélectionnez le pilote de base de données à utiliser avec Tiki",
"Only drivers supported by your PHP installation are listed here. If your driver is not in the list, try to install the appropriate PHP extension." => "Les seuls pilotes qui sont listés ici sont ceux acceptés par votre installation PHP. Si votre pilote de base de données ne figure pas dans cette liste, essayez d'installer les bonnes extensions PHP.",
"Host name" => "Nom d'hôte",
"Enter the host name or IP for your database" => "Entrer le nom ou l'adresse IP du serveur de votre base de données",
"Use <strong>localhost</strong> if the database is running on the same machine as Tiki" => "Utiliser <strong>localhost</strong> si la base de données est sur le même serveur que celui de Tiki",
// "For non-default port number use <strong>example.com;port=3307</strong>" => "For non-default port number use <strong>example.com;port=3307</strong>",
"Database name" => "Nom de la base de données",
"Enter the name of the database that Tiki will use (if already created) or create (if permitted)" => "Entrer le nom de la base de données qu'utilisera Tiki (si elle est déjà existante) ou créera (si il a les droits suffisants)",
"Schema name" => "Nom du schéma",
"Name of the database schema to be used. This schema will be created if it does not exist and permissions allow creation." => "Nom du schéma de base de données qui sera utilisé. Ce schéma sera créé si il n'existe pas déjà et que les permissions permettent la création.",
// "You can create the database using Adminer, phpMyAdmin, cPanel, or ask your hosting provider. If the database doesn't exist and the supplied username has permissions, the database will be created" => "You can create the database using Adminer, phpMyAdmin, cPanel, or ask your hosting provider. If the database doesn't exist and the supplied username has permissions, the database will be created",
"If you are using a database which is already being used for something else (not recommended), check db/tiki.sql to make sure the table names used by Tiki are not already used" => "Si vous utilisez une base de données partagée avec une autre applications (non recommandé), vérifier db/tiki.sql que les tables utilisées par Tiki ne sont pas déjà utilisées",
"Database user" => "Utilisateur de la base de données",
......@@ -73,7 +73,7 @@
<ol class="fancylist">
<li><p>Is your database up and running?</p></li>
<li><p>Is your database corrupt? Please see <a target="_blank" href="http://doc.tiki.org/Repair+Database">how to repair your database</a></p></li>
<li><p>Are your database credentials accurate? (username, database name, etc in db/local.php)</p></li>
<li><p>Are your database settings accurate? (username, schema name, etc in db/local.php)</p></li>
{if $where neq 'connection'}
<li><p>Did you complete the <a href="tiki-install.php">Tiki Installer?</a></p></li>
{/if}
......@@ -85,7 +85,7 @@
<p>Things to check:</p>
<ol class="fancylist">
<li><p>Is your database up and running?</p></li>
<li><p>Are your database credentials accurate? (username, database name, etc in db/local.php)</p></li>
<li><p>Are your database settings accurate? (username, schema name, etc in db/local.php)</p></li>
</ol>
</div>
{else}
......@@ -95,7 +95,7 @@
<ol class="fancylist">
<li><p>Did you complete the <a href="tiki-install.php">Tiki Installer?</a></p></li>
<li><p>Is your database corrupt? Please see <a target="_blank" href="http://doc.tiki.org/Repair+Database">how to repair your database</a></p></li>
<li><p>Are your database credentials accurate? (username, database name, etc in db/local.php)</p></li>
<li><p>Are your database settings accurate? (username, schema name, etc in db/local.php)</p></li>
</ol>
</div>
{/if}
......
......@@ -240,7 +240,7 @@
{remarksbox type=confirm title="{tr}Success{/tr}" close="n"}
{if $dbname}
{tr}Tiki found an existing database connection in your local.php file.{/tr}
<strong>{tr _0=$dbname}Database name: &quot;%0&quot;{/tr}</strong>
<strong>{tr _0=$dbname}Schema name: &quot;%0&quot;{/tr}</strong>
{else}
{tr}Tiki found an automatic database connection for your environment.{/tr}
{/if}
......@@ -283,8 +283,8 @@
{icon name="help"}
</a>
<div style="display:none" id="db_help">
<p>{tr}Select the type of database to use with Tiki.{/tr}</p>
<p>{tr}Only databases supported by your PHP installation are listed here. If your database is not in the list, try to install the appropriate PHP extension.{/tr}</p>
<p>{tr}Select the database driver to use with Tiki.{/tr}</p>
<p>{tr}Only drivers supported by your PHP installation are listed here. If your driver is not in the list, try to install the appropriate PHP extension.{/tr}</p>
</div>
</div>
</div>
......@@ -303,15 +303,15 @@
</div>
</div>
<div class="form-group">
<label for="name">{tr}Database name:{/tr}</label>
<label for="name">{tr}Schema name:{/tr}</label>
<div style="margin-left:1em;">
<input type="text" class=form-control id="name" name="name" size="40" value="{if isset($smarty.request.name)}{$smarty.request.name|escape:"html"}{elseif isset($preconfigname)}{$preconfigname|escape:"html"}{/if}" />
<a href="javascript:void(0)" onclick="flip('name_help');" title="{tr}Help{/tr}">
{icon name="help"}
</a>
<br><em>{tr}Enter the name of the database that Tiki will use (if already created) or create (if permitted).{/tr}</em>
<br><em>{tr}Name of the database schema to be used. This schema will be created if it does not exist and permissions allow creation.{/tr}</em>
<div style="margin-left:1em;display:none;" id="name_help">
<p>{tr}You can create the database using Adminer, phpMyAdmin, cPanel, or ask your hosting provider. If the database doesn't exist and the supplied username has permissions, the database will be created.{/tr}</p>
<p>{tr}You can create the database schema using Adminer, MySQL Workbench, phpMyAdmin, cPanel, or ask your hosting provider. If the schema doesn't exist and the supplied username has permissions, it will be created.{/tr}</p>
<p>{tr}If you are using a database which is already being used for something else (not recommended), check db/tiki.sql to make sure the table names used by Tiki are not already used.{/tr}</p>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment