From 19879468a4f2aec6148142b62e894b1bcd047a91 Mon Sep 17 00:00:00 2001 From: Phodal Huang Date: Wed, 15 Apr 2020 10:57:25 +0800 Subject: [PATCH] feat: init translate for solution --- .../solution/solution.component.html | 23 ++++++++++--------- .../solution/solution.component.spec.ts | 16 ++++++++++++- .../solution/solution.component.ts | 4 +++- .../presentation/solution/solution.module.ts | 4 ++++ 4 files changed, 34 insertions(+), 13 deletions(-) diff --git a/src/app/presentation/solution/solution.component.html b/src/app/presentation/solution/solution.component.html index a0d9708f..9487e455 100644 --- a/src/app/presentation/solution/solution.component.html +++ b/src/app/presentation/solution/solution.component.html @@ -1,17 +1,18 @@ -

解决方案 help

+

{{ 'solution' | translate}} + help + +

    -
      -
    • - {{solution.displayName}} -
    • -
    +
  • + {{solution.displayName}} +
diff --git a/src/app/presentation/solution/solution.component.spec.ts b/src/app/presentation/solution/solution.component.spec.ts index d17fa78c..1cf75cd6 100644 --- a/src/app/presentation/solution/solution.component.spec.ts +++ b/src/app/presentation/solution/solution.component.spec.ts @@ -3,6 +3,11 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { SolutionComponent } from './solution.component'; import { SharedModule } from '../../shared/shared.module'; import { RouterTestingModule } from '@angular/router/testing'; +import { + TranslateFakeLoader, + TranslateLoader, + TranslateModule, +} from '@ngx-translate/core'; describe('SolutionComponent', () => { let component: SolutionComponent; @@ -10,7 +15,16 @@ describe('SolutionComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [SharedModule, RouterTestingModule], + imports: [ + SharedModule, + RouterTestingModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: TranslateFakeLoader, + }, + }), + ], declarations: [SolutionComponent], }).compileComponents(); })); diff --git a/src/app/presentation/solution/solution.component.ts b/src/app/presentation/solution/solution.component.ts index 8cb97288..c3976ac3 100644 --- a/src/app/presentation/solution/solution.component.ts +++ b/src/app/presentation/solution/solution.component.ts @@ -4,6 +4,7 @@ import { ActivatedRoute } from '@angular/router'; import { HttpClient, HttpHeaders } from '@angular/common/http'; import { MatDrawerContent } from '@angular/material/sidenav'; import { Solution, solutions } from './solutions'; +import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'app-solution', @@ -21,7 +22,8 @@ export class SolutionComponent implements OnInit { constructor( private title: Title, private activatedRoute: ActivatedRoute, - private http: HttpClient + private http: HttpClient, + translate: TranslateService ) {} ngOnInit(): void { diff --git a/src/app/presentation/solution/solution.module.ts b/src/app/presentation/solution/solution.module.ts index 36c781d6..1bca1b3e 100644 --- a/src/app/presentation/solution/solution.module.ts +++ b/src/app/presentation/solution/solution.module.ts @@ -5,6 +5,7 @@ import { SolutionRoutingModule } from './solution-routing.module'; import { CustomMaterialModule } from 'src/app/shared/custom-material.module'; import { SharedModule } from 'src/app/shared/shared.module'; import { SolutionComponent } from './solution.component'; +import { TranslateModule } from '@ngx-translate/core'; @NgModule({ declarations: [SolutionComponent], @@ -13,6 +14,9 @@ import { SolutionComponent } from './solution.component'; SolutionRoutingModule, CustomMaterialModule, SharedModule, + TranslateModule.forChild({ + isolate: false, + }), ], }) export class SolutionModule {}