summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2019-02-22 13:52:40 +0000
committerGreg Roach <fisharebest@webtrees.net>2019-02-22 13:52:40 +0000
commit511800d3f227f16e409777e22044df6fb9a238a3 (patch)
tree9976eed7ddbc37039296038be4b36f4ae81e7e3f
parent982d76d1b4590434f05cfe991ff00da5ddb290de (diff)
downloadwebtrees-511800d3f227f16e409777e22044df6fb9a238a3.tar.gz
webtrees-511800d3f227f16e409777e22044df6fb9a238a3.tar.bz2
webtrees-511800d3f227f16e409777e22044df6fb9a238a3.zip
Update port numbers for PostgreSQL and SQL Server
-rw-r--r--resources/views/setup/step-3-database-type.phtml4
-rw-r--r--resources/views/setup/step-4-database-pgsql.phtml5
-rw-r--r--resources/views/setup/step-4-database-sqlsvr.phtml (renamed from resources/views/setup/step-4-database-sqlsrv.phtml)4
3 files changed, 7 insertions, 6 deletions
diff --git a/resources/views/setup/step-3-database-type.phtml b/resources/views/setup/step-3-database-type.phtml
index 5240ff4e04..cadbbb5aaf 100644
--- a/resources/views/setup/step-3-database-type.phtml
+++ b/resources/views/setup/step-3-database-type.phtml
@@ -53,8 +53,8 @@
</div>
<div class="form-check">
- <input class="form-check-input" type="radio" name="dbtype" id="dbtype-sqlsrv" value="sqlsrv" <?= $dbtype === 'sqlsrv' ? 'checked' : '' ?>>
- <label class="form-check-label" for="dbtype-sqlsrv">
+ <input class="form-check-input" type="radio" name="dbtype" id="dbtype-sqlsvr" value="sqlsvr" <?= $dbtype === 'sqlsvr' ? 'checked' : '' ?>>
+ <label class="form-check-label" for="dbtype-sqlsvr">
SQL Server
</label>
</div>
diff --git a/resources/views/setup/step-4-database-pgsql.phtml b/resources/views/setup/step-4-database-pgsql.phtml
index 0397399fd2..754ad62b77 100644
--- a/resources/views/setup/step-4-database-pgsql.phtml
+++ b/resources/views/setup/step-4-database-pgsql.phtml
@@ -40,7 +40,7 @@
<div class="col-sm-9">
<input class="form-control" id="dbport" name="dbport" pattern="\d+" type="text" value="<?= e($dbport) ?>" dir="ltr">
<p class="small text-muted">
- <?= I18N::translate('Most sites are configured to use the default value of 3306.') ?>
+ <?= I18N::translate('Most sites are configured to use the default value of 5432.') ?>
</p>
</div>
</div>
@@ -75,8 +75,9 @@
</label>
<div class="col-sm-9">
<input class="form-control" dir="ltr" id="dbname" name="dbname" pattern="^[^`]+$" type="text" value="<?= e($dbname) ?>">
+
<p class="small text-muted">
- <?= I18N::translate('This is case sensitive. If a database with this name does not already exist webtrees will attempt to create one for you. Success will depend on permissions set for your web server, but you will be notified if this fails.') ?>
+ <?= I18N::translate('Use letters A-Z, a-z, digits 0-9, or underscores') ?>
</p>
</div>
</div>
diff --git a/resources/views/setup/step-4-database-sqlsrv.phtml b/resources/views/setup/step-4-database-sqlsvr.phtml
index a920c3ab1d..ff692a8d3e 100644
--- a/resources/views/setup/step-4-database-sqlsrv.phtml
+++ b/resources/views/setup/step-4-database-sqlsvr.phtml
@@ -40,7 +40,7 @@
<div class="col-sm-9">
<input class="form-control" id="dbport" name="dbport" pattern="\d+" type="text" value="<?= e($dbport) ?>" dir="ltr">
<p class="small text-muted">
- <?= I18N::translate('Most sites are configured to use the default value of 3306.') ?>
+ <?= I18N::translate('Most sites are configured to use the default value of 1433.') ?>
</p>
</div>
</div>
@@ -76,7 +76,7 @@
<div class="col-sm-9">
<input class="form-control" dir="ltr" id="dbname" name="dbname" pattern="^[^`]+$" type="text" value="<?= e($dbname) ?>">
<p class="small text-muted">
- <?= I18N::translate('This is case sensitive. If a database with this name does not already exist webtrees will attempt to create one for you. Success will depend on permissions set for your web server, but you will be notified if this fails.') ?>
+ <?= I18N::translate('Use letters A-Z, a-z, digits 0-9, or underscores') ?>
</p>
</div>
</div>