diff --git a/src/app/dataset-detail/components/dataset-info/dataset-info.component.html b/src/app/dataset-detail/components/dataset-info/dataset-info.component.html index dc8308f72fbdde00bd2883ace39f28c65c8cc071..2d4743c4ca77a123d550bcb70180bbe97f5e116c 100644 --- a/src/app/dataset-detail/components/dataset-info/dataset-info.component.html +++ b/src/app/dataset-detail/components/dataset-info/dataset-info.component.html @@ -21,14 +21,28 @@ <span class="info-title" i18n="@@dataset.info.legalContraints"> Terms of use </span> - <a class="link" [href]="license.url" target="_blank" *ngIf="license.url; else simpleLicenseName"> - <span>{{ license.nameFr }}</span><br> - <span>{{ license.nameEn }}</span> - </a> - - <ng-template #simpleLicenseName> + <div *ngIf="isFr(); else englishLicense"> + <a class="link" [href]="license.urlFr" target="_blank" *ngIf="license.urlFr; else simpleLicenseNameFr"> + <span>{{ license.nameFr }}</span> + </a><br> + <a [href]="license.urlEn" target="_blank" *ngIf="license.urlEn; else simpleLicenseNameEn"> + <span>{{ license.nameEn }}</span> + </a> + </div> + <ng-template #englishLicense> + <a class="link" [href]="license.urlEn" target="_blank" *ngIf="license.urlEn; else simpleLicenseNameEn"> + <span>{{ license.nameEn }}</span> + </a><br> + <a [href]="license.urlFr" target="_blank" *ngIf="license.urlFr; else simpleLicenseNameFr"> + <span>{{ license.nameFr }}</span> + </a> + </ng-template> + <ng-template #simpleLicenseNameFr> <span>{{ license.nameFr }}</span> </ng-template> + <ng-template #simpleLicenseNameEn> + <span>{{ license.nameEn }}</span> + </ng-template> </div> <app-info-partners class="mobile-section"></app-info-partners> diff --git a/src/app/dataset-detail/components/dataset-info/dataset-info.component.ts b/src/app/dataset-detail/components/dataset-info/dataset-info.component.ts index 5c8d1614558506a2814cfac049390b27d375a680..a3e454c8ae42751bd4751e8499fb2ced310f97cc 100644 --- a/src/app/dataset-detail/components/dataset-info/dataset-info.component.ts +++ b/src/app/dataset-detail/components/dataset-info/dataset-info.component.ts @@ -1,7 +1,9 @@ +import { isFormattedError } from '@angular/compiler'; import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from 'rxjs'; import { datatsetDataRepresentationType } from '../../../../i18n/traductions'; import { AppRoutes } from '../../../routes'; +import { environment } from '../../../../environments/environment'; import { License, Metadata, typesMetadata } from '../../../shared/models'; import { DatasetDetailService } from '../../services'; import { UsageStatisticsService } from '../../services/usage-statistics.service'; @@ -115,8 +117,15 @@ export class DatasetInfoComponent implements OnInit, OnDestroy { get keywords() { return this.metadata.keyword; } + + isFr(): boolean { + return window.location.href.includes(environment.angularAppHost.en) ? + false : true; + } } + + interface IGeographicalInfo { representationType: string; scale: string; diff --git a/src/app/shared/models/metadata.model.ts b/src/app/shared/models/metadata.model.ts index 78003e8df5f68eb3ae1572647729360221749867..c12f53164a0131181dd66ab69c4e1a88c2d2d1b6 100644 --- a/src/app/shared/models/metadata.model.ts +++ b/src/app/shared/models/metadata.model.ts @@ -124,7 +124,8 @@ export interface ILicense { nameEn?: string; acronymFr?: string; acronymEn?: string; - url?: string; + urlFr?: string; + urlEn?: string; } export class License { @@ -132,14 +133,17 @@ export class License { nameEn: string; acronymFr: string; acronymEn: string; - url: string; + urlFr: string; + urlEn: string; + constructor(data: ILicense) { this.nameFr = data && data.nameFr ? data.nameFr : null; this.nameEn = data && data.nameEn ? data.nameEn : null; this.acronymFr = data && data.acronymFr ? data.acronymFr : null; this.acronymEn = data && data.acronymEn ? data.acronymEn : null; - this.url = data && data.url ? data.url : null; + this.urlFr = data && data.urlFr ? data.urlFr : null; + this.urlEn = data && data.urlEn ? data.urlEn : this.urlFr; } }