Merge pull request #30 from Stivin/translate-list

Fix translate list

Author: Gorniv

src/app/shared/layouts/toolbar/toolbar.component.ts

@@ -1,24 +1,20 @@
 import { Component, OnInit } from '@angular/core';
 
-import { TranslatesService } from '@shared/translates/translates.service';
-
-const LANGUAGES: any[] = [
-  { value: 'ru', name: 'Русский' },
-  { value: 'en', name: 'English' }
-];
+import { TranslatesService, ITranslatesLanguage } from '@shared/translates';
 
 @Component({
   selector: 'app-toolbar',
   templateUrl: './toolbar.component.html'
 })
 export class ToolbarComponent implements OnInit {
-  public languages: any[] = LANGUAGES;
-  public currentLang;
+  public languages: ITranslatesLanguage[];
+  public currentLang: string;
 
   constructor(private _translatesService: TranslatesService) {
   }
 
   ngOnInit() {
+    this.languages = this._translatesService.getLanguages();
     this.currentLang = this._translatesService.getCurrentLang();
   }
 

src/app/shared/shared.module.ts

@@ -1,7 +1,7 @@
 import { ModuleWithProviders, NgModule } from '@angular/core';
 
 import { LayoutsModule } from './layouts/layouts.module';
-import { TranslatesModule } from './translates/translates.module';
+import { TranslatesModule } from './translates';
 
 @NgModule({
   exports: [

src/app/shared/translates/index.ts

@@ -0,0 +1,3 @@
+export { TranslatesModule } from './translates.module';
+export { TranslatesService } from './translates.service';
+export { ITranslatesLanguage } from './translates.interface';

src/app/shared/translates/translates.interface.ts

@@ -0,0 +1,4 @@
+export interface ITranslatesLanguage {
+  value: string;
+  name: string;
+}

src/app/shared/translates/translates.service.ts

@@ -1,25 +1,36 @@
 import { Injectable, Inject } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
+
 import { AppStorage } from 'forStorage/universal.inject';
 
+import { ITranslatesLanguage } from './translates.interface';
+
+const LANGUAGES: ITranslatesLanguage[] = [
+  { value: 'ru', name: 'Русский' },
+  { value: 'en', name: 'English' }
+];
 const LANG_LIST: string[] = ['en', 'ru'];
 const DEFAULT_LANG: string = 'en';
 
 @Injectable()
 export class TranslatesService {
   constructor(private _translateService: TranslateService,
-    @Inject(AppStorage) private appStorage: Storage) {
+              @Inject(AppStorage) private _appStorage: Storage) {
     this._translateService.addLangs(LANG_LIST);
     this._translateService.setDefaultLang(DEFAULT_LANG);
-    this._translateService.use(this.appStorage.getItem('lang') || DEFAULT_LANG);
+    this._translateService.use(this._appStorage.getItem('lang') || DEFAULT_LANG);
+  }
+
+  public getLanguages(): ITranslatesLanguage[] {
+    return LANGUAGES;
   }
 
   public getCurrentLang(): string {
     return this._translateService.currentLang;
   }
 
   public changeLang(lang: string): void {
-    this.appStorage.setItem('lang', lang);
+    this._appStorage.setItem('lang', lang);
     this._translateService.use(lang);
   }
 }