From 24e1090a20c9c4518fafad63119cf51cf58a42c4 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 28 Jan 2019 17:15:39 +0100
Subject: [PATCH] Renommage internationalisationService => i18nService
---
src/app/app.component.ts | 12 +++++-----
src/app/app.module.ts | 22 +++++++++++++++----
.../app-setup/app-setup.component.ts | 4 ++--
.../base-param-input.component.ts | 4 ++--
.../dialog-confirm-close-calc.component.ts | 4 ++--
.../dialog-confirm-empty-session.component.ts | 4 ++--
.../dialog-load-session.component.ts | 4 ++--
.../dialog-save-session.component.ts | 4 ++--
.../fixed-results.component.ts | 4 ++--
.../fixedvar-results.component.ts | 4 ++--
.../fixedvar-results/var-results.component.ts | 4 ++--
.../calculator.component.ts | 8 +++----
.../log-entry/log-entry.component.ts | 4 ++--
src/app/components/log/log.component.ts | 4 ++--
.../ngparam-input/ngparam-input.component.ts | 4 ++--
.../param-field-line.component.ts | 6 ++---
.../param-values/ngparam-max.component.ts | 4 ++--
.../param-values/ngparam-min.component.ts | 4 ++--
.../param-values/ngparam-step.component.ts | 4 ++--
.../param-values/param-values.component.ts | 4 ++--
.../param-values/value-list.component.ts | 4 ++--
.../remous-results.component.ts | 4 ++--
.../result-element-base.component.ts | 6 ++---
.../section-results.component.ts | 4 ++--
.../concrete/form-section-parametree.ts | 2 +-
src/app/formulaire/formulaire-element.ts | 6 ++---
src/app/results/var-results.ts | 2 +-
.../services/formulaire/formulaire.service.ts | 8 +++----
.../internationalisation.service.ts | 6 ++---
src/app/services/param/param.service.ts | 8 +++----
src/app/services/service-factory.ts | 4 ++--
31 files changed, 90 insertions(+), 76 deletions(-)
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 40aecafd2..55e65a525 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -4,14 +4,14 @@ import { Router, Event, NavigationEnd, ActivationEnd } from "@angular/router";
import { Observer, jalhydDateRev } from "jalhyd";
import { environment } from "../environments/environment";
-import { InternationalisationService } from "./services/internationalisation/internationalisation.service";
+import { I18nService } from "./services/internationalisation/internationalisation.service";
import { ErrorService } from "./services/error/error.service";
import { FormulaireService } from "./services/formulaire/formulaire.service";
import { FormulaireDefinition } from "./formulaire/definition/form-definition";
import { ServiceFactory } from "./services/service-factory";
import { ParamService } from "./services/param/param.service";
-import { ApplicationSetupService } from "./services/app-setup/app-setup.service";
import { HttpService } from "./services/http/http.service";
+import { ApplicationSetupService } from "./services/app-setup/app-setup.service";
import { nghydDateRev } from "../date_revision";
import { MatSidenav, MatToolbar, MatDialog } from "@angular/material";
@@ -59,7 +59,7 @@ export class AppComponent implements OnInit, OnDestroy, Observer {
private _routerCurrentComponent: Component;
constructor(
- private intlService: InternationalisationService,
+ private intlService: I18nService,
private paramService: ParamService,
private appSetupService: ApplicationSetupService,
private appRef: ApplicationRef,
@@ -71,11 +71,11 @@ export class AppComponent implements OnInit, OnDestroy, Observer {
private saveSessionDialog: MatDialog,
private loadSessionDialog: MatDialog
) {
+ ServiceFactory.instance.httpService = httpService;
ServiceFactory.instance.applicationSetupService = appSetupService;
ServiceFactory.instance.paramService = paramService;
- ServiceFactory.instance.internationalisationService = intlService;
+ ServiceFactory.instance.i18nService = intlService;
ServiceFactory.instance.formulaireService = formulaireService;
- ServiceFactory.instance.httpService = httpService;
this.router.events.subscribe((event: Event) => {
// close side navigation when clicking a calculator tab
@@ -251,7 +251,7 @@ export class AppComponent implements OnInit, OnDestroy, Observer {
this.closeCalculator(form);
break;
}
- } else if (sender instanceof InternationalisationService) {
+ } else if (sender instanceof I18nService) {
this.updateLocale();
} else if (sender instanceof FormulaireDefinition) {
switch (data["action"]) {
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 9f2bebe38..0919fdfb2 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -2,8 +2,21 @@ import { BrowserModule } from "@angular/platform-browser";
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { MatButtonModule, MatCheckboxModule, MatIconModule, MatSelectModule, MatTabsModule, MatSidenavModule,
- MatToolbarModule, MatMenuModule, MatDialogModule, MatFormFieldModule, MatInputModule, MatListModule } from "@angular/material";
+import {
+ MatButtonModule,
+ MatCheckboxModule,
+ MatIconModule,
+ MatSelectModule,
+ MatTabsModule,
+ MatSidenavModule,
+ MatToolbarModule,
+ MatMenuModule,
+ MatDialogModule,
+ MatFormFieldModule,
+ MatInputModule,
+ MatListModule,
+ MatCardModule
+} from "@angular/material";
import { MaterialFileInputModule } from "ngx-material-file-input";
import { FlexLayoutModule } from "@angular/flex-layout";
@@ -16,7 +29,7 @@ import { NgxMdModule } from "ngx-md";
import { FormulaireService } from "./services/formulaire/formulaire.service";
import { ParamService } from "./services/param/param.service";
-import { InternationalisationService } from "./services/internationalisation/internationalisation.service";
+import { I18nService } from "./services/internationalisation/internationalisation.service";
import { HttpService } from "./services/http/http.service";
import { ApplicationSetupService } from "./services/app-setup/app-setup.service";
@@ -76,6 +89,7 @@ const appRoutes: Routes = [
HttpClientModule,
FlexLayoutModule,
MatButtonModule,
+ MatCardModule,
MatCheckboxModule,
MatDialogModule,
MaterialFileInputModule,
@@ -147,7 +161,7 @@ const appRoutes: Routes = [
ApplicationSetupService,
FormulaireService,
HttpService,
- InternationalisationService,
+ I18nService,
ParamService
],
schemas: [ NO_ERRORS_SCHEMA ],
diff --git a/src/app/components/app-setup/app-setup.component.ts b/src/app/components/app-setup/app-setup.component.ts
index 9cafb5ab4..01b852d4e 100644
--- a/src/app/components/app-setup/app-setup.component.ts
+++ b/src/app/components/app-setup/app-setup.component.ts
@@ -3,7 +3,7 @@ import { Component, ViewChild, OnInit } from "@angular/core";
import { ParamDomainValue, Observer } from "jalhyd";
import { ApplicationSetupService } from "../../services/app-setup/app-setup.service";
-import { InternationalisationService, LanguageCode } from "../../services/internationalisation/internationalisation.service";
+import { I18nService, LanguageCode } from "../../services/internationalisation/internationalisation.service";
import { NgBaseParam, BaseParamInputComponent } from "../base-param-input/base-param-input.component";
import { BaseComponent } from "../base/base.component";
@@ -38,7 +38,7 @@ export class ApplicationSetupComponent extends BaseComponent implements Observer
constructor(
private appSetupService: ApplicationSetupService,
- private intlService: InternationalisationService
+ private intlService: I18nService
) {
super();
this.appSetupService.addObserver(this);
diff --git a/src/app/components/base-param-input/base-param-input.component.ts b/src/app/components/base-param-input/base-param-input.component.ts
index 2a3588fc0..b85fc7abe 100644
--- a/src/app/components/base-param-input/base-param-input.component.ts
+++ b/src/app/components/base-param-input/base-param-input.component.ts
@@ -4,7 +4,7 @@ import { Component, ChangeDetectorRef } from "@angular/core";
import { Message, ParamDefinition, ParamDomain, ParamDomainValue, Observable, isNumeric } from "jalhyd";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
import { GenericInputComponent } from "../generic-input/generic-input.component";
export class NgBaseParam extends Observable {
@@ -42,7 +42,7 @@ export class NgBaseParam extends Observable {
templateUrl: "../generic-input/generic-input.component.html",
})
export class BaseParamInputComponent extends GenericInputComponent {
- constructor(private intlService: InternationalisationService, cdRef: ChangeDetectorRef) {
+ constructor(private intlService: I18nService, cdRef: ChangeDetectorRef) {
super(cdRef);
}
diff --git a/src/app/components/dialog-confirm-close-calc/dialog-confirm-close-calc.component.ts b/src/app/components/dialog-confirm-close-calc/dialog-confirm-close-calc.component.ts
index bca33ee6c..e8a1f44ca 100644
--- a/src/app/components/dialog-confirm-close-calc/dialog-confirm-close-calc.component.ts
+++ b/src/app/components/dialog-confirm-close-calc/dialog-confirm-close-calc.component.ts
@@ -1,6 +1,6 @@
import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material";
import { Inject, Component } from "@angular/core";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
@Component({
selector: "dialog-confirm-close-calc",
@@ -10,7 +10,7 @@ export class DialogConfirmCloseCalcComponent {
constructor(
public dialogRef: MatDialogRef<DialogConfirmCloseCalcComponent>,
- private intlService: InternationalisationService,
+ private intlService: I18nService,
@Inject(MAT_DIALOG_DATA) public data: any
) { }
diff --git a/src/app/components/dialog-confirm-empty-session/dialog-confirm-empty-session.component.ts b/src/app/components/dialog-confirm-empty-session/dialog-confirm-empty-session.component.ts
index b6d695e5a..f2334de93 100644
--- a/src/app/components/dialog-confirm-empty-session/dialog-confirm-empty-session.component.ts
+++ b/src/app/components/dialog-confirm-empty-session/dialog-confirm-empty-session.component.ts
@@ -1,6 +1,6 @@
import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material";
import { Inject, Component } from "@angular/core";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
@Component({
selector: "dialog-confirm-empty-session",
@@ -10,7 +10,7 @@ export class DialogConfirmEmptySessionComponent {
constructor(
public dialogRef: MatDialogRef<DialogConfirmEmptySessionComponent>,
- private intlService: InternationalisationService,
+ private intlService: I18nService,
@Inject(MAT_DIALOG_DATA) public data: any
) { }
diff --git a/src/app/components/dialog-load-session/dialog-load-session.component.ts b/src/app/components/dialog-load-session/dialog-load-session.component.ts
index c07202737..3aa55c836 100644
--- a/src/app/components/dialog-load-session/dialog-load-session.component.ts
+++ b/src/app/components/dialog-load-session/dialog-load-session.component.ts
@@ -1,6 +1,6 @@
import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material";
import { Inject, Component } from "@angular/core";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
import { FormGroup, FormBuilder, Validators } from "@angular/forms";
import { ServiceFactory } from "../../services/service-factory";
@@ -19,7 +19,7 @@ export class DialogLoadSessionComponent {
constructor(
public dialogRef: MatDialogRef<DialogLoadSessionComponent>,
- private intlService: InternationalisationService,
+ private intlService: I18nService,
private fb: FormBuilder,
@Inject(MAT_DIALOG_DATA) public data: any
) {
diff --git a/src/app/components/dialog-save-session/dialog-save-session.component.ts b/src/app/components/dialog-save-session/dialog-save-session.component.ts
index e33183c22..032ed2c65 100644
--- a/src/app/components/dialog-save-session/dialog-save-session.component.ts
+++ b/src/app/components/dialog-save-session/dialog-save-session.component.ts
@@ -1,6 +1,6 @@
import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material";
import { Inject, Component } from "@angular/core";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
@Component({
selector: "dialog-save-session",
@@ -15,7 +15,7 @@ export class DialogSaveSessionComponent {
constructor(
public dialogRef: MatDialogRef<DialogSaveSessionComponent>,
- private intlService: InternationalisationService,
+ private intlService: I18nService,
@Inject(MAT_DIALOG_DATA) public data: any
) {
this.calculators = data.calculators;
diff --git a/src/app/components/fixedvar-results/fixed-results.component.ts b/src/app/components/fixedvar-results/fixed-results.component.ts
index 0b7056b8f..153a5fd4c 100644
--- a/src/app/components/fixedvar-results/fixed-results.component.ts
+++ b/src/app/components/fixedvar-results/fixed-results.component.ts
@@ -3,7 +3,7 @@ import { Component } from "@angular/core";
import { FixedResults } from "../../results/fixed-results";
import { NgParameter } from "../../formulaire/ngparam";
import { CalculatorResults } from "../../results/calculator-results";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
import { ApplicationSetupService } from "../../services/app-setup/app-setup.service";
import { FixedVarResultsComponent } from "./fixedvar-results.component";
import { ResultElement } from "jalhyd";
@@ -36,7 +36,7 @@ export class FixedResultsComponent {
private _fixedResults: FixedResults;
constructor(
- private intlService: InternationalisationService,
+ private intlService: I18nService,
private appSetupService: ApplicationSetupService,
) { }
diff --git a/src/app/components/fixedvar-results/fixedvar-results.component.ts b/src/app/components/fixedvar-results/fixedvar-results.component.ts
index 8ef80d00c..d6dca7a41 100644
--- a/src/app/components/fixedvar-results/fixedvar-results.component.ts
+++ b/src/app/components/fixedvar-results/fixedvar-results.component.ts
@@ -1,6 +1,6 @@
import { Component, ViewChild, DoCheck } from "@angular/core";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
import { LogComponent } from "../../components/log/log.component";
import { FixedResults } from "../../results/fixed-results";
import { VarResults } from "../../results/var-results";
@@ -66,7 +66,7 @@ export class FixedVarResultsComponent implements DoCheck {
private resultsGraphComponent: ResultsGraphComponent;
constructor(
- private intlService: InternationalisationService,
+ private intlService: I18nService,
private appSetupService: ApplicationSetupService,
) { }
diff --git a/src/app/components/fixedvar-results/var-results.component.ts b/src/app/components/fixedvar-results/var-results.component.ts
index a7df06053..e2b651ed2 100644
--- a/src/app/components/fixedvar-results/var-results.component.ts
+++ b/src/app/components/fixedvar-results/var-results.component.ts
@@ -1,6 +1,6 @@
import { Component, Input } from "@angular/core";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
import { VarResults } from "../../results/var-results";
import { ApplicationSetupService } from "../../services/app-setup/app-setup.service";
import { ResultElement } from "jalhyd";
@@ -26,7 +26,7 @@ export class VarResultsComponent {
private _headers: string[];
constructor(
- private intlService: InternationalisationService,
+ private intlService: I18nService,
private appSetupService: ApplicationSetupService,
) { }
diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts
index 98f0759ed..2a383b84c 100644
--- a/src/app/components/generic-calculator/calculator.component.ts
+++ b/src/app/components/generic-calculator/calculator.component.ts
@@ -4,7 +4,7 @@ import { ActivatedRoute } from "@angular/router";
import { Observer } from "jalhyd";
import { FormulaireService } from "../../services/formulaire/formulaire.service";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
import { FieldSet } from "../../formulaire/fieldset";
import { FormulaireDefinition } from "../../formulaire/definition/form-definition";
import { CalculatorResultsComponent } from "../../components/calculator-results/calculator-results.component";
@@ -84,7 +84,7 @@ export class GenericCalculatorComponent extends BaseComponent implements OnInit,
// services
- private intlService: InternationalisationService;
+ private intlService: I18nService;
private formulaireService: FormulaireService;
constructor(
@@ -92,7 +92,7 @@ export class GenericCalculatorComponent extends BaseComponent implements OnInit,
private confirmCloseCalcDialog: MatDialog
) {
super();
- this.intlService = ServiceFactory.instance.internationalisationService;
+ this.intlService = ServiceFactory.instance.i18nService;
this.formulaireService = ServiceFactory.instance.formulaireService;
}
@@ -264,7 +264,7 @@ export class GenericCalculatorComponent extends BaseComponent implements OnInit,
// interface Observer
update(sender: any, data: any): void {
- if (sender instanceof InternationalisationService) {
+ if (sender instanceof I18nService) {
this.formulaireService.updateLocalisation();
} else if (sender instanceof FormulaireService) {
switch (data["action"]) {
diff --git a/src/app/components/log-entry/log-entry.component.ts b/src/app/components/log-entry/log-entry.component.ts
index 3b5385877..1e7fa254a 100644
--- a/src/app/components/log-entry/log-entry.component.ts
+++ b/src/app/components/log-entry/log-entry.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnChanges } from "@angular/core";
import { Message, MessageSeverity } from "jalhyd";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
import { ApplicationSetupService } from "../../services/app-setup/app-setup.service";
@Component({
@@ -28,7 +28,7 @@ export class LogEntryComponent implements OnChanges {
private _text: string;
constructor(
- private intlService: InternationalisationService,
+ private intlService: I18nService,
private appSetupService: ApplicationSetupService
) { }
diff --git a/src/app/components/log/log.component.ts b/src/app/components/log/log.component.ts
index 67234e62f..83eb05fe0 100644
--- a/src/app/components/log/log.component.ts
+++ b/src/app/components/log/log.component.ts
@@ -2,7 +2,7 @@ import { Component } from "@angular/core";
import { cLog, Message } from "jalhyd";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
@Component({
selector: "log",
@@ -35,7 +35,7 @@ export class LogComponent {
private _log: cLog;
constructor(
- private intlService: InternationalisationService,
+ private intlService: I18nService,
) { }
private get uitextTitreJournal() {
diff --git a/src/app/components/ngparam-input/ngparam-input.component.ts b/src/app/components/ngparam-input/ngparam-input.component.ts
index 44ba1ed15..11d004d75 100644
--- a/src/app/components/ngparam-input/ngparam-input.component.ts
+++ b/src/app/components/ngparam-input/ngparam-input.component.ts
@@ -4,7 +4,7 @@ import { Component, ChangeDetectorRef, OnDestroy } from "@angular/core";
import { isNumeric, Message, Observer } from "jalhyd";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
import { NgParameter } from "../../formulaire/ngparam";
import { GenericInputComponent } from "../generic-input/generic-input.component";
@@ -26,7 +26,7 @@ export class NgParamInputComponent extends GenericInputComponent implements Obse
*/
private _tmp: number;
- constructor(private intlService: InternationalisationService, cdRef: ChangeDetectorRef) {
+ constructor(private intlService: I18nService, cdRef: ChangeDetectorRef) {
super(cdRef);
}
diff --git a/src/app/components/param-field-line/param-field-line.component.ts b/src/app/components/param-field-line/param-field-line.component.ts
index 6282e176e..d9d1a49cf 100644
--- a/src/app/components/param-field-line/param-field-line.component.ts
+++ b/src/app/components/param-field-line/param-field-line.component.ts
@@ -1,6 +1,6 @@
import { Component, ViewChild, Input, Output, EventEmitter, OnChanges } from "@angular/core";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
import { NgParameter, ParamRadioConfig } from "../../formulaire/ngparam";
import { NgParamInputComponent } from "../ngparam-input/ngparam-input.component";
import { ServiceFactory } from "../../services/service-factory";
@@ -31,7 +31,7 @@ import { ParamLinkComponent } from "../param-link/param-link.component";
export class ParamFieldLineComponent implements OnChanges {
constructor() {
- this.intlService = ServiceFactory.instance.internationalisationService;
+ this.intlService = ServiceFactory.instance.i18nService;
this._formService = ServiceFactory.instance.formulaireService;
this.valid = new EventEmitter();
this.inputChange = new EventEmitter();
@@ -222,7 +222,7 @@ export class ParamFieldLineComponent implements OnChanges {
*/
private _isRangeValid = true;
- private intlService: InternationalisationService;
+ private intlService: I18nService;
private _formService: FormulaireService;
diff --git a/src/app/components/param-values/ngparam-max.component.ts b/src/app/components/param-values/ngparam-max.component.ts
index de13b6e24..9a261c0de 100644
--- a/src/app/components/param-values/ngparam-max.component.ts
+++ b/src/app/components/param-values/ngparam-max.component.ts
@@ -3,7 +3,7 @@ import { Component, Input, ChangeDetectorRef } from "@angular/core";
import { isNumeric } from "jalhyd";
import { GenericInputComponent } from "../generic-input/generic-input.component";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
import { NgParameter } from "../../formulaire/ngparam";
@Component({
@@ -11,7 +11,7 @@ import { NgParameter } from "../../formulaire/ngparam";
templateUrl: "../generic-input/generic-input.component.html"
})
export class NgParamMaxComponent extends GenericInputComponent {
- constructor(private intlService: InternationalisationService, cdRef: ChangeDetectorRef) {
+ constructor(private intlService: I18nService, cdRef: ChangeDetectorRef) {
super(cdRef);
}
diff --git a/src/app/components/param-values/ngparam-min.component.ts b/src/app/components/param-values/ngparam-min.component.ts
index 89e119f03..ee3186e2f 100644
--- a/src/app/components/param-values/ngparam-min.component.ts
+++ b/src/app/components/param-values/ngparam-min.component.ts
@@ -3,7 +3,7 @@ import { Component, Input, ChangeDetectorRef } from "@angular/core";
import { isNumeric } from "jalhyd";
import { GenericInputComponent } from "../generic-input/generic-input.component";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
import { NgParameter } from "../../formulaire/ngparam";
@Component({
@@ -11,7 +11,7 @@ import { NgParameter } from "../../formulaire/ngparam";
templateUrl: "../generic-input/generic-input.component.html"
})
export class NgParamMinComponent extends GenericInputComponent {
- constructor(private intlService: InternationalisationService, cdRef: ChangeDetectorRef) {
+ constructor(private intlService: I18nService, cdRef: ChangeDetectorRef) {
super(cdRef);
}
diff --git a/src/app/components/param-values/ngparam-step.component.ts b/src/app/components/param-values/ngparam-step.component.ts
index bbddcebf2..28f203c29 100644
--- a/src/app/components/param-values/ngparam-step.component.ts
+++ b/src/app/components/param-values/ngparam-step.component.ts
@@ -3,7 +3,7 @@ import { Component, Input, ChangeDetectorRef } from "@angular/core";
import { isNumeric } from "jalhyd";
import { GenericInputComponent } from "../generic-input/generic-input.component";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
import { NgParameter } from "../../formulaire/ngparam";
@Component({
@@ -11,7 +11,7 @@ import { NgParameter } from "../../formulaire/ngparam";
templateUrl: "../generic-input/generic-input.component.html"
})
export class NgParamStepComponent extends GenericInputComponent {
- constructor(private intlService: InternationalisationService, cdRef: ChangeDetectorRef) {
+ constructor(private intlService: I18nService, cdRef: ChangeDetectorRef) {
super(cdRef);
}
diff --git a/src/app/components/param-values/param-values.component.ts b/src/app/components/param-values/param-values.component.ts
index ef8c20a92..d7f2b4b57 100644
--- a/src/app/components/param-values/param-values.component.ts
+++ b/src/app/components/param-values/param-values.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, Output, EventEmitter, ViewChild, AfterViewChecked, On
import { ParamValueMode } from "jalhyd";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
import { NgParameter } from "../../formulaire/ngparam";
import { NgParamMinComponent } from "./ngparam-min.component";
import { NgParamMaxComponent } from "./ngparam-max.component";
@@ -98,7 +98,7 @@ export class ParamValuesComponent extends BaseComponent implements AfterViewChec
@Output()
private valid: EventEmitter<boolean>;
- constructor(private intlService: InternationalisationService) {
+ constructor(private intlService: I18nService) {
super();
this._valueModes.push({ "value": ParamValueMode.MINMAX, "label": "Min/max" });
this._valueModes.push({ "value": ParamValueMode.LISTE, "label": "Liste" });
diff --git a/src/app/components/param-values/value-list.component.ts b/src/app/components/param-values/value-list.component.ts
index 542e770b6..2f692e5b9 100644
--- a/src/app/components/param-values/value-list.component.ts
+++ b/src/app/components/param-values/value-list.component.ts
@@ -1,7 +1,7 @@
import { Component, Input, ChangeDetectorRef } from "@angular/core";
import { GenericInputComponent } from "../generic-input/generic-input.component";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
import { NgParameter } from "../../formulaire/ngparam";
import { Message } from "jalhyd";
@@ -10,7 +10,7 @@ import { Message } from "jalhyd";
templateUrl: "../generic-input/generic-input.component.html"
})
export class ValueListComponent extends GenericInputComponent {
- constructor(private intlService: InternationalisationService, cdRef: ChangeDetectorRef) {
+ constructor(private intlService: I18nService, cdRef: ChangeDetectorRef) {
super(cdRef);
}
diff --git a/src/app/components/remous-results/remous-results.component.ts b/src/app/components/remous-results/remous-results.component.ts
index 3d47a7708..21d0cab67 100644
--- a/src/app/components/remous-results/remous-results.component.ts
+++ b/src/app/components/remous-results/remous-results.component.ts
@@ -2,7 +2,7 @@ import { Component, ViewChild, DoCheck } from "@angular/core";
import { ArrayReverseIterator, ResultElement, INumberIterator } from "jalhyd";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
import { LogComponent } from "../../components/log/log.component";
import { RemousResults } from "../../results/remous-results";
import { CalculatorResults } from "../../results/calculator-results";
@@ -248,7 +248,7 @@ export class RemousResultsComponent implements DoCheck {
@ViewChild(LogComponent)
private logComponent: LogComponent;
- constructor(private intlService: InternationalisationService) {
+ constructor(private intlService: I18nService) {
}
private get uitextLigneFluviale() {
diff --git a/src/app/components/result-element/result-element-base.component.ts b/src/app/components/result-element/result-element-base.component.ts
index d30921bbe..7e6eecb30 100644
--- a/src/app/components/result-element/result-element-base.component.ts
+++ b/src/app/components/result-element/result-element-base.component.ts
@@ -3,7 +3,7 @@ import { Component, Input } from "@angular/core";
import { ResultElement } from "jalhyd";
import { ApplicationSetupService } from "../../services/app-setup/app-setup.service";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
import { OnChanges } from "@angular/core/src/metadata/lifecycle_hooks";
import { ServiceFactory } from "../../services/service-factory";
@@ -53,12 +53,12 @@ export class ResultElementBaseComponent implements OnChanges {
protected appSetupService: ApplicationSetupService;
- protected intlService: InternationalisationService;
+ protected intlService: I18nService;
constructor(
) {
this.appSetupService = ServiceFactory.instance.applicationSetupService;
- this.intlService = ServiceFactory.instance.internationalisationService;
+ this.intlService = ServiceFactory.instance.i18nService;
}
/**
diff --git a/src/app/components/section-results/section-results.component.ts b/src/app/components/section-results/section-results.component.ts
index ae3598d0f..83ad69517 100644
--- a/src/app/components/section-results/section-results.component.ts
+++ b/src/app/components/section-results/section-results.component.ts
@@ -6,7 +6,7 @@ import { SectionCanvasComponent } from "../section-canvas/section-canvas.compone
import { SectionResults } from "../../results/section-results";
import { ApplicationSetupService } from "../../services/app-setup/app-setup.service";
import { CalculatorResults } from "../../results/calculator-results";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
@Component({
selector: "section-results",
@@ -33,7 +33,7 @@ import { InternationalisationService } from "../../services/internationalisation
})
export class SectionResultsComponent implements DoCheck {
- constructor(private appSetupService: ApplicationSetupService, private intlService: InternationalisationService) { }
+ constructor(private appSetupService: ApplicationSetupService, private intlService: I18nService) { }
public set results(rs: CalculatorResults[]) {
this._resultElement = undefined;
diff --git a/src/app/formulaire/definition/concrete/form-section-parametree.ts b/src/app/formulaire/definition/concrete/form-section-parametree.ts
index 5b2e2bd2d..e5d22bcf9 100644
--- a/src/app/formulaire/definition/concrete/form-section-parametree.ts
+++ b/src/app/formulaire/definition/concrete/form-section-parametree.ts
@@ -6,7 +6,7 @@ import { NgParameter } from "../../ngparam";
import { InputField } from "../../input-field";
import { FormComputeSectionParametree } from "../form-compute-section-parametree";
import { FormulaireDefinition } from "../form-definition";
-import { InternationalisationService } from "../../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../../services/internationalisation/internationalisation.service";
import { CalculatorResults } from "../../../results/calculator-results";
import { FormDefFixedVar } from "../form-def-fixedvar";
import { FieldSet } from "../../fieldset";
diff --git a/src/app/formulaire/formulaire-element.ts b/src/app/formulaire/formulaire-element.ts
index 306b9bc63..0b55e21b8 100644
--- a/src/app/formulaire/formulaire-element.ts
+++ b/src/app/formulaire/formulaire-element.ts
@@ -5,7 +5,7 @@ import { DependencyCondition, DependencyConditionType } from "./dependency/depen
import { ValueDependencyCondition } from "./dependency/value-dependency-condition";
import { ExistenceDependency } from "./dependency/existence-dependency";
import { DeepFormulaireElementIterator } from "./form-iterator/deep-element-iterator";
-import { InternationalisationService } from "../services/internationalisation/internationalisation.service";
+import { I18nService } from "../services/internationalisation/internationalisation.service";
import { ServiceFactory } from "../services/service-factory";
/**
@@ -27,7 +27,7 @@ export abstract class FormulaireElement extends FormulaireNode {
*/
private _labelNumber: number;
- private intlService: InternationalisationService;
+ private intlService: I18nService;
protected _dependencies: Dependency[] = [];
@@ -42,7 +42,7 @@ export abstract class FormulaireElement extends FormulaireNode {
constructor(parent: FormulaireNode) {
super(parent);
this._isDisplayed = true;
- this.intlService = ServiceFactory.instance.internationalisationService;
+ this.intlService = ServiceFactory.instance.i18nService;
}
get isDisplayed(): boolean {
diff --git a/src/app/results/var-results.ts b/src/app/results/var-results.ts
index 4776f5d88..657dd44f6 100644
--- a/src/app/results/var-results.ts
+++ b/src/app/results/var-results.ts
@@ -140,7 +140,7 @@ export class VarResults extends CalculatedParamResults {
// entêtes des résultats supplémentaires
- const intlService = ServiceFactory.instance.internationalisationService;
+ const intlService = ServiceFactory.instance.i18nService;
for (const k of this._extraResultKeys) {
this._extraResultHeaders.push(intlService.getExtraResLabel(k));
}
diff --git a/src/app/services/formulaire/formulaire.service.ts b/src/app/services/formulaire/formulaire.service.ts
index 8fafb0635..36d8e7798 100644
--- a/src/app/services/formulaire/formulaire.service.ts
+++ b/src/app/services/formulaire/formulaire.service.ts
@@ -7,7 +7,7 @@ import { saveAs } from "file-saver";
import { CalculatorType, EnumEx, Observable, ParamDefinition } from "jalhyd";
import { HttpService } from "../../services/http/http.service";
-import { InternationalisationService } from "../../services/internationalisation/internationalisation.service";
+import { I18nService } from "../../services/internationalisation/internationalisation.service";
import { FormulaireDefinition } from "../../formulaire/definition/form-definition";
import { FormulaireElement } from "../../formulaire/formulaire-element";
import { InputField } from "../../formulaire/input-field";
@@ -29,15 +29,15 @@ export class FormulaireService extends Observable {
private _currentFormId: string = null;
constructor(
- private internationalisationService: InternationalisationService,
+ private i18nService: I18nService,
private httpService: HttpService) {
super();
this._formulaires = [];
}
- private get _intlService(): InternationalisationService {
- return this.internationalisationService;
+ private get _intlService(): I18nService {
+ return this.i18nService;
}
private get _httpService(): HttpService {
diff --git a/src/app/services/internationalisation/internationalisation.service.ts b/src/app/services/internationalisation/internationalisation.service.ts
index ebb9df3a1..88bdc9fae 100644
--- a/src/app/services/internationalisation/internationalisation.service.ts
+++ b/src/app/services/internationalisation/internationalisation.service.ts
@@ -43,7 +43,7 @@ export class Language {
}
@Injectable()
-export class InternationalisationService extends Observable {
+export class I18nService extends Observable {
private _currLang: Language;
private _Messages: StringMap;
@@ -108,7 +108,7 @@ export class InternationalisationService extends Observable {
this._Messages = undefined;
const prom = this.httpGetMessages();
- const is: InternationalisationService = this;
+ const is: I18nService = this;
prom.then((res) => {
is.notifyObservers(undefined);
});
@@ -116,7 +116,7 @@ export class InternationalisationService extends Observable {
}
private httpGetMessages(): Promise<void> {
- const is: InternationalisationService = this;
+ const is: I18nService = this;
const processData = function (s: string) {
// fermeture nécessaire pour capturer la valeur de this (undefined sinon)
is._Messages = JSON.parse(s);
diff --git a/src/app/services/param/param.service.ts b/src/app/services/param/param.service.ts
index be0abf19e..d8d36ce02 100644
--- a/src/app/services/param/param.service.ts
+++ b/src/app/services/param/param.service.ts
@@ -2,7 +2,7 @@ import { ParamDomain, ParamDefinition, ParamDomainValue, ParamCalculability, Ses
import { NgParameter } from "../../formulaire/ngparam";
import { Injectable } from "@angular/core";
-import { InternationalisationService } from "../internationalisation/internationalisation.service";
+import { I18nService } from "../internationalisation/internationalisation.service";
import { ApplicationSetupService } from "../app-setup/app-setup.service";
import { FormulaireNode } from "../../formulaire/formulaire-node";
@@ -10,12 +10,12 @@ import { FormulaireNode } from "../../formulaire/formulaire-node";
export class ParamService {
constructor(
- private internationalisationService: InternationalisationService,
+ private i18nService: I18nService,
private applicationSetupService: ApplicationSetupService
) { }
- private get _intlService(): InternationalisationService {
- return this.internationalisationService;
+ private get _intlService(): I18nService {
+ return this.i18nService;
}
private get _appSetupService(): ApplicationSetupService {
diff --git a/src/app/services/service-factory.ts b/src/app/services/service-factory.ts
index 682cc5c08..0e84febab 100644
--- a/src/app/services/service-factory.ts
+++ b/src/app/services/service-factory.ts
@@ -1,7 +1,7 @@
import { ApplicationSetupService } from "./app-setup/app-setup.service";
import { ParamService } from "./param/param.service";
import { FormulaireService } from "./formulaire/formulaire.service";
-import { InternationalisationService } from "./internationalisation/internationalisation.service";
+import { I18nService } from "./internationalisation/internationalisation.service";
import { HttpService } from "./http/http.service";
export class ServiceFactory {
@@ -15,7 +15,7 @@ export class ServiceFactory {
public formulaireService: FormulaireService;
- public internationalisationService: InternationalisationService;
+ public i18nService: I18nService;
public httpService: HttpService;
--
GitLab