diff --git a/package.json b/package.json index a437e94..56dea15 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,10 @@ "e2e": "yarn ng:e2e && yarn electron:e2e", "start": "del -f dist && npm-run-all -p ng:serve electron:serve", "build:dist": "del -f dist && yarn ng:build && yarn electron:build", - "build:copy": "cpy package.json dist/main/* dist/angular/* dist/build && cpy static ../dist/build --cwd=src --parents", + "build:copy:ng": "cpy '**/*' '../build' --cwd=dist/angular --parents", + "build:copy:static": "cpy 'static' '../dist/build' --cwd=src --parents", + "build:copy:electron": "cpy '**/*' '../build' --cwd=dist/main --parents && yarn build:copy:static", + "build:copy": "cpy package.json dist/build && yarn build:copy:ng && yarn build:copy:electron", "build": "yarn build:dist && yarn build:copy && cd dist/build && yarn --prod", "package": "yarn build && electron-builder" }, @@ -37,6 +40,8 @@ "@angular/platform-browser": "~9.1.1", "@angular/platform-browser-dynamic": "~9.1.1", "@angular/router": "~9.1.1", + "@ngx-translate/core": "^12.1.2", + "@ngx-translate/http-loader": "^4.0.0", "@types/jasmine": "~3.5.0", "@types/jasminewd2": "~2.0.3", "@types/node": "^12.11.1", diff --git a/src/angular/app/app.module.ts b/src/angular/app/app.module.ts index 4572b5f..3d6a1d1 100644 --- a/src/angular/app/app.module.ts +++ b/src/angular/app/app.module.ts @@ -1,17 +1,34 @@ +import { HttpClient, HttpClientModule } from '@angular/common/http'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { BrowserModule } from '@angular/platform-browser'; import { RouterModule } from '@angular/router'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; +import { TranslateHttpLoader } from '@ngx-translate/http-loader'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { MutiplesComponent } from './components/mutiples/mutiples.component'; +// AoT requires an exported function for factories +export function HttpLoaderFactory(http: HttpClient) { + return new TranslateHttpLoader(http, './assets/i18n/', '.json'); +} + @NgModule({ declarations: [AppComponent, MutiplesComponent], imports: [ BrowserModule, AppRoutingModule, + HttpClientModule, ReactiveFormsModule, + TranslateModule.forRoot({ + defaultLanguage: 'en', + loader: { + provide: TranslateLoader, + useFactory: HttpLoaderFactory, + deps: [HttpClient], + }, + }), RouterModule.forRoot([{ path: '', component: MutiplesComponent }]), ], providers: [], diff --git a/src/angular/app/components/mutiples/mutiples.component.html b/src/angular/app/components/mutiples/mutiples.component.html index c2a7dbf..ac35d8d 100644 --- a/src/angular/app/components/mutiples/mutiples.component.html +++ b/src/angular/app/components/mutiples/mutiples.component.html @@ -1,21 +1,14 @@