fix(spatialFilter): missing traduction fix / CSS title update (#554)

infra-geo-ouverte · Jan 21, 2020 · 04e1beb · 04e1beb
1 parent 2321d67
commit 04e1beb
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 11 deletions.
diff --git a/packages/geo/src/lib/filter/shared/spatial-filter.service.ts b/packages/geo/src/lib/filter/shared/spatial-filter.service.ts
@@ -91,23 +91,38 @@ export class SpatialFilterService {
               name = substr.substring(index + 1, substr.length);
               substr = substr.substring(0, index);
             }
-            item.name = this.languageService.translate.instant(
-              'igo.geo.terrapi.' + name
-            );
+            try {
+              item.name = this.languageService.translate.instant(
+                'igo.geo.terrapi.' + name
+              );
+            } catch (e) {
+              item.name = name.substring(0,1).toUpperCase() + name.substring(1, name.length - 1);
+            }
+
+            try {
+              item.group = this.languageService.translate.instant(
+                'igo.geo.spatialFilter.group.' + substr
+              );
+            } catch (e) {
+              item.group = substr.substring(0,1).toUpperCase() + substr.substring(1, name.length - 1);
+            }
 
-            item.group = this.languageService.translate.instant(
-              'igo.geo.spatialFilter.group.' + substr
-            );
             items.push(item);
           } else {
             if (this.getKeyByValue(this.urlFilterList, type)) {
               const item: SpatialFilterThematic = {
-                name: this.languageService.translate.instant(
-                  'igo.geo.terrapi.' +
-                    this.getKeyByValue(this.urlFilterList, type)
-                ),
+                name: undefined,
                 source: type
               };
+              const name = this.getKeyByValue(this.urlFilterList, type);
+              try {
+                item.name = this.languageService.translate.instant(
+                    'igo.geo.terrapi.' + name);
+              } catch (e) {
+                item.name = name.substring(0,1).toUpperCase() + name.substring(1, name.length - 1);
+              }
+              item.source = type
+
               items.push(item);
             }
           }

diff --git a/.../geo/src/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.html b/.../geo/src/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.html
@@ -38,7 +38,7 @@
     </form>
   </div>
 
-  <mat-label class="title">{{'igo.geo.spatialFilter.search' | translate}} : </mat-label>
+  <mat-label class="title mat-typography">{{'igo.geo.spatialFilter.search' | translate}} : </mat-label>
   <mat-radio-group [value]="selectedItemType">
       <mat-radio-button *ngFor="let item of itemType"
         [value]="item"

diff --git a/.../geo/src/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.scss b/.../geo/src/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.scss
@@ -17,6 +17,10 @@
     margin-left: 5px;
 }
 
+.title {
+    font-size: initial;
+}
+
 .mat-radio-group {
     display: flex;
     flex-direction: column;