From 007739c356b6ab09d70e58faf0ae71fefb23912d Mon Sep 17 00:00:00 2001
From: sercan <sercanyemen@gmail.com>
Date: Mon, 16 Dec 2019 08:21:37 +0300
Subject: [PATCH] (FuseNavigation) Fixed: Translations are not being applied

---
 .../horizontal/collapsable/collapsable.component.html       | 6 +++---
 .../navigation/horizontal/item/item.component.html          | 6 +++---
 .../vertical/collapsable/collapsable.component.html         | 4 ++--
 .../navigation/vertical/group/group.component.html          | 4 ++--
 .../components/navigation/vertical/item/item.component.html | 6 +++---
 src/app/navigation/navigation.ts                            | 4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/@fuse/components/navigation/horizontal/collapsable/collapsable.component.html b/src/@fuse/components/navigation/horizontal/collapsable/collapsable.component.html
index 0c25864a..1eb155e3 100644
--- a/src/@fuse/components/navigation/horizontal/collapsable/collapsable.component.html
+++ b/src/@fuse/components/navigation/horizontal/collapsable/collapsable.component.html
@@ -42,10 +42,10 @@
 
     <ng-template #itemContent>
         <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
-        <span class="nav-link-title" [translate]="item.translate">{{item.title}}</span>
+        <span class="nav-link-title" [translate]="item.translate">{{(item.translate | translate) || item.title}}</span>
         <span class="nav-link-badge" *ngIf="item.badge" [translate]="item.badge.translate"
               [ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
-            {{item.badge.title}}
+            {{(item.badge.translate | translate) || item.badge.title}}
         </span>
         <mat-icon class="collapsable-arrow">keyboard_arrow_right</mat-icon>
     </ng-template>
@@ -66,4 +66,4 @@
 
     </div>
 
-</ng-container>
\ No newline at end of file
+</ng-container>
diff --git a/src/@fuse/components/navigation/horizontal/item/item.component.html b/src/@fuse/components/navigation/horizontal/item/item.component.html
index d2636ab7..75101981 100644
--- a/src/@fuse/components/navigation/horizontal/item/item.component.html
+++ b/src/@fuse/components/navigation/horizontal/item/item.component.html
@@ -38,11 +38,11 @@
 
     <ng-template #itemContent>
         <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
-        <span class="nav-link-title" [translate]="item.translate">{{item.title}}</span>
+        <span class="nav-link-title" [translate]="item.translate">{{(item.translate | translate) || item.title}}</span>
         <span class="nav-link-badge" *ngIf="item.badge" [translate]="item.badge.translate"
               [ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
-            {{item.badge.title}}
+            {{(item.badge.translate | translate) || item.badge.title}}
         </span>
     </ng-template>
 
-</ng-container>
\ No newline at end of file
+</ng-container>
diff --git a/src/@fuse/components/navigation/vertical/collapsable/collapsable.component.html b/src/@fuse/components/navigation/vertical/collapsable/collapsable.component.html
index cc8ab10f..cc0eefc9 100644
--- a/src/@fuse/components/navigation/vertical/collapsable/collapsable.component.html
+++ b/src/@fuse/components/navigation/vertical/collapsable/collapsable.component.html
@@ -45,10 +45,10 @@
 
     <ng-template #itemContent>
         <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
-        <span class="nav-link-title" [translate]="item.translate">{{item.title}}</span>
+        <span class="nav-link-title" [translate]="item.translate">{{(item.translate | translate) || item.title}}</span>
         <span class="nav-link-badge" *ngIf="item.badge" [translate]="item.badge.translate"
               [ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
-            {{item.badge.title}}
+            {{(item.badge.translate | translate) || item.badge.title}}
         </span>
         <mat-icon class="collapsable-arrow">keyboard_arrow_right</mat-icon>
     </ng-template>
diff --git a/src/@fuse/components/navigation/vertical/group/group.component.html b/src/@fuse/components/navigation/vertical/group/group.component.html
index 3285cfd3..e83d601a 100644
--- a/src/@fuse/components/navigation/vertical/group/group.component.html
+++ b/src/@fuse/components/navigation/vertical/group/group.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngIf="!item.hidden">
 
     <div class="group-title" [ngClass]="item.classes">
-        <span class="hint-text" [translate]="item.translate">{{ item.title }}</span>
+        <span class="hint-text" [translate]="item.translate">{{(item.translate | translate) || item.title}}</span>
     </div>
 
     <div class="group-items">
@@ -13,4 +13,4 @@
         </ng-container>
     </div>
 
-</ng-container>
\ No newline at end of file
+</ng-container>
diff --git a/src/@fuse/components/navigation/vertical/item/item.component.html b/src/@fuse/components/navigation/vertical/item/item.component.html
index d2636ab7..75101981 100644
--- a/src/@fuse/components/navigation/vertical/item/item.component.html
+++ b/src/@fuse/components/navigation/vertical/item/item.component.html
@@ -38,11 +38,11 @@
 
     <ng-template #itemContent>
         <mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
-        <span class="nav-link-title" [translate]="item.translate">{{item.title}}</span>
+        <span class="nav-link-title" [translate]="item.translate">{{(item.translate | translate) || item.title}}</span>
         <span class="nav-link-badge" *ngIf="item.badge" [translate]="item.badge.translate"
               [ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
-            {{item.badge.title}}
+            {{(item.badge.translate | translate) || item.badge.title}}
         </span>
     </ng-template>
 
-</ng-container>
\ No newline at end of file
+</ng-container>
diff --git a/src/app/navigation/navigation.ts b/src/app/navigation/navigation.ts
index a2ec91bc..60e2c72e 100644
--- a/src/app/navigation/navigation.ts
+++ b/src/app/navigation/navigation.ts
@@ -49,14 +49,14 @@ export const navigation: FuseNavigation[] = [
                         title     : 'Products',
                         type      : 'item',
                         url       : '/apps/e-commerce/products',
-                        exactMatch: true
+                        // exactMatch: true
                     },
                     {
                         id        : 'productDetail',
                         title     : 'Product Detail',
                         type      : 'item',
                         url       : '/apps/e-commerce/products/1/printed-dress',
-                        exactMatch: true
+                        // exactMatch: true
                     },
                     {
                         id        : 'orders',