Skip to content

Commit e9894c9

Browse files
committed
Merge remote-tracking branch 'origin/main' into CST-6035_external-provider-query-error
2 parents a2e8b2a + c1f6993 commit e9894c9

25 files changed

Lines changed: 8274 additions & 61 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ If needing to update default configurations values for production, update local
179179

180180
- Update `environment.production.ts` file in `src/environment/` for a `production` environment;
181181

182-
The environment object is provided for use as import in code and is extended with he runtime configuration on bootstrap of the application.
182+
The environment object is provided for use as import in code and is extended with the runtime configuration on bootstrap of the application.
183183

184184
> Take caution moving runtime configs into the buildtime configuration. They will be overwritten by what is defined in the runtime config on bootstrap.
185185

config/config.example.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@ languages:
150150
- code: fi
151151
label: Suomi
152152
active: true
153+
- code: sv
154+
label: Svenska
155+
active: true
153156
- code: tr
154157
label: Türkçe
155158
active: true

src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import { BrowseByDataType, rendersBrowseBy } from '../browse-by-switcher/browse-
1818
import { PaginationService } from '../../core/pagination/pagination.service';
1919
import { map } from 'rxjs/operators';
2020

21+
export const BBM_PAGINATION_ID = 'bbm';
22+
2123
@Component({
2224
selector: 'ds-browse-by-metadata-page',
2325
styleUrls: ['./browse-by-metadata-page.component.scss'],
@@ -50,7 +52,7 @@ export class BrowseByMetadataPageComponent implements OnInit {
5052
* The pagination config used to display the values
5153
*/
5254
paginationConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
53-
id: 'bbm',
55+
id: BBM_PAGINATION_ID,
5456
currentPage: 1,
5557
pageSize: 20
5658
});

src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export abstract class SomeFeatureAuthorizationGuard implements CanActivate {
1919

2020
/**
2121
* True when user has authorization rights for the feature and object provided
22-
* Redirect the user to the unauthorized page when he/she's not authorized for the given feature
22+
* Redirect the user to the unauthorized page when they are not authorized for the given feature
2323
*/
2424
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> {
2525
return observableCombineLatest(this.getFeatureIDs(route, state), this.getObjectUrl(route, state), this.getEPersonUuid(route, state)).pipe(

src/app/core/data/processes/process-data.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export class ProcessDataService extends DataService<Process> {
3838
}
3939

4040
/**
41-
* Get the endpoint for a process his files
41+
* Get the endpoint for the files of the process
4242
* @param processId The ID of the process
4343
*/
4444
getFilesEndpoint(processId: string): Observable<string> {

src/app/core/end-user-agreement/end-user-agreement.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export class EndUserAgreementService {
5555

5656
/**
5757
* Set the current user's accepted agreement status
58-
* When a user is authenticated, set his/her metadata to the provided value
58+
* When a user is authenticated, set their metadata to the provided value
5959
* When no user is authenticated, set the cookie to the provided value
6060
* @param accepted
6161
*/

src/app/core/shared/metadata.models.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export class MetadataValue implements MetadataValueInterface {
3939
value: string;
4040

4141
/**
42-
* The place of this MetadataValue within his list of metadata
42+
* The place of this MetadataValue within its list of metadata
4343
* This is used to render metadata in a specific custom order
4444
*/
4545
@autoserialize
@@ -105,7 +105,7 @@ export class MetadatumViewModel {
105105
value: string;
106106

107107
/**
108-
* The place of this MetadataValue within his list of metadata
108+
* The place of this MetadataValue within its list of metadata
109109
* This is used to render metadata in a specific custom order
110110
*/
111111
place: number;

src/app/health-page/health-panel/health-status/health-status.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export class HealthStatusComponent {
1616
@Input() status: HealthStatus;
1717

1818
/**
19-
* He
19+
* Health Status
2020
*/
2121
HealthStatus = HealthStatus;
2222

src/app/info/end-user-agreement/end-user-agreement.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export class EndUserAgreementComponent implements OnInit {
7676

7777
/**
7878
* Cancel the agreement
79-
* If the user is logged in, this will log him/her out
79+
* If the user is logged in, this will log them out
8080
* If the user is not logged in, they will be redirected to the homepage
8181
*/
8282
cancel() {

src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { ConfirmationModalComponent } from '../../shared/confirmation-modal/conf
2424
templateUrl: './profile-page-researcher-form.component.html',
2525
})
2626
/**
27-
* Component for a user to create/delete or change his researcher profile.
27+
* Component for a user to create/delete or change their researcher profile.
2828
*/
2929
export class ProfilePageResearcherFormComponent implements OnInit {
3030

0 commit comments

Comments
 (0)