Skip to content

Commit cd62388

Browse files
cryptalithcryptalith
authored
Merge branch 'main' into lmendoza/PD-4781-v2
2 parents 382a2c2 + e278c5f commit cd62388

8 files changed

Lines changed: 172 additions & 129 deletions

File tree

‎SUPPORTED_BROWSERS.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
> This file is auto-generated from `.browserslistrc` during the prebuild step. Do not edit manually.
44
5-
| Browser | Minimum version |
6-
|---------|-----------------|
7-
| Android WebView | 142 or newer |
8-
| Apple Safari | 16.4 or newer |
9-
| Google Chrome | 112 or newer |
10-
| Microsoft Edge | 112 or newer |
11-
| Mozilla Firefox | 115 or newer |
12-
| Opera | 98 or newer |
13-
| Opera Mobile | 80 or newer |
14-
| Samsung Internet | 23 or newer |
5+
| Browser | Minimum version |
6+
| ---------------- | --------------- |
7+
| Android WebView | 142 or newer |
8+
| Apple Safari | 16.4 or newer |
9+
| Google Chrome | 112 or newer |
10+
| Microsoft Edge | 112 or newer |
11+
| Mozilla Firefox | 115 or newer |
12+
| Opera | 98 or newer |
13+
| Opera Mobile | 80 or newer |
14+
| Samsung Internet | 23 or newer |

‎src/app/password-recovery/pages/password-recovery/password-recovery.component.html‎

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -47,32 +47,41 @@
4747
</app-alert-message>
4848
<h2
4949
class="orc-font-body mb-4 mt-0 leading-6"
50+
aria-hidden="true"
5051
i18n="@@recovery.whatHaveYouForgotten"
5152
>
5253
What have you forgotten?
5354
</h2>
54-
<mat-radio-group
55-
formControlName="recoveryType"
56-
color="primary"
57-
[attr.aria-label]="ariaLabelIveForgotten"
58-
>
59-
<mat-radio-button value="password" class="block mb-4 text-sm/normal!">
60-
<span
61-
class="orc-font-body-small ml-2"
62-
i18n="@@recovery.myOrcidAccountPassword"
63-
>my ORCID account password</span
64-
>
65-
</mat-radio-button>
55+
<fieldset class="border-none p-0 m-0">
56+
<legend class="sr-only" i18n="@@recovery.whatHaveYouForgotten">
57+
What have you forgotten?
58+
</legend>
59+
<mat-radio-group formControlName="recoveryType" color="primary">
60+
<mat-radio-button value="password" class="block mb-4 text-sm/normal!">
61+
<span
62+
class="orc-font-body-small ml-2"
63+
[attr.aria-label]="
64+
ariaLabelIveForgotten + ' ' + ariaLabelMyOrcidAccountPassword
65+
"
66+
i18n="@@recovery.myOrcidAccountPassword"
67+
>
68+
my ORCID account password
69+
</span>
70+
</mat-radio-button>
6671

67-
<mat-radio-button value="orcidId" class="block">
68-
<span
69-
class="orc-font-body-small ml-2"
70-
i18n="@@recovery.my16DigitOrcidId"
71-
>
72-
my 16-digit ORCID iD
73-
</span>
74-
</mat-radio-button>
75-
</mat-radio-group>
72+
<mat-radio-button value="orcidId" class="block">
73+
<span
74+
class="orc-font-body-small ml-2"
75+
[attr.aria-label]="
76+
ariaLabelIveForgotten + ' ' + ariaLabelMy16DigitOrcidId
77+
"
78+
i18n="@@recovery.my16DigitOrcidId"
79+
>
80+
my 16-digit ORCID iD
81+
</span>
82+
</mat-radio-button>
83+
</mat-radio-group>
84+
</fieldset>
7685
<h2
7786
class="orc-font-body mt-6 mb-1 leading-6"
7887
i18n="@@recovery.whereShouldWeSend"
@@ -122,8 +131,8 @@
122131
} @if (recoveryForm.get('email').hasError('required') &&
123132
(recoveryForm.get('email').touched)) {
124133
<mat-error class="orc-font-small-print password-error ml-0">
125-
<ng-container i18n="@@register.primaryEmailRequired"
126-
>An email is required</ng-container
134+
<ng-container i18n="@@register.primaryEmailRequired2"
135+
>Please enter your email</ng-container
127136
>
128137
</mat-error>
129138
} @if (recoveryForm.get('email').hasError('email') &&
@@ -153,8 +162,7 @@
153162
} @if (submitted) {
154163
<div class="text-left orc-font-body-small">
155164
<span i18n="@@recovery.weHaveSent">We have sent a recovery email to</span
156-
>&nbsp;
157-
<b>{{ recoveryForm.get('email').value }}</b>
165+
>&nbsp;<b>{{ recoveryForm.get('email').value }}</b>
158166
<br />
159167
<br />
160168
<div i18n="@@recovery.ifYouDoNotReceive">

‎src/app/password-recovery/pages/password-recovery/password-recovery.component.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ export class PasswordRecoveryComponent implements OnInit {
2222
ariaLabelLostAccess = $localize`:@@recovery.lostAccessToYourEmailAddresses:Lost access to your email addresses?`
2323
ariaLabelTrySigningIn = $localize`:@@recovery.trySigningIn:Try signing in with your iD and password now`
2424
ariaLabelIveForgotten = $localize`:@@recovery.iveForgotten:I've forgotten`
25+
ariaLabelMyOrcidAccountPassword = $localize`:@@recovery.myOrcidAccountPassword:my ORCID account password`
26+
ariaLabelMy16DigitOrcidId = $localize`:@@recovery.my16DigitOrcidId:my 16-digit ORCID iD`
2527

2628
ngOnInit() {
2729
this.recoveryForm = new FormGroup({

‎src/locale/messages.lr.xlf‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4137,7 +4137,7 @@
41374137
</context-group>
41384138
<context-group purpose="location">
41394139
<context context-type="sourcefile">src/app/password-recovery/pages/password-recovery/password-recovery.component.html</context>
4140-
<context context-type="linenumber">134,136</context>
4140+
<context context-type="linenumber">143,145</context>
41414141
</context-group>
41424142
<target>LR</target>
41434143
</trans-unit>
@@ -11090,47 +11090,59 @@
1109011090
<source>What have you forgotten?</source>
1109111091
<context-group purpose="location">
1109211092
<context context-type="sourcefile">src/app/password-recovery/pages/password-recovery/password-recovery.component.html</context>
11093-
<context context-type="linenumber">51,53</context>
11093+
<context context-type="linenumber">52,54</context>
11094+
</context-group>
11095+
<context-group purpose="location">
11096+
<context context-type="sourcefile">src/app/password-recovery/pages/password-recovery/password-recovery.component.html</context>
11097+
<context context-type="linenumber">56,58</context>
1109411098
</context-group>
1109511099
<target>LR</target>
1109611100
</trans-unit>
1109711101
<trans-unit id="recovery.myOrcidAccountPassword" datatype="html" resname="recovery.myOrcidAccountPassword">
1109811102
<source>my ORCID account password</source>
1109911103
<context-group purpose="location">
1110011104
<context context-type="sourcefile">src/app/password-recovery/pages/password-recovery/password-recovery.component.html</context>
11101-
<context context-type="linenumber">63</context>
11105+
<context context-type="linenumber">67,69</context>
11106+
</context-group>
11107+
<context-group purpose="location">
11108+
<context context-type="sourcefile">src/app/password-recovery/pages/password-recovery/password-recovery.component.ts</context>
11109+
<context context-type="linenumber">25</context>
1110211110
</context-group>
1110311111
<target>LR</target>
1110411112
</trans-unit>
1110511113
<trans-unit id="recovery.my16DigitOrcidId" datatype="html" resname="recovery.my16DigitOrcidId">
1110611114
<source>my 16-digit ORCID iD</source>
1110711115
<context-group purpose="location">
1110811116
<context context-type="sourcefile">src/app/password-recovery/pages/password-recovery/password-recovery.component.html</context>
11109-
<context context-type="linenumber">71,73</context>
11117+
<context context-type="linenumber">79,81</context>
11118+
</context-group>
11119+
<context-group purpose="location">
11120+
<context context-type="sourcefile">src/app/password-recovery/pages/password-recovery/password-recovery.component.ts</context>
11121+
<context context-type="linenumber">26</context>
1111011122
</context-group>
1111111123
<target>LR</target>
1111211124
</trans-unit>
1111311125
<trans-unit id="recovery.whereShouldWeSend" datatype="html" resname="recovery.whereShouldWeSend">
1111411126
<source>Where should we send the recovery email?</source>
1111511127
<context-group purpose="location">
1111611128
<context context-type="sourcefile">src/app/password-recovery/pages/password-recovery/password-recovery.component.html</context>
11117-
<context context-type="linenumber">79,81</context>
11129+
<context context-type="linenumber">88,90</context>
1111811130
</context-group>
1111911131
<target>LR</target>
1112011132
</trans-unit>
1112111133
<trans-unit id="recovery.pleaseUseAnEmail" datatype="html" resname="recovery.pleaseUseAnEmail">
1112211134
<source>Please use an email address associated with your ORCID account.</source>
1112311135
<context-group purpose="location">
1112411136
<context context-type="sourcefile">src/app/password-recovery/pages/password-recovery/password-recovery.component.html</context>
11125-
<context context-type="linenumber">85,87</context>
11137+
<context context-type="linenumber">94,96</context>
1112611138
</context-group>
1112711139
<target>LR</target>
1112811140
</trans-unit>
1112911141
<trans-unit id="register.Email" datatype="html" resname="register.Email">
1113011142
<source>Email</source>
1113111143
<context-group purpose="location">
1113211144
<context context-type="sourcefile">src/app/password-recovery/pages/password-recovery/password-recovery.component.html</context>
11133-
<context context-type="linenumber">96,97</context>
11145+
<context context-type="linenumber">105,106</context>
1113411146
</context-group>
1113511147
<context-group purpose="location">
1113611148
<context context-type="sourcefile">src/app/sign-in/components/form-sign-in/form-sign-in.component.html</context>
@@ -11142,47 +11154,51 @@
1114211154
<source>For example: joe@institution.edu</source>
1114311155
<context-group purpose="location">
1114411156
<context context-type="sourcefile">src/app/password-recovery/pages/password-recovery/password-recovery.component.html</context>
11145-
<context context-type="linenumber">120,121</context>
11157+
<context context-type="linenumber">129,130</context>
1114611158
</context-group>
1114711159
<target>LR</target>
1114811160
</trans-unit>
11149-
<trans-unit id="register.primaryEmailRequired" datatype="html" resname="register.primaryEmailRequired">
11150-
<source>An email is required</source>
11161+
<trans-unit id="register.primaryEmailRequired2" datatype="html" resname="register.primaryEmailRequired2">
11162+
<source>Please enter your email</source>
1115111163
<context-group purpose="location">
1115211164
<context context-type="sourcefile">src/app/password-recovery/pages/password-recovery/password-recovery.component.html</context>
11153-
<context context-type="linenumber">126</context>
11165+
<context context-type="linenumber">135</context>
11166+
</context-group>
11167+
<context-group purpose="location">
11168+
<context context-type="sourcefile">src/app/register/components/form-personal/form-personal.component.html</context>
11169+
<context context-type="linenumber">152,154</context>
1115411170
</context-group>
1115511171
<target>LR</target>
1115611172
</trans-unit>
1115711173
<trans-unit id="recovery.sendRecoveryEmail" datatype="html" resname="recovery.sendRecoveryEmail">
1115811174
<source>Send recovery email</source>
1115911175
<context-group purpose="location">
1116011176
<context context-type="sourcefile">src/app/password-recovery/pages/password-recovery/password-recovery.component.html</context>
11161-
<context context-type="linenumber">150,152</context>
11177+
<context context-type="linenumber">159,161</context>
1116211178
</context-group>
1116311179
<target>LR</target>
1116411180
</trans-unit>
1116511181
<trans-unit id="recovery.weHaveSent" datatype="html" resname="recovery.weHaveSent">
1116611182
<source>We have sent a recovery email to</source>
1116711183
<context-group purpose="location">
1116811184
<context context-type="sourcefile">src/app/password-recovery/pages/password-recovery/password-recovery.component.html</context>
11169-
<context context-type="linenumber">155</context>
11185+
<context context-type="linenumber">164</context>
1117011186
</context-group>
1117111187
<target>LR</target>
1117211188
</trans-unit>
1117311189
<trans-unit id="recovery.ifYouDoNotReceive" datatype="html" resname="recovery.ifYouDoNotReceive">
1117411190
<source>If you do not receive the recovery email within 10 minutes please check your spam folder.</source>
1117511191
<context-group purpose="location">
1117611192
<context context-type="sourcefile">src/app/password-recovery/pages/password-recovery/password-recovery.component.html</context>
11177-
<context context-type="linenumber">160,163</context>
11193+
<context context-type="linenumber">168,171</context>
1117811194
</context-group>
1117911195
<target>LR</target>
1118011196
</trans-unit>
1118111197
<trans-unit id="recovery.backToSignIn" datatype="html" resname="recovery.backToSignIn">
1118211198
<source>Back to sign in</source>
1118311199
<context-group purpose="location">
1118411200
<context context-type="sourcefile">src/app/password-recovery/pages/password-recovery/password-recovery.component.html</context>
11185-
<context context-type="linenumber">170</context>
11201+
<context context-type="linenumber">178</context>
1118611202
</context-group>
1118711203
<target>LR</target>
1118811204
</trans-unit>
@@ -16194,14 +16210,6 @@
1619416210
</context-group>
1619516211
<target>LR</target>
1619616212
</trans-unit>
16197-
<trans-unit id="register.primaryEmailRequired2" datatype="html" resname="register.primaryEmailRequired2">
16198-
<source>Please enter your email</source>
16199-
<context-group purpose="location">
16200-
<context context-type="sourcefile">src/app/register/components/form-personal/form-personal.component.html</context>
16201-
<context context-type="linenumber">152,154</context>
16202-
</context-group>
16203-
<target>LR</target>
16204-
</trans-unit>
1620516213
<trans-unit id="register.theEmailAddress" datatype="html" resname="register.theEmailAddress">
1620616214
<source>The email address</source>
1620716215
<context-group purpose="location">

0 commit comments

Comments
 (0)