diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-12-01 16:03:03 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-12-01 16:03:03 +0100 |
| commit | f2321eb9201babb4f22a3563bc4c343f6f560aec (patch) | |
| tree | 25e83493d3ece6ad4447c84e7bdc1de923476d84 | |
| parent | 7cfd6c84cc89979799e9ff4b38f0ba92e568c8f6 (diff) | |
Install : quelques corrections
https://github.com/marienfressinaud/FreshRSS/issues/273
| -rw-r--r-- | app/i18n/en.php | 1 | ||||
| -rw-r--r-- | app/i18n/fr.php | 1 | ||||
| -rw-r--r-- | public/install.php | 10 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/i18n/en.php b/app/i18n/en.php index 4de7bc94d..669de4d42 100644 --- a/app/i18n/en.php +++ b/app/i18n/en.php @@ -273,6 +273,7 @@ return array ( 'steps' => 'Steps', 'checks' => 'Checks', 'bdd_configuration' => 'Database configuration', + 'bdd_type' => 'Type of database', 'this_is_the_end' => 'This is the end', 'ok' => 'Ok!', diff --git a/app/i18n/fr.php b/app/i18n/fr.php index 67a3a1836..a397b4816 100644 --- a/app/i18n/fr.php +++ b/app/i18n/fr.php @@ -273,6 +273,7 @@ return array ( 'steps' => 'Étapes', 'checks' => 'Vérifications', 'bdd_configuration' => 'Configuration de la base de données', + 'bdd_type' => 'Type de base de données', 'this_is_the_end' => 'This is the end', 'ok' => 'Ok !', diff --git a/public/install.php b/public/install.php index 0701c8c1f..c4ed223de 100644 --- a/public/install.php +++ b/public/install.php @@ -61,7 +61,7 @@ define ('SQL_REQ_ENTRY', 'CREATE TABLE IF NOT EXISTS `%sentry` ( FOREIGN KEY (`id_feed`) REFERENCES `%sfeed`(`id`) ON DELETE CASCADE ON UPDATE CASCADE, UNIQUE KEY (`id_feed`,`guid`), -- v0.7 INDEX (`is_favorite`), -- v0.7 - INDEX (`is_read`), -- v0.7 + INDEX (`is_read`) -- v0.7 ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = INNODB;'); @@ -558,8 +558,6 @@ function printStep3 () { <form action="index.php?step=3" method="post"> <legend><?php echo _t ('bdd_configuration'); ?></legend> - <!-- - TODO : l'utilisation de SQLite n'est pas encore possible. Pour tester tout de même, décommentez ce bloc <div class="form-group"> <label class="group-name" for="type"><?php echo _t ('bdd_type'); ?></label> <div class="group-controls"> @@ -568,14 +566,14 @@ function printStep3 () { <?php echo (isset($_SESSION['bd_type']) && $_SESSION['bd_type'] === 'mysql') ? 'selected="selected"' : ''; ?>> MySQL </option> + <!-- TODO : l'utilisation de SQLite n'est pas encore possible. Pour tester tout de même, décommentez ce bloc <option value="sqlite" <?php echo (isset($_SESSION['bd_type']) && $_SESSION['bd_type'] === 'sqlite') ? 'selected="selected"' : ''; ?>> SQLite - </option> + </option>--> </select> </div> </div> - --> <div class="form-group"> <label class="group-name" for="host"><?php echo _t ('host'); ?></label> @@ -601,7 +599,7 @@ function printStep3 () { <div class="form-group"> <label class="group-name" for="base"><?php echo _t ('bdd'); ?></label> <div class="group-controls"> - <input type="text" id="base" name="base" maxlength="64" value="<?php echo isset ($_SESSION['bd_name']) ? $_SESSION['bd_name'] : ''; ?>" /> + <input type="text" id="base" name="base" maxlength="64" value="<?php echo isset ($_SESSION['bd_name']) ? $_SESSION['bd_name'] : ''; ?>" placeholder="<?php echo _t ('freshrss'); ?>" /> </div> </div> |