Skip to content
Snippets Groups Projects
Commit a9d06a2f authored by Alex ORLUC's avatar Alex ORLUC
Browse files

FEAT #14136 TIME 2:30 add translate new mecanics

parent ce2d64e6
No related branches found
No related tags found
No related merge requests found
......@@ -2,6 +2,8 @@ import { NgModule } from '@angular/core';
import { SharedModule } from '../app-common.module';
import { InternationalizationModule } from '../../service/translate/internationalization.module';
import { AdministrationRoutingModule } from './administration-routing.module';
// import { NgxChartsModule } from '@swimlane/ngx-charts';
import { JoyrideModule } from 'ngx-joyride';
......@@ -68,6 +70,7 @@ import { UsersAdministrationComponent, UsersAdministrationRedirectModalComponent
imports: [
SharedModule,
// NgxChartsModule,
InternationalizationModule,
JoyrideModule.forChild(),
DocumentFormModule,
AdministrationRoutingModule,
......
......@@ -9,6 +9,7 @@ import { LangService } from '../service/app-lang.service';
import { HttpClient } from '@angular/common/http';
import { AuthService } from '../service/auth.service';
import { environment } from '../environments/environment';
import { TranslateService } from '@ngx-translate/core';
/** Custom options the configure the tooltip's default show/hide delays. */
export const myCustomTooltipDefaults: MatTooltipDefaultOptions = {
......@@ -35,6 +36,7 @@ export class AppComponent implements OnInit, AfterViewInit {
this.appService.setScreenWidth(window.innerWidth);
}
constructor(
private translate: TranslateService,
public http: HttpClient,
public langService: LangService,
iconReg: MatIconRegistry,
......@@ -43,6 +45,8 @@ export class AppComponent implements OnInit, AfterViewInit {
public headerService: HeaderService,
public authService: AuthService,
) {
translate.setDefaultLang('fr');
iconReg.addSvgIcon('maarchLogo', sanitizer.bypassSecurityTrustResourceUrl('../rest/images?image=onlyLogo'));
iconReg.addSvgIcon('maarchLogoFull', sanitizer.bypassSecurityTrustResourceUrl('../rest/images?image=logo'));
iconReg.addSvgIcon('maarchLogoWhite', sanitizer.bypassSecurityTrustResourceUrl('assets/logo_only_white.svg'));
......
......@@ -6,6 +6,7 @@ import { AppRoutingModule } from './app-routing.module';
import { BrowserModule, HammerGestureConfig, HAMMER_GESTURE_CONFIG } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
import { InternationalizationModule } from '../service/translate/internationalization.module';
import { JoyrideModule } from 'ngx-joyride';
......@@ -67,6 +68,7 @@ export class MyHammerConfig extends HammerGestureConfig {
BrowserModule,
BrowserAnimationsModule,
HttpClientModule,
InternationalizationModule,
JoyrideModule.forRoot(),
SharedModule,
AppRoutingModule,
......
import { NgModule } from '@angular/core';
import { SharedModule } from '../app-common.module';
import { InternationalizationModule } from '../../service/translate/internationalization.module';
import { InstallerComponent } from './installer.component';
import { InstallActionComponent } from './install-action/install-action.component';
import { WelcomeComponent } from './welcome/welcome.component';
......@@ -15,6 +16,7 @@ import { InstallerService } from './installer.service';
@NgModule({
imports: [
SharedModule,
InternationalizationModule,
InstallerRoutingModule
],
declarations: [
......
......@@ -32,6 +32,10 @@ export class AuthInterceptor implements HttpInterceptor {
{
route: '../rest/passwordRules',
method : ['GET']
},
{
route: '../rest/languages',
method : ['GET']
}
];
byPassHandleErrors: any[] = [
......
import { NgModule } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { CommonModule } from '@angular/common';
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
@NgModule({
imports: [
CommonModule,
TranslateModule.forRoot({
loader: {
provide: TranslateLoader,
useFactory: HttpLoaderFactory,
deps: [HttpClient]
}
}),
],
declarations: [
],
exports: [TranslateModule],
entryComponents: [
],
providers: []
})
export class InternationalizationModule { }
export class TranslateBackendHttpLoader implements TranslateLoader {
constructor(private http: HttpClient) { }
/**
* Gets the translations from the server
* @param lang
* @returns {any}
*/
public getTranslation(lang: string): any {
return this.http.get(`../rest/languages/` + lang);
}
}
// For traductions
export function HttpLoaderFactory(http: HttpClient) {
return new TranslateBackendHttpLoader(http);
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment