Merge branch 'develop' of ssh://ognproject.evlt.uma.es:21987/opengnsys/oggui into develop

ogWebconsole/angular.json

@@ -24,7 +24,7 @@
           "builder": "@ngx-env/builder:application",
           "options": {
             "baseHref": "/oggui/",
-            "localize": true,
+            "localize": false,
             "aot": true,
             "outputPath": "dist/og-webconsole",
             "index": "src/index.html",
@@ -73,16 +73,6 @@
               "optimization": false,
               "extractLicenses": false,
               "sourceMap": false
-            },
-            "es": {
-              "localize": [
-                "es-ES"
-              ]
-            },
-            "en": {
-              "localize": [
-                "en-US"
-              ]
             }
           },
           "defaultConfiguration": "production"
@@ -101,12 +91,6 @@
             },
             "development": {
               "buildTarget": "ogWebconsole:build:development"
-            },
-            "es": {
-              "buildTarget": "ogWebconsole:build:es"
-            },
-            "en": {
-              "buildTarget": "ogWebconsole:build:en"
             }
           },
           "defaultConfiguration": "development"
@@ -116,8 +100,7 @@
           "options": {
             "polyfills": [
               "zone.js",
-              "zone.js/testing",
+              "zone.js/testing"
-              "@angular/localize/init"
             ],
             "tsConfig": "tsconfig.spec.json",
             "assets": [

ogWebconsole/src/app/app.module.ts

@@ -1,4 +1,4 @@
-import { NgModule, CUSTOM_ELEMENTS_SCHEMA, APP_INITIALIZER } from '@angular/core';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA, LOCALE_ID, APP_INITIALIZER } from '@angular/core';
 import { ConfigService } from './services/config.service';
 import { BrowserModule } from '@angular/platform-browser';
 import { AppRoutingModule } from './app-routing.module';
@@ -131,6 +131,9 @@ import { ShowClientsComponent } from './components/ogdhcp/show-clients/show-clie
 import { OperationResultDialogComponent } from './components/ogdhcp/operation-result-dialog/operation-result-dialog.component';
 import { ManageClientComponent } from './components/groups/shared/clients/manage-client/manage-client.component';
 import { ConvertImageComponent } from './components/repositories/convert-image/convert-image.component';
+import { registerLocaleData } from '@angular/common';
+import localeEs from '@angular/common/locales/es';
+
 export function HttpLoaderFactory(http: HttpClient) {
   return new TranslateHttpLoader(http, './locale/', '.json');
 }
@@ -139,6 +142,8 @@ export function initializeApp(configService: ConfigService) {
   return () => configService.loadConfig();
 }
 
+registerLocaleData(localeEs, 'es-ES');
+
 @NgModule({
   declarations: [
     AppComponent,
@@ -280,6 +285,7 @@ export function initializeApp(configService: ConfigService) {
       useClass: CustomInterceptor,
       multi: true
     },
+    { provide: LOCALE_ID, useValue: 'es-ES' },
     provideAnimationsAsync(),
     provideHttpClient(withInterceptorsFromDi()),
     ConfigService,

ogWebconsole/src/app/components/software/software.component.html

@@ -4,7 +4,7 @@
   </button>
   <div class="header-container-title">
     <h2 i18n="@@adminImagesTitle" joyrideStep="titleStep"
-      text="Administra el software deisponible desde este componente.">Administrar Software</h2>
+      text="Administra el software deisponible desde este componente.">{{ 'manageSoftware' | translate }}</h2>
   </div>
   <div class="calendar-button-row">
     <button class="action-button" (click)="addSoftware()" joyrideStep="addSoftwareStep"

ogWebconsole/src/app/layout/header/header.component.html

@@ -9,35 +9,36 @@
   </button>
 
   <div class="navbar-actions-row">
-    <button class="trace-button" routerLink="/commands-logs" mat-button><mat-icon>notifications</mat-icon></button>
+    <button class="trace-button" routerLink="/commands-logs" mat-button
+      i18n="@@admin"><mat-icon>notifications</mat-icon></button>
 
     <div class="navbar-buttons-row">
-      <button class="ordinary-button" *ngIf="isSuperAdmin" [matMenuTriggerFor]="menu"
+      <button class="ordinary-button" *ngIf="isSuperAdmin" [matMenuTriggerFor]="menu" i18n="@@admin"
         matTooltip="Gestión de usuarios y roles de la aplicación" matTooltipShowDelay="1000">
         {{ 'Administration' | translate }}
       </button>
 
-      <button class="ordinary-button" *ngIf="!isSuperAdmin" (click)="editUser()"
+      <button class="ordinary-button" *ngIf="!isSuperAdmin" (click)="editUser()" i18n="@@editUser"
         matTooltip="Editar tu información de usuario" matTooltipShowDelay="1000">
         {{ 'changePassword' | translate }}
       </button>
 
-      <button class="logout-button" routerLink="/auth/login" matTooltip="Cerrar sesión y salir de la aplicación"
+      <button class="logout-button" routerLink="/auth/login" i18n="@@logout"
-        matTooltipShowDelay="1000">
+        matTooltip="Cerrar sesión y salir de la aplicación" matTooltipShowDelay="1000">
         {{ 'logout' | translate }}
       </button>
     </div>
 
     <mat-menu #menu="matMenu">
-      <button mat-menu-item routerLink="/users" matTooltip="Ver y gestionar todos los usuarios"
+      <button mat-menu-item routerLink="/users" i18n="@@usersMenuItem" matTooltip="Ver y gestionar todos los usuarios"
         matTooltipShowDelay="1000">
         {{ 'labelUsers' | translate }}
       </button>
-      <button mat-menu-item routerLink="/user-groups" matTooltip="Gestionar roles de usuario"
+      <button mat-menu-item routerLink="/user-groups" i18n="@@rolesMenuItem" matTooltip="Gestionar roles de usuario"
         matTooltipShowDelay="1000">
         {{ 'labelRoles' | translate }}
       </button>
-      <button mat-menu-item routerLink="/env-vars" matTooltip="Gestionar variables de entorno"
+      <button mat-menu-item routerLink="/env-vars" i18n="@@rolesMenuItem" matTooltip="Gestionar variables de entorno"
         matTooltipShowDelay="1000">
         {{ 'labelEnvVars' | translate }}
       </button>

ogWebconsole/src/locale/en.json

@@ -424,6 +424,7 @@
   "calendars": "Calendars",
   "TOOLTIP_CALENDARS": "Manage remotePC calendars",
   "software": "Software",
+  "manageSoftware": "Manage Software",
   "TOOLTIP_SOFTWARE": "Manage software configurations",
   "softwareList": "List",
   "TOOLTIP_SOFTWARE_LIST": "View list of available software",

ogWebconsole/src/locale/es.json

@@ -425,6 +425,7 @@
   "calendars": "Calendarios",
   "TOOLTIP_CALENDARS": "Gestionar calendarios de remotePC",
   "software": "Software",
+  "manageSoftware": "Administrar Software",
   "TOOLTIP_SOFTWARE": "Administrar configuraciones de software",
   "softwareList": "Listado",
   "TOOLTIP_SOFTWARE_LIST": "Ver lista de software disponible",

ogWebconsole/src/main.ts

@@ -1,9 +1,5 @@
-/// <reference types="@angular/localize" />
-
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-
 import { AppModule } from './app/app.module';
 
-
 platformBrowserDynamic().bootstrapModule(AppModule)
   .catch(err => console.error(err));

ogWebconsole/tsconfig.app.json

@@ -3,9 +3,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/app",
-    "types": [
+    "types": []
-      "@angular/localize"
-    ]
   },
   "files": [
     "src/main.ts"