Merge pull request #8 from silicia-apps/draft/serene-tamas

Update 8 files
silicia-apps · Oct 19, 2023 · 3870b0b · 3870b0b
2 parents 5305fea + e44a455
commit 3870b0b
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 15 deletions.
diff --git a/apps/demo/src/assets/i18n/it.json b/apps/demo/src/assets/i18n/it.json
@@ -1,5 +1,6 @@
 {
     "M_HOME": "Home",
     "M_ABOUT": "Info",
-    "M_SETTINGS": "Opzioni"
+    "M_SETTINGS": "Opzioni",
+    "L_LANGUAGE": "test"
 }
diff --git a/libs/core/src/i18n/en.ts b/libs/core/src/i18n/en.ts
@@ -0,0 +1,3 @@
+export const en = {
+    'L_LANGUAGE' : 'Language'
+}
diff --git a/libs/core/src/i18n/it.ts b/libs/core/src/i18n/it.ts
@@ -0,0 +1,3 @@
+export const it = {
+    'L_LANGUAGE' : 'Lingua'
+}
diff --git a/libs/core/src/lib/components/app/app.component.ts b/libs/core/src/lib/components/app/app.component.ts
@@ -1,6 +1,9 @@
 import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { SioCoreAppComponentState } from './store/app.state';
 
+import { it } from '../../../i18n/it';
+import { en } from '../../../i18n/en';
+
 //import { E_SIDEMENU } from '../menu/menu.enum';
 import { Select } from '@ngxs/store';
 import { Observable, Subject } from 'rxjs';
@@ -56,7 +59,7 @@ export class SioCoreAppComponent implements OnInit, OnDestroy {
   ionRouterOutlet!: IonRouterOutlet;
 
   public position: 'side' | 'bottom' | 'top' = 'bottom';
-
+ 
   constructor(
     public sioCoreAppComponentState: SioCoreAppComponentState,
     private platform: Platform,
@@ -70,6 +73,8 @@ export class SioCoreAppComponent implements OnInit, OnDestroy {
     this.sioCoreAppComponentState.LoadConfig(
       this.sioCoreEnvironmentService.config.app
     ); } else this.sioCoreLoggerService.warn('[sioCoreAppComponent][Constructor] No config in environment file');
+    this.translateService.setTranslation('it', it, true);
+    this.translateService.setTranslation('en', en, true);
   }
 
   //@Select(SioCoreAppComponentState.split)
@@ -79,7 +84,12 @@ export class SioCoreAppComponent implements OnInit, OnDestroy {
     (async () => {
       this.sioCoreLoggerService.info('await for platform avaible...');
       let platform = await this.platform.ready();
-      this.translateService.addLangs(this.sioCoreEnvironmentService.config.app.language.avaibles);
+
+      this.translateService.setTranslation('it', it, true);
+      this.translateService.setTranslation('en', en, true);
+
+      //this.translateService.addLangs(this.sioCoreEnvironmentService.config.app.language.avaibles);
+      this.translateService.use(this.sioCoreEnvironmentService.config.app.language.default);
       this.sioCoreLoggerService.info('Check platform...');
       switch (platform) {
         case 'dom':

diff --git a/libs/core/src/lib/components/app/app.interface.ts b/libs/core/src/lib/components/app/app.interface.ts
@@ -18,3 +18,4 @@ export interface SioCoreAppCompomentInterface {
       }
     | undefined;
 }
+
diff --git a/libs/core/src/lib/components/language-selector/language-selector.component.html b/libs/core/src/lib/components/language-selector/language-selector.component.html
@@ -1,6 +1,7 @@
 <ion-item>
-    <ion-select [label]="this.label" (ionChange)="this.onChange($event)">
+    <ion-select label="{{ this.label | translate }}" (ionChange)="this.onChange($event)">
       <ion-select-option value="it">Italiano</ion-select-option>
       <ion-select-option value="en">Inglese</ion-select-option>
     </ion-select>
-  </ion-item>
+  </ion-item>
+  {{ this.label | translate }}
diff --git a/libs/core/src/lib/modules/common.module.ts b/libs/core/src/lib/modules/common.module.ts
@@ -17,6 +17,7 @@ import { NgxsFormPluginModule } from '@ngxs/form-plugin';
 import { SioCoreComponents } from '../components';
 import { HttpClientModule } from '@angular/common/http';
 import { RouterModule } from '@angular/router';
+import { createTranslateLoader } from './core.module';
 
 export function create2TranslateLoader(http: HttpClient) {
   console.log('pippo load');
@@ -33,7 +34,16 @@ export function create2TranslateLoader(http: HttpClient) {
     RouterModule,
     ReactiveFormsModule,
     IonicModule,
-    TranslateModule,
+    TranslateModule.forChild(
+      {
+        'extend' : true,
+        'loader': {
+          'provide': TranslateLoader,
+          'useFactory': createTranslateLoader, 
+          'deps': [HttpClient],
+        },
+      } 
+    ),
     NgxsFormPluginModule,
   ],
   exports: [...SioCoreComponents, IonicModule, TranslateModule ],

diff --git a/libs/core/src/lib/modules/core.module.ts b/libs/core/src/lib/modules/core.module.ts
@@ -49,15 +49,7 @@ export function createTranslateLoader(http: HttpClient) {
   imports: [
     CommonModule,
     HttpClientModule,
-    TranslateModule.forRoot({
-      'defaultLanguage': 'it',
-      'loader': {
-        'provide': TranslateLoader,
-        'useFactory': createTranslateLoader, 
-        'deps': [HttpClient],
-      },
-      'parser': { provide: TranslateParser, useClass: NgxTranslateDebugParser },
-    }),
+    TranslateModule.forRoot(),
     LoggerModule.forRoot(),
     FormsModule,
     ReactiveFormsModule,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@ export interface SioCoreAppCompomentInterface {
		}
		\| undefined;
		}