working on i18n grids

0c44a752 · Sebastián Collado Montañez · 51daa8f1 · 0c44a752 · 0c44a752 · 0c44a752
Commit 0c44a752 authored Nov 20, 2017 by Sebastián Collado Montañez
Showing with 46 additions and 34 deletions
sails/src/assets/app/i18n/en-gb.json
sails/src/assets/app/i18n/es-es.json
sails/src/assets/scripts/modules/student/views/collections.html
sails/src/assets/scripts/modules/student/views/gridconfig.html
--- a/sails/src/assets/app/i18n/en-gb.json
+++ b/sails/src/assets/app/i18n/en-gb.json
@@ -51,6 +51,8 @@
    "average_time_per_try": "Average time per try",
    "back": "Back",
    "background": "Background",
+    "background_color": "Background color",
+    "background_color_picto": "Background color for selected picto",
    "back_to_login": "Back to login",
    "beep": "Beep",
    "birthdate": "Birthdate",
@@ -79,6 +81,7 @@
    "close": "Close",
    "close_session": "Close session",
    "collections": "Collections",
+    "color_delete": "Delete color",
    "confirmation": "Are you sure?",
    "confirm_unlink_therapist": "Unlik {{ name }} from {{ student }} as therapist?",
    "confirm_unlink_tutor": "Unlik {{ name }} from {{ student }} as tutor?",
@@ -166,6 +169,17 @@
    "generate": "Generate",
    "generate_serial": "Generate serial number",
    "global":"Global",
+    "grid_active": "Active grid",
+    "grid_activate": "Activate grid",
+    "grid_added": "Grid data has been saved",
+    "grid_already_activated": "Grid already activated",
+    "grid_already_deleted": "Grid was already deleted",
+    "grid_create":"Create new grid",
+    "grid_deleted": "Grid has been deleted",
+    "grid_duplicated": "Grid has been copied",
+    "grid_inactive": "Inactive grid",
+    "grid_options": "Grid options",
+    "grid_updated": "Grid data updated",
    "hide": "Hide",
    "highlight": "highlight",
    "highlighted": "Highlighted",
@@ -355,20 +369,11 @@
    "reports": "Reports",
    "request_change_password": "Request change password",
    "resume": "Resume",
+    "return_to": "Return to",
    "role": "Role",
    "room_changed": "A partner is offline. Session paused.",
    "save": "Save",
    "save_as_template": "Save as template",
-    "grid_active": "Active grid",
-    "grid_activate": "Activate grid",
-    "grid_added": "Grid data has been saved",
-    "grid_already_activated": "Grid already activated",
-    "grid_already_deleted": "Grid was already deleted",
-    "grid_create":"Create new grid",
-    "grid_deleted": "Grid has been deleted",
-    "grid_duplicated": "Grid has been copied",
-    "grid_inactive": "Inactive grid",
-    "grid_updated": "Grid data updated",
    "search": "Search",
    "search_sup_email": "Search supervisor by email",
    "search_tutor_email": "Search tutor by email",
@@ -397,6 +402,7 @@
    "sexo": "Sex",
    "show": "Show",
    "show_all": "Show all",
+    "show_grids": "Show grids",
    "show_less": "Show less details",
    "size": "Size",
    "small": "Small",

--- a/sails/src/assets/app/i18n/es-es.json
+++ b/sails/src/assets/app/i18n/es-es.json
@@ -51,6 +51,8 @@
    "average_time_per_try": "Tiempo medio por intento",
    "back": "Volver",
    "background": "Fondo",
+    "background_color": "Color de fondo",
+    "background_color_picto": "Color de fondo para el pictograma seleccionado",
    "back_to_login": "Volver a inicio de sesión",
    "beep": "Pitido",
    "birthdate": "Fecha de nacimiento",
@@ -79,6 +81,7 @@
    "close": "Cerrar",
    "close_session": "Cerrar sesion",
    "collections": "Colecciones",
+    "color_delete": "Eliminar color",
    "confirmation": "¿Estás seguro?",
    "confirm_unlink_student": "¿Desligar {{ name }} de {{ student }}?",
    "contact_person": "Persona de contacto",
@@ -164,7 +167,18 @@
    "general_labels": "Generales",
    "generate": "Generar",
    "generate_serial": "Generar número de serie",
-    "global":"Global",
+    "global": "Global",
+    "grid_active": "Tablero activo",
+    "grid_activate": "Activar tablero",
+    "grid_added": "Tablero creado correctamente",
+    "grid_already_activated": "Tablero ya activado",
+    "grid_already_deleted": "El tablero ya se había eliminado",
+    "grid_create":"Crear nuevo tablero",
+    "grid_deleted": "Tablero eliminado",
+    "grid_duplicated": "Tablero duplicado",
+    "grid_inactive": "Tablero inactivo",
+    "grid_options": "Opciones del tablero",
+    "grid_updated": "Datos del tablero actualizados",
    "hide": "Ocultar",
    "highlight": "Resaltar",
    "highlighted": "Resaltado",
@@ -353,20 +367,11 @@
    "reports": "Informes",
    "request_change_password": "Solicitar cambio de contraseña",
    "resume": "Continuar",
+    "return_to": "Volver a",
    "role": "Rol",
    "room_changed":"Un participante abandonó la sesión. Sesión en pausa.",
    "save": "Guardar",
    "save_as_template": "Guardar como plantilla",
-    "grid_active": "Escena activa",
-    "grid_activate": "Activar escena",
-    "grid_added": "Escena creada correctamente",
-    "grid_already_activated": "Escena ya activada",
-    "grid_already_deleted": "La escena ya se había eliminado",
-    "grid_create":"Crear nueva escena",
-    "grid_deleted": "Escena eliminada",
-    "grid_duplicated": "Escena duplicada",
-    "grid_inactive": "Escena inactiva",
-    "grid_updated": "Datos de la escena actualizados",
    "search": "Buscar",
    "search_sup_email": "Buscar supervisor por email",
    "search_tutor_email": "Buscar tutor por email",
@@ -395,6 +400,7 @@
    "sexo": "Sexo",
    "show": "Mostrar",
    "show_all": "Ver todo",
+    "show_grids": "Ver tableros",
    "show_less": "Ver menos detalles",
    "size": "Tamaño",
    "small": "Pequeño",

--- a/sails/src/assets/scripts/modules/student/views/collections.html
+++ b/sails/src/assets/scripts/modules/student/views/collections.html
@@ -11,7 +11,7 @@
      <!-- Grid header -->
      <div class="col-xs-2 text-center" style="margin-bottom:1em;">
        <button type="button" class="btn btn-danger btn-grid-back" ng-if="breadcrumbs.length != 0" ng-click="showLastGrid()">
-          <i class="fa fa-arrow-circle-left" aria-hidden="true"></i> Volver a <b>{{ breadcrumbs[breadcrumbs.length-1].name }}</b>
+          <i class="fa fa-arrow-circle-left" aria-hidden="true"></i> {{ return_to | translate }} <b>{{ breadcrumbs[breadcrumbs.length-1].name }}</b>
        </button>
      </div>
    </div>
@@ -122,26 +122,26 @@
    <div class="col-xs-2 text-center">
-      <label style="margin-bottom:1em;">Opciones del tablero</label>
+      <label style="margin-bottom:1em;">{{ grid_options | translate }}</label>
      <div class="form-group row">
-        <button type="button" ng-if="!viewingGrid.active" class="btn btn-default" ng-click="viewingGrid.active=true;activate_grid(viewingGrid)" style="min-width:9.5em;">Activar tablero</button>
+        <button type="button" ng-if="!viewingGrid.active" class="btn btn-default" ng-click="viewingGrid.active=true;activate_grid(viewingGrid)" style="min-width:9.5em;">{{ grid_activate | translate }}</button>
-        <button type="button" ng-if="viewingGrid.active" class="btn btn-success" disabled style="min-width:9.25em;">Tablero activado</button>
+        <button type="button" ng-if="viewingGrid.active" class="btn btn-success" disabled style="min-width:9.25em;">{{ grid_active | translate }}</button>
      </div>
      <div class="form-group row">
-        <button type="button" class="btn btn-default"ng-click="open_grid_color(viewingGrid)" style="min-width:9.25em;">Configuración</button>
+        <button type="button" class="btn btn-default" ng-click="open_grid_color(viewingGrid)" style="min-width:9.25em;">{{ setup | translate }}</button>
      </div>
      <div class="form-group row">
        <button type="button" class="btn btn-success" ng-click="open_new_grid()" aria-expanded="false"><i class="fa fa-plus" aria-hidden="true"></i></button>
-        <button type="button" class="btn btn-primary" ng-click="copy_grid()" title="{{ 'duplicate' | translate}}"><i class="fa fa-files-o" aria-hidden="true"></i></button>
+        <button type="button" class="btn btn-primary" ng-click="copy_grid()" title="{{ 'duplicate' | translate }}"><i class="fa fa-files-o" aria-hidden="true"></i></button>
-        <button type="button" class="btn btn-danger" ng-click="delete_grid(viewingGrid)" title="{{ 'delete' | translate}}"><i class="fa fa-trash" aria-hidden="true"></i></button>
+        <button type="button" class="btn btn-danger" ng-click="delete_grid(viewingGrid)" title="{{ 'delete' | translate }}"><i class="fa fa-trash" aria-hidden="true"></i></button>
      </div>
      <hr>
-      <label style="margin-bottom:1em;">Ver tableros</label>
+      <label style="margin-bottom:1em;">{{ show_grids | translate }}</label>
      <div class="form-group row">
        <select ng-model="grid" ng-change="showGrid(grid,false)" style="min-width:9.5em;">

--- a/sails/src/assets/scripts/modules/student/views/gridconfig.html
+++ b/sails/src/assets/scripts/modules/student/views/gridconfig.html
@@ -3,7 +3,7 @@
        <button type="button" class="close" ng-click="cancel()">
          <span aria-hidden="true">&times;</span><span class="sr-only" translate>close</span>
        </button>
-        <h4 class="modal-title" id="myModalLabel" translate>Configuración del tablero</h4>
+        <h4 class="modal-title" id="myModalLabel" translate>{{ grid_options | translate }}</h4>
    </div>
    <div class="modal-body">
@@ -11,7 +11,7 @@
        <div class="form-group">
          <div class="row">
-            <label for="favcolor">Color de fondo</label>
+            <label for="favcolor">{{ background_color | translate }}</label>
          </div>
          <div class="row">
            <div class="col-xs-3">
@@ -19,12 +19,12 @@
            </div>
            <div class="col-xs-3">
              <button class="btn btn-danger pull-right" ng-click="(gridColor = '#ffffff')">
-                <i class="fa fa-eraser" aria-hidden="true"></i> Eliminar color
+                <i class="fa fa-eraser" aria-hidden="true"></i> {{ color_delete | translate }}
              </button>
            </div>
            <div class="col-xs-6">
              <div class="alert alert-info" style="margin: 0 auto;" translate>
-                Color de fondo para el pictograma seleccionado
+                {{ background_color_picto | translate }}
              </div>
            </div>
          </div>
@@ -34,6 +34,6 @@
    </div>
    <div class="modal-footer text-right">
-      <button class="btn btn-success" ng-click="close(gridColor)">Guardar</button>
+      <button class="btn btn-success" ng-click="close(gridColor)">{{ save | translate }}</button>
    </div>
 </div>