From 0cde34aedb5f63963d060c47fe02d8d5d1edc8c6 Mon Sep 17 00:00:00 2001 From: apuente Date: Mon, 18 Nov 2024 12:37:52 +0100 Subject: [PATCH] refs #1138 Fix translations --- ogWebconsole/src/app/app.component.ts | 3 + .../advanced-search.component.html | 14 - .../client-tab-view.component.html | 142 ++------ ...rganizational-unit-tab-view.component.html | 58 ++-- .../app/components/login/login.component.ts | 4 - ogWebconsole/src/locale/en.json | 317 +++++++++++++++++- ogWebconsole/src/locale/es.json | 148 +------- 7 files changed, 369 insertions(+), 317 deletions(-) diff --git a/ogWebconsole/src/app/app.component.ts b/ogWebconsole/src/app/app.component.ts index 6e2297f..442f02e 100644 --- a/ogWebconsole/src/app/app.component.ts +++ b/ogWebconsole/src/app/app.component.ts @@ -7,4 +7,7 @@ import { Component } from '@angular/core'; }) export class AppComponent { title = 'ogWebconsole'; + ngOnInit() { + localStorage.setItem('language', 'es'); + } } diff --git a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html index 8f61a32..5acd7fe 100644 --- a/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html +++ b/ogWebconsole/src/app/components/groups/components/advanced-search/advanced-search.component.html @@ -1,14 +1,9 @@ -<<<<<<< Updated upstream -

Búsqueda avanzada

- -=======

{{ 'searchTitle' | translate }}

->>>>>>> Stashed changes
@@ -47,14 +42,6 @@ -<<<<<<< Updated upstream - - - - - - -======= @@ -67,7 +54,6 @@ ->>>>>>> Stashed changes
diff --git a/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.html b/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.html index 5dcc14d..d72fe02 100644 --- a/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.html +++ b/ogWebconsole/src/app/components/groups/components/client-tab-view/client-tab-view.component.html @@ -1,145 +1,48 @@ -<<<<<<< Updated upstream -
-

Administrar clientes

-
- - -
-
- -
- - Buscar nombre de cliente - - search - Pulsar 'enter' para buscar - - - Buscar IP - - search - Pulsar 'enter' para buscar - - - Buscar MAC - - search - Pulsar 'enter' para buscar - - - U. Organizativa - - - {{ unit.name }} - - - -=======
-

{{ 'adminImagesTitle' | translate }}

+

{{ 'adminImagesTitle' | translate }}

- - + +
-
+
- {{ 'searchClientNameLabel' | translate }} - + {{ 'searchClientNameLabel' | translate }} + search - {{ 'searchHint' | translate }} + {{ 'searchHint' | translate }} - {{ 'searchIPLabel' | translate }} - + {{ 'searchIPLabel' | translate }} + search - {{ 'searchHint' | translate }} + {{ 'searchHint' | translate }} - {{ 'searchMACLabel' | translate }} - + {{ 'searchMACLabel' | translate }} + search - {{ 'searchHint' | translate }} + {{ 'searchHint' | translate }} - - {{ 'organizationalUnitLabel' | translate }} + + {{ 'organizationalUnitLabel' | translate }} - + {{ unit.name }}
-
- -
- -
- - - - - - - - - - - - - -
{{ column.header | translate }} - -
-
{{ client.name }}
-
{{ client.ip }}
-
{{ client.mac }}
-
-
- - {{ client.status | translate }} - - - {{ column.cell(client) }} - -
{{ 'columnActions' | translate }} - - - - - -
- -
- - ->>>>>>> Stashed changes -
-
@@ -157,7 +60,16 @@
- {{ client.status }} + + {{ client.status }} + {{ column.cell(client) }} @@ -166,7 +78,7 @@ - Acciones + {{ 'columnActions' | translate }} diff --git a/ogWebconsole/src/app/components/groups/components/organizational-unit-tab-view/organizational-unit-tab-view.component.html b/ogWebconsole/src/app/components/groups/components/organizational-unit-tab-view/organizational-unit-tab-view.component.html index 3cdb4f3..fdd0609 100644 --- a/ogWebconsole/src/app/components/groups/components/organizational-unit-tab-view/organizational-unit-tab-view.component.html +++ b/ogWebconsole/src/app/components/groups/components/organizational-unit-tab-view/organizational-unit-tab-view.component.html @@ -2,25 +2,26 @@ -

{{ 'adminOuTitle' | translate }}

+

{{ 'resetFiltersButton' | translate }}

- - + +
-
+ +
- {{ 'searchLabelOu' | translate }} - + {{ 'searchLabelOu' | translate }} + search - {{ 'searchHint' | translate }} + {{ 'searchHint' | translate }} - {{ 'typeLabel' | translate }} - + {{ 'typeLabel' | translate }} + {{ 'allOption' | translate }} {{ 'centerOption' | translate }} {{ 'classroomsGroupOption' | translate }} @@ -30,56 +31,38 @@
- +
- + -<<<<<<< Updated upstream - + - @@ -88,11 +71,8 @@
{{ column.header | translate }} {{ column.header }} {{ column.cell(ou) }} - - event_available - - - event_busy - + event_available + event_busy - {{ ou.type | translate }} + {{ ou.type }} Acciones{{ 'columnActions' | translate }} -======= - {{ 'columnActions' | translate }} - - - ->>>>>>> Stashed changes
-<<<<<<< Updated upstream -======= ->>>>>>> Stashed changes -
+