Issue #SB-9620 merge: Merge pull request #473 from sudip-mukherjee/re…

…lease-1.14.0 Issue #SB-9620 fix: Changed Key for translation
Sunbird-Ed · Feb 14, 2019 · 2a57c3c · 2a57c3c
2 parents 7a5f244 + 61b175b
commit 2a57c3c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/src/pages/profile/personal-details-edit.profile/personal-details-edit.profile.html b/src/pages/profile/personal-details-edit.profile/personal-details-edit.profile.html
@@ -14,7 +14,7 @@
           {{'ERROR_NAME_INVALID' | translate}}</div>
       </ion-label>
       <ion-input class="form-control" #name formControlName="name" placeholder="{{ 'NAME_HINT' | translate }}"
-        (ionChange)="enableSubmitButton();"></ion-input>
+        (ionChange)="enableSubmitButton();" dir="{{commonUtilService.getAppDirection()}}"></ion-input>
     </ion-item>
     <ion-item>
       <ion-label stacked class="label-font">{{'STATE' | translate}}</ion-label>

diff --git a/src/pages/search/filters/filter.ts b/src/pages/search/filters/filter.ts
@@ -3,6 +3,7 @@ import { NavParams, PopoverController, NavController, Events, Platform } from 'i
 import { CommonUtilService } from '../../../service/common-util.service';
 import * as _ from 'lodash';
 import { FilterOptions } from './options/options';
+import { IonicApp } from 'ionic-angular';
 
 @Component({
   selector: 'page-filter',
@@ -22,7 +23,8 @@ export class FilterPage {
     private navCtrl: NavController,
     private events: Events,
     private commonUtilService: CommonUtilService,
-    private platform: Platform
+    private platform: Platform,
+    private ionicApp: IonicApp
   ) {
     this.init();
     this.handleBackButton();
@@ -105,7 +107,13 @@ export class FilterPage {
    */
   handleBackButton() {
     this.unregisterBackButton = this.platform.registerBackButtonAction(() => {
-      this.navCtrl.pop();
+      const activePortal = this.ionicApp._modalPortal.getActive() ||
+        this.ionicApp._toastPortal.getActive() || this.ionicApp._overlayPortal.getActive();
+      if (activePortal) {
+        activePortal.dismiss();
+      } else if (this.navCtrl.canGoBack()) {
+        this.navCtrl.pop();
+      }
       this.unregisterBackButton();
     }, 11);
   }

diff --git a/src/pages/user-and-groups/add-or-remove-group-user/add-or-remove-group-user.ts b/src/pages/user-and-groups/add-or-remove-group-user/add-or-remove-group-user.ts
@@ -238,7 +238,7 @@ export class AddOrRemoveGroupUserPage {
           }
         },
         {
-          text: this.commonUtilService.translateMessage('Yes'),
+          text: this.commonUtilService.translateMessage('YES'),
           cssClass: 'alert-btn-delete',
           handler: () => {
             this.deleteUsersFromGroup();

diff --git a/src/pages/user-and-groups/group-details/group-details.ts b/src/pages/user-and-groups/group-details/group-details.ts
@@ -372,7 +372,7 @@ export class GroupDetailsPage {
           }
         },
         {
-          text: this.translateMessage('Yes'),
+          text: this.translateMessage('YES'),
           cssClass: 'alert-btn-delete',
           handler: () => {
             this.deleteGroup();
@@ -424,7 +424,7 @@ export class GroupDetailsPage {
           }
         },
         {
-          text: this.translateMessage('Yes'),
+          text: this.translateMessage('YES'),
           cssClass: 'alert-btn-delete',
           handler: () => {
             this.deleteUsersinGroup(index);

diff --git a/src/pages/user-and-groups/user-and-groups.ts b/src/pages/user-and-groups/user-and-groups.ts
@@ -555,7 +555,7 @@ export class UserAndGroupsPage {
           }
         },
         {
-          text: this.translateMessage('Yes'),
+          text: this.translateMessage('YES'),
           cssClass: 'alert-btn-delete',
           handler: () => {
             this.deleteGroup(index);
@@ -618,7 +618,7 @@ export class UserAndGroupsPage {
           }
         },
         {
-          text: this.translateMessage('Yes'),
+          text: this.translateMessage('YES'),
           cssClass: 'alert-btn-delete',
           handler: () => {
             this.deleteUser(index);