Skip to content

Commit

Permalink
Updated language discrepancies on database install steps
Browse files Browse the repository at this point in the history
  • Loading branch information
lssweatherhead authored and kjac committed Dec 18, 2019
1 parent 661ece2 commit c6afb86
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions src/Umbraco.Web.UI.Client/src/installer/steps/database.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ <h1>Configure your database</h1>
</div>

<div class="controls" ng-if="installer.current.model.dbType == 0">
<p>Great!, no need to configure anything then, you simply click the <strong>continue</strong> button below to continue to the next step</p>
<p>Great! No need to configure anything, you can simply click the <strong>continue</strong> button below to continue to the next step</p>
</div>

<div ng-if="installer.current.model.dbType < 0">
<legend>What is the exact connectionstring we should use?</legend>
<legend>What is the exact connection string we should use?</legend>
<div class="control-group">
<label class="control-label" for="server">Connection string</label>
<div class="controls">
Expand Down Expand Up @@ -64,7 +64,7 @@ <h1>Configure your database</h1>
<label class="control-label" for="login">Login</label>
<div class="controls">
<input type="text" id="login" name="login"
placeholder="databaseuser"
placeholder="umbraco-database-user"
required ng-model="installer.current.model.login" />
<small class="inline-help">Enter the database user name</small>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div>
<h1>Your permission settings are not ready for umbraco</h1>
<h1>Your permission settings are not ready for Umbraco</h1>
<p>
In order to run umbraco, you'll need to update your permission settings.
Detailed information about the correct file & folder permissions for Umbraco can be found
In order to run Umbraco, you'll need to update your permission settings.
Detailed information about the correct file and folder permissions for Umbraco can be found
<a href="https://our.umbraco.com/documentation/Installation/permissions"><strong>here</strong></a>.
</p>
<p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<h1>Major version upgrade from {{installer.current.model.currentVersion}} to {{installer.current.model.newVersion}}</h1>
<h2>There were {{installer.current.model.errors.length}} issues detected</h2>
<p>
The following compatibility issues were found. If you continue all non-compatible property editors will be converted to a Readonly/Label.
The following compatibility issues were found. If you continue, all non-compatible property editors will be converted to a Readonly/Label.
You will be able to change the property editor to a compatible type manually by editing the data type after installation.
</p>
<p>
Otherwise if you choose not to proceed you will need to fix the errors listed below.
Otherwise, if you choose not to proceed, you will need to fix the errors listed below.
Refer to v{{installer.current.model.newVersion}} upgrade instructions for full details.
</p>

Expand All @@ -19,4 +19,4 @@ <h2>There were {{installer.current.model.errors.length}} issues detected</h2>
<p>
<button class="btn btn-success" ng-click="forward()">Continue</button>
</p>
</div>
</div>

0 comments on commit c6afb86

Please sign in to comment.