From f3651251f5ff3be9b4dcbf8021c3c0d7ad974f45 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Fri, 21 Sep 2018 11:00:25 -0700
Subject: [PATCH] SHIBUI-814 Fixed test and ref to navigator

---
 ui/src/app/i18n/service/i18n.service.spec.ts | 16 +---------------
 ui/src/app/i18n/service/i18n.service.ts      |  8 ++++----
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/ui/src/app/i18n/service/i18n.service.spec.ts b/ui/src/app/i18n/service/i18n.service.spec.ts
index cd677b2e9..9a99a06e8 100644
--- a/ui/src/app/i18n/service/i18n.service.spec.ts
+++ b/ui/src/app/i18n/service/i18n.service.spec.ts
@@ -4,20 +4,6 @@ import { HttpClientModule } from '@angular/common/http';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { NavigatorService } from '../../core/service/navigator.service';
 
-class MockNavigatorService {
-    language = 'en-US';
-
-    languages = ['en-US'];
-
-    get native(): string {
-        return this.language;
-    }
-
-    set native(str: string) {
-        this.language = str;
-    }
-}
-
 describe('i18n Service', () => {
     let service: I18nService;
     let nav: NavigatorService;
@@ -29,7 +15,7 @@ describe('i18n Service', () => {
                 HttpClientTestingModule
             ],
             providers: [
-                { provide: NavigatorService, useClass: MockNavigatorService },
+                NavigatorService,
                 I18nService
             ]
         });
diff --git a/ui/src/app/i18n/service/i18n.service.ts b/ui/src/app/i18n/service/i18n.service.ts
index 454a270ea..a50bae832 100644
--- a/ui/src/app/i18n/service/i18n.service.ts
+++ b/ui/src/app/i18n/service/i18n.service.ts
@@ -25,20 +25,20 @@ export class I18nService {
     }
 
     getCurrentLanguage(): string {
-        return getCurrentLanguage(this.navigator);
+        return getCurrentLanguage(this.navigator.native);
     }
 
     getCurrentCountry(): string {
-        return getCurrentCountry(this.navigator);
+        return getCurrentCountry(this.navigator.native);
     }
 
     getCurrentLocale(): string {
-        return getCurrentLocale(this.navigator);
+        return getCurrentLocale(this.navigator.native);
     }
 
     translate(value: string, interpolated: any, messages: Messages): string {
         interpolated = interpolated || {};
-        let val = messages.hasOwnProperty(value) ? messages[value] : value;
+        let val = messages.hasOwnProperty(value) ? messages[value] : (Object.keys(messages).length ? value : '');
         return this.interpolate(val, interpolated);
     }