]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard: Store selected language in cookies
authorTiago Melo <tmelo@suse.com>
Tue, 1 Oct 2019 13:21:16 +0000 (13:21 +0000)
committerRicardo Dias <rdias@suse.com>
Thu, 10 Oct 2019 15:03:32 +0000 (16:03 +0100)
This will allow the backend access to this information in all requests.

Signed-off-by: Tiago Melo <tmelo@suse.com>
src/pybind/mgr/dashboard/frontend/src/app/locale.helper.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.spec.ts

index 7629f87e6290b7ccd5cae04953e0ab54232fe35b..b2c02e8239f5bdda0fbf5ef6e74ad7efd65ae754 100644 (file)
@@ -37,7 +37,6 @@ export class LocaleHelper {
 
   static setLocale(lang: string) {
     document.cookie = `cd-lang=${lang}`;
-    window.localStorage.setItem('lang', lang);
   }
 }
 
index cb8d4b37f648e9f5a0f3cda60f29e93560028143..6a883ededf4cf922af53431753045d4acbb88e3f 100644 (file)
@@ -4,6 +4,7 @@ import { FormsModule } from '@angular/forms';
 import { listLocales } from 'ngx-bootstrap/chronos';\r
 import { BsLocaleService } from 'ngx-bootstrap/datepicker';\r
 \r
+import { HttpClientTestingModule } from '@angular/common/http/testing';\r
 import { configureTestBed } from '../../../../testing/unit-test-helper';\r
 import { LanguageSelectorComponent } from './language-selector.component';\r
 \r
@@ -14,7 +15,7 @@ describe('LanguageSelectorComponent', () => {
   configureTestBed({\r
     declarations: [LanguageSelectorComponent],\r
     providers: [BsLocaleService],\r
-    imports: [FormsModule]\r
+    imports: [FormsModule, HttpClientTestingModule]\r
   });\r
 \r
   beforeEach(() => {\r
@@ -35,8 +36,8 @@ describe('LanguageSelectorComponent', () => {
 \r
   const expectLanguageChange = (lang) => {\r
     component.changeLanguage(lang);\r
-    expect(component.selectedLanguage).toBe(lang);\r
-    expect(listLocales().includes(lang.slice(0, 2))).toBe(true);\r
+    const cookie = document.cookie.split(';').filter((item) => item.includes(`cd-lang=${lang}`));\r
+    expect(cookie.length).toBe(1);\r
   };\r
 \r
   it('should change to cs', () => {\r