Merge pull request #403 from Madhuravas/develop

MOSIP-28550 changed missed labels
mosip · Jul 27, 2023 · bb163a6 · bb163a6
2 parents 53469c4 + f5f566d
commit bb163a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.ts b/resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.ts
@@ -58,7 +58,7 @@ export class ViewhistoryComponent implements OnInit, OnDestroy {
   message2:any;
   langCode = localStorage.getItem("langCode");
   serviceHistorySelectedValue: string;
-  statusHistorySelectedValue: string = "Status";
+  statusHistorySelectedValue: string;
   isLoading:boolean = true;
   dataAvailable:boolean = false;
   sitealignment:string = localStorage.getItem('direction');
@@ -179,7 +179,7 @@ export class ViewhistoryComponent implements OnInit, OnDestroy {
       })
     } else {
       this[formControlName] = "";
-      this.statusHistorySelectedValue = 'Status';
+      this.statusHistorySelectedValue = this.langJSON.viewhistory.status;
       this.statusTypeFilter = this.statusTypeFilter.map(eachServiceType => {
         eachServiceType.label.checked = false;
         return eachServiceType
@@ -205,7 +205,7 @@ export class ViewhistoryComponent implements OnInit, OnDestroy {
     });
 
     if(!this.statusHistorySelectedValue){
-      this.statusHistorySelectedValue = "Status";
+      this.statusHistorySelectedValue = this.langJSON.viewhistory.status;
     }else if(this.statusHistorySelectedValue.length > 26){
       this.statusHistorySelectedValue = this.statusHistorySelectedValue.substring(0,24) + "...";
     }else{
@@ -229,7 +229,7 @@ export class ViewhistoryComponent implements OnInit, OnDestroy {
       })
     } else {
       this[formControlName] = "";
-      this.serviceHistorySelectedValue = 'History Type';
+      this.serviceHistorySelectedValue = this.langJSON.viewhistory.historyType;
       this.serviceTypeFilter = this.serviceTypeFilter.map(eachServiceType => {
         eachServiceType.label.checked = false;
         return eachServiceType
@@ -254,7 +254,7 @@ export class ViewhistoryComponent implements OnInit, OnDestroy {
     });
 
     if(!this.serviceHistorySelectedValue){
-      this.serviceHistorySelectedValue = "History type";
+      this.serviceHistorySelectedValue = this.langJSON.viewhistory.historyType;
     }else if(this.serviceHistorySelectedValue.length > 26){
       this.serviceHistorySelectedValue = this.serviceHistorySelectedValue.substring(0,24) + "...";
     }else{

diff --git a/resident-ui/src/assets/i18n/fra.json b/resident-ui/src/assets/i18n/fra.json
@@ -241,7 +241,7 @@
         "searchBtn": "Rechercher",
         "description": "Description",
         "timestamp": "Horodatage",
-        "selectAll": "Tout sélectionner",
+        "selectAll": "Tout",
         "noData": "Aucun résultat à afficher",
         "historyType":"Type d'historique",
         "status":"Statut",