Skip to content

Commit 1a8cbbd

Browse files
alisaismailatiFrancescoMolinaro
authored andcommitted
Merged in task/dspace-cris-2023_02_x/DSC-1651 (pull request DSpace#1647)
[DSC-1651] end-user-agreement fallback text Approved-by: Francesco Molinaro
2 parents 9116001 + 9463db1 commit 1a8cbbd

3 files changed

Lines changed: 14 additions & 3 deletions

File tree

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { SiteDataService } from '../../../core/data/site-data.service';
44
import { LocaleService } from '../../../core/locale/locale.service';
55
import { MetadatumViewModel } from '../../../core/shared/metadata.models';
66
import { isNotEmpty } from '../../../shared/empty.util';
7+
import { TranslateService } from '@ngx-translate/core';
78

89
@Component({
910
selector: 'ds-end-user-agreement-content',
@@ -21,9 +22,12 @@ export class EndUserAgreementContentComponent implements OnInit, OnDestroy {
2122

2223
userAgreementText$: BehaviorSubject<string> = new BehaviorSubject('');
2324

24-
constructor(private siteService: SiteDataService,
25-
private localeService: LocaleService) {
25+
fallbackText = 'info.end-user-agreement.content.fallback';
2626

27+
constructor(private siteService: SiteDataService,
28+
private localeService: LocaleService,
29+
private translateService: TranslateService
30+
) {
2731
}
2832

2933
private filterMetadata(metadata: MetadatumViewModel, langCode: string) {
@@ -37,8 +41,9 @@ export class EndUserAgreementContentComponent implements OnInit, OnDestroy {
3741

3842
const textArray = site?.metadataAsList.filter((metadata) => this.filterMetadata(metadata, langCode));
3943
const fallbackTextArray = site?.metadataAsList.filter((metadata) => this.filterMetadata(metadata, fallbackLangCode));
44+
const defaultFallbackText = this.translateService.instant(this.fallbackText);
4045

41-
this.userAgreementText$.next(textArray[0]?.value || fallbackTextArray[0]?.value || '');
46+
this.userAgreementText$.next(textArray[0]?.value || fallbackTextArray[0]?.value || defaultFallbackText);
4247
}));
4348
}
4449

src/assets/i18n/en.json5

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2625,6 +2625,8 @@
26252625

26262626
"info.end-user-agreement.hosting-country": "the United States",
26272627

2628+
"info.end-user-agreement.content.fallback": "Accept the user agreement.",
2629+
26282630
"info.privacy.breadcrumbs": "Privacy Statement",
26292631

26302632
"info.privacy.head": "Privacy Statement",

src/assets/i18n/it.json5

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3753,6 +3753,10 @@
37533753
// "info.end-user-agreement.title": "End User Agreement",
37543754
"info.end-user-agreement.title": "Accordo con l'utente finale",
37553755

3756+
// "info.end-user-agreement.content.fallback": "Accept the user agreement.",
3757+
// TODO New key - Add a translation
3758+
"info.end-user-agreement.content.fallback": "Accept the user agreement.",
3759+
37563760
// "info.privacy.breadcrumbs": "Privacy Statement",
37573761
"info.privacy.breadcrumbs": "Informativa sulla privacy",
37583762

0 commit comments

Comments
 (0)