hardi
/
opt-cc
1
0
Fork 0
Code Pull Requests Releases 47 Activity

Add english translations (CC-60)

pull/46/head
HardiReady 2018-10-05 10:21:50 +02:00
parent 8ea5e188a0
commit f9c9e20339
7 changed files with 174 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/routes/users.js
View File

@ -57,7 +57,7 @@ users.route('/')
return next();
}
UserModel.count(dbFilter, (err, totalCount) => {
UserModel.countDocuments(dbFilter, (err, totalCount) => {
res.set('x-total-count', totalCount);
res.locals.items = users;
res.locals.processed = true;

3
static/src/app/app.component.ts
View File

@ -9,7 +9,6 @@ import {DomSanitizer} from '@angular/platform-browser';
import {MatIconRegistry} from '@angular/material';
import {SpinnerService} from './services/user-interface/spinner/spinner.service';
import {TranslateService} from '@ngx-translate/core';
import {Language} from './settings/settings-state.model';
import {SettingsService} from './services/settings.service';
declare function require(url: string);
@ -129,7 +128,7 @@ export class AppComponent implements OnInit {
this.document.documentElement.scrollTop = 0; // For Chrome, Firefox, IE and Opera
}
setLanguage(language: Language) {
setLanguage(language: string) {
if (language) {
this.settingsService.setLanguage(language);
}

15
static/src/app/login/login.component.html
View File

@ -1,16 +1,19 @@
<form class="form-signin" (ngSubmit)="login(userName.value, password.value)">
<div class="row">
<h2 class="form-signin-heading">Login</h2>
<h2 class="form-signin-heading">{{'login.headline' | translate}}</h2>
<label for="inputEmail" class="sr-only">Benutzername</label>
<input #userName id="inputEmail" class="form-control" placeholder="Benutzername" required="" autofocus="">
<label for="inputEmail" class="sr-only">{{'login.username' | translate}}</label>
<input #userName id="inputEmail" class="form-control"
placeholder="{{'login.username' | translate}}"
required="" autofocus="">
<label for="inputPassword" class="sr-only">Passwort</label>
<input #password type="password" id="inputPassword" class="form-control" placeholder="Passwort" required="">
<label for="inputPassword" class="sr-only">{{'login.password' | translate}}</label>
<input #password type="password" id="inputPassword" class="form-control"
placeholder="{{'login.password' | translate}}" required="">
<div class="form-group">
<button mat-stroked-button type="submit">
<span *ngIf="!loading">Anmelden</span>
<span *ngIf="!loading">{{'login.submit' | translate}}</span>
<span *ngIf="loading" class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
</button>
</div>

2
static/src/app/manage/decorations/decoration-list/decoration-item.component.html
View File

@ -9,7 +9,7 @@
<small *ngIf="decoration.fraction == 'OPFOR'">{{fraction.OPFOR}}</small>
<small *ngIf="decoration.fraction == 'BLUFOR'">{{fraction.BLUFOR}}</small>
<small *ngIf="decoration.fraction == 'GLOBAL'">{{'decorations.list.filter.global' | translate}}</small>
<small>{{'decorations.item.label.sort' | translate:{value: decoration.sortingNumber} }}</small>
<small> {{'decorations.item.label.sort' | translate:{value: decoration.sortingNumber} }}</small>
</div>
<div class="col-xs-4">

2
static/src/app/manage/ranks/rank-list/rank-item.component.html
View File

@ -8,7 +8,7 @@
<br>
<small *ngIf="rank.fraction == 'OPFOR'">{{fraction.OPFOR}}</small>
<small *ngIf="rank.fraction == 'BLUFOR'">{{fraction.BLUFOR}}</small>
<small>{{'ranks.list.item.label.level' | translate:{level: rank.level} }}</small>
<small> {{'ranks.list.item.label.level' | translate:{level: rank.level} }}</small>
</div>
<div class="col-xs-4">

91
static/src/assets/i18n/manage/en.json
View File

@ -1,3 +1,94 @@
{
"public.error.message.required": "{{fieldName}} is a required field",
"public.error.message.min.length": "{{fieldName}} requires at least {{boundary}} characters",
"public.error.message.max.length": "{{fieldName}} is limited to {{boundary}} characters",
"public.error.message.email": "Please enter a valid eMail address",
"public.error.message.no.user": "The choosen user does not exist",
"public.error.message.default": "{{fieldName}} is not valid",
"public.common.search.button": "Search",
"decorations.list.button.add": "Add new decoration",
"decorations.list.button.delete": "Delete",
"decorations.list.filter.global": "Global",
"decorations.list.delete.confirm": "Do you really want to delete the decoration '{{name}}' ({{fraction}})?",
"decorations.item.label.sort": "- Sort {{value}}",
"decorations.submit.headline.edit": "Edit decoration",
"decorations.submit.headline.new": "Add new decoration",
"decorations.submit.field.name": "Name",
"decorations.submit.field.fraction": "Fraction",
"decorations.submit.field.fraction.global": "Global",
"decorations.submit.field.type": "Type",
"decorations.submit.field.type.ribbon": "Ribbon",
"decorations.submit.field.type.medal": "Medal",
"decorations.submit.field.sort": "Sort",
"decorations.submit.field.description": "Description",
"decorations.submit.field.image": "Image",
"decorations.submit.field.image.error.type": "Image is required to be in PNG format",
"decorations.submit,button.submit": "Submit",
"decorations.submit,button.cancel": "Cancel",
"ranks.list.button.add": "Add new rank",
"ranks.list.button.delete": "Delete",
"ranks.list.delete.confirm": "Do you really want to delete the rank '{{name}}' ({{fraction}})?",
"ranks.list.item.label.level": "- Level {{level}}",
"ranks.submit.headline.new": "Add new rank",
"ranks.submit.headline.edit": "Edit rank",
"ranks.submit.field.name": "Name",
"ranks.submit.field.fraction": "Fraction",
"ranks.submit.field.level": "Level",
"ranks.submit.field.image": "Image",
"ranks.submit.field.image.error.format": "Image is required to be in PNG format",
"ranks.submit.button.submit": "Submit",
"ranks.submit.button.cancel": "Cancel",
"squad.list.tooltip.delete": "Delete",
"squad.list.delete.confirm": "Do you really want to delete the squad '{{name}}' ({{fraction}})?",
"squad.list.tooltip.new": "Add new squad",
"squad.submit.new.headline": "Add new squad",
"squad.submit.edit.headline": "Edit squad",
"squad.submit.field.name": "Name",
"squad.submit.field.fraction": "Fraction",
"squad.submit.field.sort": "Sort",
"squad.submit.field.logo": "Logo",
"squad.submit.error.logo.type": "Image is required to be in PNG format",
"squad.submit.button.submit": "Submit",
"squad.submit.button.cancel": "Cancel",
"users.list.tooltip.new": "Add new user",
"users.list.tooltip.delete": "Delete",
"users.list.tooltip.awards": "Awards",
"users.list.filter.no.squad": "No squad",
"users.list.item.label.no.squad": "no squad/fraktion",
"users.list.delete.confirm": "Do you really want to delete the user '{{name}}'?",
"users.award.headline": "Decorate user",
"users.award.field.decoration": "Decoration",
"users.award.field.decoration.placeholder": "Choose...",
"users.award.field.reason": "Reason",
"users.award.field.reason.placeholder": "Enter reason...",
"users.award.button.submit": "Submit",
"users.award.button.cancel": "Cancel",
"users.award.table.head.image": "Image",
"users.award.table.head.name": "Title",
"users.award.table.head.reason": "Reason",
"users.award.table.head.date": "Date",
"users.award.table.head.status": "Status",
"users.award.table.button.delete": "Delete",
"users.award.table.status.in.progress": "In Progress",
"users.award.table.status.approved": "Approved",
"users.award.table.status.rejected": "Rejected",
"user.submit.headline.new": "Add new user",
"user.submit.headline.edit": "Edit user",
"user.submit.field.name": "Name",
"user.submit.field.squad": "Squad",
"user.submit.field.squad.not.assigned": "No fraktion/ squad",
"user.submit.field.rank": "Rank",
"user.submit.button.submit": "Submit",
"user.submit.button.cancel": "Cancel"
}

70
static/src/assets/i18n/request/en.json
View File

@ -1,2 +1,72 @@
{
"public.error.message.required": "{{fieldName}} is a required field",
"public.error.message.min.length": "{{fieldName}} requires at least {{boundary}} characters",
"public.error.message.max.length": "{{fieldName}} is limited to {{boundary}} characters",
"public.error.message.email": "Please enter a valid eMail address",
"public.error.message.no.user": "The choosen user does not exist",
"public.error.message.default": "{{fieldName}} is not valid",
"public.common.search.button": "Search",
"request.confirm.award.headline": "Open Requests - Awards",
"request.confirm.award.table.head.participant": "Participant",
"request.confirm.award.table.head.award": "Decoration",
"request.confirm.award.table.head.reason": "Reason",
"request.confirm.award.table.head.requester": "Applicant",
"request.confirm.award.table.head.date": "Date",
"request.confirm.award.table.head.action": "Action",
"request.confirm.award.table.reject.reason.placeholder": "Reason for reject (optional)",
"request.confirm.award.table.button.action.accept": "Approve",
"request.confirm.award.table.button.action.reject": "Reject",
"request.confirm.promotion.headline": "Open Requests - Promotions",
"request.confirm.promotion.table.head.participant": "Participant",
"request.confirm.promotion.table.head.rank.before": "Old Rank",
"request.confirm.promotion.table.head.rank.after": "New Rank",
"request.confirm.promotion.table.head.requester": "Applicant",
"request.confirm.promotion.table.head.date": "Date",
"request.confirm.promotion.table.head.status": "Status",
"request.confirm.promotion.table.head.action": "Action",
"request.confirm.promotion.table.reject.reason.placeholder": "Reason for reject (optional)",
"request.confirm.promotion.table.button.action.accept": "Approve",
"request.confirm.promotion.table.button.action.reject": "Reject",
"request.confirm.promotion.table.status.progressing": "In Progress",
"request.confirm.promotion.table.status.accepted": "Approved",
"request.confirm.promotion.table.status.rejected": "Rejected",
"request.award.headline": "Request Award",
"request.award.field.user": "Participant",
"request.award.field.user.placeholder": "Choose...",
"request.award.field.award": "Decoration",
"request.award.field.award.placeholder": "Choose...",
"request.award.field.reason": "Reason",
"request.award.field.reason.placeholder": "Enter reason...",
"request.award.button.cancel": "Cancel",
"request.award.button.submit": "Submit",
"request.award.table.head.image": "Image",
"request.award.table.head.name": "Title",
"request.award.table.head.reason": "Reason",
"request.award.table.head.requester": "Applicant",
"request.award.table.head.date": "Date",
"request.award.table.head.status": "Status",
"request.award.table.head.reject.reason": "Reason for Reject",
"request.award.table.status.progressing": "In Progress",
"request.award.table.status.accepted": "Approved",
"request.award.table.status.rejected": "Rejected",
"request.promotion.headline": "Request Promotion",
"request.promotion.field.participant": "Participant",
"request.promotion.field.participant.placeholder": "Choose...",
"request.promotion.field.rank.before": "Current Rank",
"request.promotion.field.rank.after": "New Rank",
"request.promotion.button.submit": "Submit",
"request.promotion.button.cancel": "Cancel",
"request.promotion.table.head.participant": "Participant",
"request.promotion.table.head.rank.before": "Old Rank",
"request.promotion.table.head.rank.after": "New Rank",
"request.promotion.table.head.requester": "Applicant",
"request.promotion.table.head.date": "Date",
"request.promotion.table.head.status": "Status",
"request.promotion.table.head.reject.reason": "Reason for Reject",
"request.sql.dashboard.headline":"SQL Dashboard"
}