Renommage internationalisationService => i18nService

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"]) {

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 ],

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);

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);
     }
 

src/app/components/dialog-confirm-close-calc/dialog-confirm-close-calc.component.ts

 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
     ) { }
 

src/app/components/dialog-confirm-empty-session/dialog-confirm-empty-session.component.ts

 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
     ) { }
 

src/app/components/dialog-load-session/dialog-load-session.component.ts

 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
     ) {

src/app/components/dialog-save-session/dialog-save-session.component.ts

 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;

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,
     ) { }
 

src/app/components/fixedvar-results/fixedvar-results.component.ts

 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,
     ) { }
 

src/app/components/fixedvar-results/var-results.component.ts

 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,
     ) { }
 

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"]) {

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
     ) { }
 

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() {

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);
     }
 

src/app/components/param-field-line/param-field-line.component.ts

 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;
 

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);
     }
 

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);
     }
 

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);
     }
 

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" });