Skip to content
This repository was archived by the owner on Sep 9, 2024. It is now read-only.

Commit 7560b6f

Browse files
Bob Watsonmgechev
andcommitted
UI text tweaks for v15 update
Co-Authored-By: Minko Gechev <[email protected]>
1 parent a901eef commit 7560b6f

File tree

2 files changed

+28
-24
lines changed

2 files changed

+28
-24
lines changed

src/app/app.component.html

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,21 @@
3535
<div class="wizard">
3636
<div>
3737
<mat-card>
38-
<h3>
39-
{{'Select the options matching your project:'|i18n}}
40-
</h3>
38+
<h2>
39+
{{'Select the options that match your update'|i18n}}
40+
</h2>
4141

4242
<mat-card-content>
4343

44-
<h4>{{'Angular Versions'|i18n}}</h4>
45-
{{'From'|i18n}}:
44+
<h3>{{'Angular versions'|i18n}}</h3>
45+
{{'From'|i18n}} v.
4646
<mat-form-field appearance="outline">
4747
<select (change)="from = getVersion($event.target.value); track.send('setting-from','v'+$event.target.value); showUpdatePath()" placeholder="from" matNativeControl>
4848
<option *ngFor="let version of versions" [value]="version.name" [selected]="version.name === from.name">{{version.name}}</option>
4949
</select>
5050
</mat-form-field>
5151

52-
<span style="white-space: nowrap">{{'To'|i18n}}:
52+
<span style="white-space: nowrap">{{'To'|i18n}} v.
5353
<mat-form-field appearance="outline">
5454
<select (change)="to = getVersion($event.target.value); track.send('setting-to','v'+$event.target.value); showUpdatePath()" placeholder="to" matNativeControl>
5555
<option *ngFor="let version of versions" [value]="version.name" [selected]="version.name === to.name">{{version.name}}</option>
@@ -63,26 +63,26 @@ <h4>{{'Angular Versions'|i18n}}</h4>
6363
</div>
6464
<div *ngIf="from.number > to.number">
6565
<br/>
66-
<strong style="color:darkred">{{'Warning'|i18n}}:</strong> {{'We do not currently support downgrading versions of Angular.'|i18n}}
66+
<strong style="color:darkred">{{'Warning'|i18n}}:</strong> {{'We do not support downgrading versions of Angular.'|i18n}}
6767
</div>
6868
<div *ngIf="(to.number - from.number > 150) && from.number > 240">
6969
<br/>
70-
<strong style="color:darkred">{{'Warning'|i18n}}:</strong> {{'We do not support migrating across multiple major versions at once. Please migrate each major version individually.'|i18n}}
70+
<strong style="color:darkred">{{'Warning'|i18n}}:</strong> {{'Be sure to follow the guide below to migrate your application to the new version. You can\'t run'|i18n}} <code>ng update</code> {{'to update Angular applications more than one major version at a time.'|i18n}}
7171
</div>
7272

73-
<h4>{{'App Complexity'|i18n}}</h4>
73+
<h3>{{'Application complexity'|i18n}}</h3>
7474
<ng-container>
7575
<mat-button-toggle-group (change)="level = $event.value; track.send('setting-complexity',$event.value); showUpdatePath()" [value]="level" style="margin-bottom:16px;">
7676
<mat-button-toggle [value]="1">{{'Basic'|i18n}}</mat-button-toggle>
7777
<mat-button-toggle [value]="2">{{'Medium'|i18n}}</mat-button-toggle>
7878
<mat-button-toggle [value]="3">{{'Advanced'|i18n}}</mat-button-toggle>
7979
</mat-button-toggle-group>
80-
<p *ngIf="level === 1">{{'Show update information relevant to all Angular developers.'|i18n}}</p>
81-
<p *ngIf="level === 2">{{'Show more specific update information relevant to around 10% of Angular developers.'|i18n}}</p>
82-
<p *ngIf="level === 3">{{'Show all the information we have about the update.'|i18n}}</p>
80+
<p *ngIf="level === 1">{{'Shows information for all Angular developers.'|i18n}}</p>
81+
<p *ngIf="level === 2">{{'Shows information that\'s of interest to more advanced Angular developers.'|i18n}}</p>
82+
<p *ngIf="level === 3">{{'Shows all the information we have about this update.'|i18n}}</p>
8383
</ng-container>
8484

85-
<h4>{{'Other Dependencies'|i18n}}</h4>
85+
<h3>{{'Other dependencies'|i18n}}</h3>
8686
<ng-container *ngFor="let option of optionList">
8787
<p>
8888
<mat-checkbox (change)="options[option.id] = $event.checked; track.send('setting-'+option.name,$event.checked); showUpdatePath()" [checked]="options[option.id]">{{'I use'|i18n}} {{option.name}} {{option.description}}</mat-checkbox>
@@ -112,30 +112,34 @@ <h4>{{'Package Manager'|i18n}}</h4>
112112

113113
<div class="recommendations" *ngIf="beforeRecommendations.length > 0 || duringRecommendations.length > 0 || afterRecommendations.length > 0">
114114
<h2>{{title}}</h2>
115-
<h3>{{'Before Updating'|i18n}}</h3>
115+
<h3>{{'Before you update'|i18n}}</h3>
116116
<div *ngFor="let r of beforeRecommendations">
117117
<mat-checkbox></mat-checkbox>
118118
<div style="margin-left:30px;" [innerHTML]="r.renderedStep"></div>
119119
</div>
120120
<div *ngIf="beforeRecommendations.length <= 0">
121-
<em>{{"There aren't currently any changes needed before moving between these versions."|i18n}}</em>
121+
<em>{{"You don't need to do anything before moving between these versions."|i18n}}</em>
122122
</div>
123123

124-
<h3>{{'During the Update'|i18n}}</h3>
124+
<h3>{{'Update to the new version'|i18n}}</h3>
125+
<div *ngIf="duringRecommendations.length > 0">
126+
<p><em>{{"Review these changes and perform the actions to update your application."|i18n}}</em></p>
127+
<p>&nbsp;</p>
128+
</div>
125129
<div *ngFor="let r of duringRecommendations">
126130
<mat-checkbox></mat-checkbox>
127131
<div style="margin-left:30px;" [innerHTML]="r.renderedStep"></div>
128132
</div>
129133
<div *ngIf="duringRecommendations.length <= 0">
130-
<em>{{"There aren't currently any recommendations for moving between these versions."|i18n}}</em>
134+
<em>{{"There aren't any recommendations for moving between these versions."|i18n}}</em>
131135
</div>
132-
<h3>{{'After the Update'|i18n}}</h3>
136+
<h3>{{'After you update'|i18n}}</h3>
133137
<div *ngFor="let r of afterRecommendations">
134138
<mat-checkbox></mat-checkbox>
135139
<div style="margin-left:30px;" [innerHTML]="r.renderedStep"></div>
136140
</div>
137141
<div *ngIf="afterRecommendations.length <= 0">
138-
<em>{{"There aren't currently any changes needed after moving between these versions."|i18n}}</em>
142+
<em>{{"You don't need to do anything after moving between these versions."|i18n}}</em>
139143
</div>
140144
</div>
141145
</div>

src/app/app.component.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,13 @@ export class AppComponent {
126126
return;
127127
}
128128

129-
const labelTitle = this.i18Service.transform('Angular Update Guide');
130-
const labelBasic = this.i18Service.transform('Basic Apps');
131-
const labelMedium = this.i18Service.transform('Medium Apps');
132-
const labelAdvanced = this.i18Service.transform('Advanced Apps');
129+
const labelTitle = this.i18Service.transform('Guide to update your Angular application');
130+
const labelBasic = this.i18Service.transform('basic applications');
131+
const labelMedium = this.i18Service.transform('medium applications');
132+
const labelAdvanced = this.i18Service.transform('advanced applications');
133133

134134
this.title =
135-
`${labelTitle} | ${this.from.name} -> ${this.to.name}
135+
`${labelTitle} v${this.from.name} -> v${this.to.name}
136136
${this.i18Service.transform('for')}
137137
${
138138
this.level < 2 ?

0 commit comments

Comments
 (0)