From a99209bfad52109247708e2715f14b197c8ed62e Mon Sep 17 00:00:00 2001 From: kiswa Date: Fri, 10 Mar 2017 01:46:01 +0000 Subject: [PATCH] Translations complete through Settings - Board Admin --- .../board-admin/board-admin.component.html | 40 +++++++++---------- .../user-admin/user-admin.component.ts | 2 +- src/json/en.json | 17 +++++++- src/json/es.json | 17 +++++++- src/scss/_settings.scss | 2 +- 5 files changed, 52 insertions(+), 26 deletions(-) diff --git a/src/app/settings/board-admin/board-admin.component.html b/src/app/settings/board-admin/board-admin.component.html index 7bda558..08f8f6f 100644 --- a/src/app/settings/board-admin/board-admin.component.html +++ b/src/app/settings/board-admin/board-admin.component.html @@ -1,5 +1,5 @@
-

{{ strings['settings_boardAdmin'] }}

+

{{ strings['settings_boardAdministration'] }}

{{ strings['settings_currentBoards'] }}

@@ -75,7 +75,8 @@
  • {{ cat.name }} -   @@ -191,13 +192,13 @@
    • -
      • @@ -210,9 +211,9 @@ (keyup.enter)="cancelEnterKey($event)" [(ngModel)]="modalProps.newCategoryName"> - @@ -224,10 +225,9 @@
        @@ -251,14 +251,14 @@
        - @@ -267,7 +267,7 @@
        - +
        - * Including a Board Admin, - makes them an admin of this board.
         - Administrators have access to all boards and are - not listed here. + * + {{ strings['settings_boardAdminMessage'] }}
         + {{ strings['settings_adminAccessMessage'] }}
        @@ -287,11 +286,12 @@
      diff --git a/src/app/settings/user-admin/user-admin.component.ts b/src/app/settings/user-admin/user-admin.component.ts index f916429..3d9de0b 100644 --- a/src/app/settings/user-admin/user-admin.component.ts +++ b/src/app/settings/user-admin/user-admin.component.ts @@ -181,7 +181,7 @@ export class UserAdmin { private replaceUser(newUser: User) { this.users.forEach((user, index) => { - if (user.id === +newUser.id) { + if (+user.id === +newUser.id) { this.users[index] = this.convertUser(newUser); this.updateUserList(); } diff --git a/src/json/en.json b/src/json/en.json index c5846b1..d203756 100644 --- a/src/json/en.json +++ b/src/json/en.json @@ -41,6 +41,7 @@ "settings_removeUser": "Remove User", "settings_addUser": "Add User", "settings_editUser": "Edit User", + "settings_saveUser": "Save User", "settings_confirmUserRemoval": "Confirm User Removal", "settings_removeUserWarning": "Removing a user cannot be undone.", "settings_continue": "Continue?", @@ -52,7 +53,7 @@ "settings_boardAdmin": "Board Admin", "settings_admin": "Admin", - "settings_boardAdmin": "Board Administration", + "settings_boardAdministration": "Board Administration", "settings_currentBoards": "Current Boards", "settings_showByUser": "Show By User", "settings_filterBy": "Filter By", @@ -76,6 +77,18 @@ "settings_removeColumn": "Remove Column", "settings_columnName": "Column Name", "settings_addColumn": "Add Column", - "settings_categoryName": "Category Name" + "settings_removeCategory": "Remove Category", + "settings_categoryName": "Category Name", + "settings_defaultTaskColor": "Default Task Color", + "settings_addCategory": "Add Category", + "settings_issueTrackers": "Issue Trackers", + "settings_issueTrackersHelp": "Example URL: https://github.com/kiswa/TaskBoard/issues/%BUGID\\1% Example RegExp: (?:Issue)?#(\\d+)", + "settings_issueTrakcerUrl": "Issue Tracker URL - use %BUGID% as placeholder", + "settings_issueTrackerRegExp": "BUGID RegExp", + "settings_addIssueTracker": "Add Issue Tracker", + "settings_selectUsers": "Select Users", + "settings_boardAdminMessage": "Including a Board Admin, makes them an admin of this board.", + "settings_adminAccessMessage": "Administrators have access to all boards and are not listed here.", + "settings_saveBoard": "Save Board" } diff --git a/src/json/es.json b/src/json/es.json index c219df7..ca096c3 100644 --- a/src/json/es.json +++ b/src/json/es.json @@ -41,6 +41,7 @@ "settings_removeUser": "Eliminar Usuario", "settings_addUser": "Agregar Usuario", "settings_editUser": "Cambia Usuario", + "settings_saveUser": "Guardar Usuario", "settings_confirmUserRemoval": "Confirmar Eliminación del Usuario", "settings_removeUserWarning": "No se puede deshacer la eliminación de un usuario.", "settings_continue": "¿Continuar?", @@ -52,7 +53,7 @@ "settings_boardAdmin": "Administrador de los Tableros", "settings_admin": "Administrador", - "settings_boardAdmin": "Administración de Tableros", + "settings_boardAdministration": "Administración de Tableros", "settings_currentBoards": "Tableros Actuales", "settings_showByUser": "Mostrar por Usuario", "settings_filterBy": "Filtrar por", @@ -76,6 +77,18 @@ "settings_removeColumn": "Eliminar Columna", "settings_columnName": "Nombre del Columna", "settings_addColumn": "Agregar Columna", - "settings_categoryName": "Nombre del Categoría" + "settings_removeCategory": "Eliminar Categoría", + "settings_categoryName": "Nombre del Categoría", + "settings_defaultTaskColor": "Color de Tarea Predeterminado", + "settings_addCategory": "Agregar Categoría", + "settings_issueTrackers": "Seguimiento de Incidencias", + "settings_issueTrackersHelp": "Ejemplo URL: https://github.com/kiswa/TaskBoard/issues/%BUGID\\1% Ejemplo RegExp: (?:Issue)?#(\\d+)", + "settings_issueTrakcerUrl": "URL de Seguimiento de Incidencia: Utilice %BUGID% como marcador de posición", + "settings_issueTrackerRegExp": "BUGID RegExp", + "settings_addIssueTracker": "Agregar Seguimiento de Incidencia", + "settings_selectUsers": "Seleccionar Usuarios", + "settings_boardAdminMessage": "Incluyendo un Administrador de Tableros, hace de ellos un administrador de este tablero.", + "settings_adminAccessMessage": "Los administradores tienen acceso a todas las tableros y no se enumeran aquí.", + "settings_saveBoard": "Guardar Tablero" } diff --git a/src/scss/_settings.scss b/src/scss/_settings.scss index 49eaae0..8968517 100644 --- a/src/scss/_settings.scss +++ b/src/scss/_settings.scss @@ -72,7 +72,7 @@ [type="text"] { &:first-of-type { - width: 380px; + width: 430px; } &:last-of-type {