From 810e3f10ac53ed7980fc41a7162d3c8882f59583 Mon Sep 17 00:00:00 2001
From: "ext.sopra.ncastejon" <castejon.nicolas@gmail.com>
Date: Mon, 23 Mar 2020 10:19:50 +0100
Subject: [PATCH] Fix one translation and wrong information in downloads page.
---
.../resource-queryable.component.html | 2 +-
.../resource-download-item.component.html | 16 ++++++----------
src/i18n/messages.en.xlf | 2 +-
src/i18n/messages.fr.xlf | 2 +-
4 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.html b/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.html
index 0cc6239f..b4090f1b 100644
--- a/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.html
+++ b/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.html
@@ -139,7 +139,7 @@
</div>
<div class="dropdown-menu" id="dropdown-menu" role="menu">
<div class="dropdown-content">
- <a class="dropdown-item" (click)="setInsee(null)" i18n="@@global.all.feminine">All</a>
+ <a class="dropdown-item" (click)="setInsee(null)" i18n="@@global.all.commune">All</a>
<a class="dropdown-item" *ngFor="let zone of communeInseeList" (click)="setInsee(zone)">
{{ zone.commune }} - {{ zone.insee }}
</a>
diff --git a/src/app/dataset-detail/components/dataset-downloads/resource-download-item/resource-download-item/resource-download-item.component.html b/src/app/dataset-detail/components/dataset-downloads/resource-download-item/resource-download-item/resource-download-item.component.html
index 0e2575e1..0267c2aa 100644
--- a/src/app/dataset-detail/components/dataset-downloads/resource-download-item/resource-download-item/resource-download-item.component.html
+++ b/src/app/dataset-detail/components/dataset-downloads/resource-download-item/resource-download-item/resource-download-item.component.html
@@ -9,22 +9,18 @@
<span>{{isQueryable ? resource.metadataLink.name + '.' + format.fileExtension : link.name }}
</span>
</div>
- <div class="resource-options is-hidden-mobile" *ngIf="format && format.isCuttable">
+ <div class="resource-options is-hidden-mobile" *ngIf="format && format.isProjectable">
<div>
<span *ngIf="this.selectedProjection"> {{this.selectedProjection.name}}
</span>
</div>
- <div *ngIf="this.selectedInsee">
+ <div *ngIf="format && format.isCuttable && inseeLabel">
<span> - </span>
- <span>{{ this.selectedInsee.commune }}</span>
- </div>
-
- <div *ngIf="! this.selectedInsee && format.isCuttable">
- <span> - </span>
- <span i18n="@@dataset.resources.allcommune">
- All the municipalities
- </span>
+ <span *ngIf="selectedInsee">{{ this.selectedInsee.commune }}</span>
+ <span i18n="@@dataset.resources.allcommune" *ngIf="! selectedInsee">
+ All the municipalities
+ </span>
</div>
</div>
</div>
diff --git a/src/i18n/messages.en.xlf b/src/i18n/messages.en.xlf
index 5ee997b3..117f1480 100644
--- a/src/i18n/messages.en.xlf
+++ b/src/i18n/messages.en.xlf
@@ -221,7 +221,7 @@
<source>Information</source>
<target>Information</target>
</trans-unit>
- <trans-unit id="global.all.feminine" datatype="html">
+ <trans-unit id="global.all.commune" datatype="html">
<source>All</source>
<target>All</target>
</trans-unit>
diff --git a/src/i18n/messages.fr.xlf b/src/i18n/messages.fr.xlf
index b0c1e7ba..6034b7fa 100644
--- a/src/i18n/messages.fr.xlf
+++ b/src/i18n/messages.fr.xlf
@@ -221,7 +221,7 @@
<source>Information</source>
<target>Informations</target>
</trans-unit>
- <trans-unit id="global.all.feminine" datatype="html">
+ <trans-unit id="global.all.commune" datatype="html">
<source>All</source>
<target>Toutes</target>
</trans-unit>
--
GitLab