From 8985d5c5e1b98c0bf7b786f1ae7944969ceedd2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Thu, 25 Apr 2019 22:34:52 +0200 Subject: [PATCH] Updated translations --- .../agenda-sort/agenda-sort.component.html | 4 +- .../assignment-detail.component.html | 6 +- .../assignment-detail.component.ts | 2 +- .../assignment-poll.component.html | 6 +- .../assignment-poll.component.ts | 8 +- .../motion-import-list.component.html | 2 +- .../motion-list/motion-list.component.html | 2 +- client/src/assets/i18n/de.json | 2 +- client/src/assets/i18n/de.po | 122 +++++++++++++----- client/src/assets/i18n/template-en.pot | 111 ++++++++++++---- 10 files changed, 190 insertions(+), 75 deletions(-) diff --git a/client/src/app/site/agenda/components/agenda-sort/agenda-sort.component.html b/client/src/app/site/agenda/components/agenda-sort/agenda-sort.component.html index 4bc4861ce..00f34279d 100644 --- a/client/src/app/site/agenda/components/agenda-sort/agenda-sort.component.html +++ b/client/src/app/site/agenda/components/agenda-sort/agenda-sort.component.html @@ -42,8 +42,8 @@
- You are currently seeing {{ seenNodes[0] }} of {{ seenNodes[1] }} items. - + {{ seenNodes[0] }} of {{ seenNodes[1] }} + items
@@ -239,7 +239,7 @@ > - +
diff --git a/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.ts b/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.ts index a71a05cef..62775503b 100644 --- a/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.ts +++ b/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.ts @@ -159,7 +159,7 @@ export class AssignmentDetailComponent extends BaseViewComponent implements OnIn */ public constructor( title: Title, - translate: TranslateService, + protected translate: TranslateService, // protected required for ng-translate-extract matSnackBar: MatSnackBar, public vp: ViewportService, private operator: OperatorService, diff --git a/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.html b/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.html index ebe586b33..24fc52194 100644 --- a/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.html +++ b/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.html @@ -41,7 +41,7 @@

- Poll description + Hint for ballot paper

@@ -57,7 +57,7 @@
-

Poll method

+

Election method

{{ pollMethodName | translate }}
@@ -65,7 +65,7 @@
-
Candidate
+
Candidates
Votes
diff --git a/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.ts b/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.ts index 33a14e2f9..e618495bc 100644 --- a/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.ts +++ b/client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.ts @@ -101,11 +101,11 @@ export class AssignmentPollComponent extends BaseViewComponent implements OnInit } switch (this.poll.pollmethod) { case 'votes': - return this.translate.instant('Vote per Candidate'); + return this.translate.instant('One vote per candidate'); case 'yna': - return this.translate.instant('Yes/No/Abstain per Candidate'); + return this.translate.instant('Yes/No/Abstain per candidate'); case 'yn': - return this.translate.instant('Yes/No per Candidate'); + return this.translate.instant('Yes/No per candidate'); default: return ''; } @@ -163,7 +163,7 @@ export class AssignmentPollComponent extends BaseViewComponent implements OnInit * TODO: Some confirmation (advanced logic (e.g. not deleting published?)) */ public async onDeletePoll(): Promise { - const title = this.translate.instant('Are you sure you want to delete this poll?'); + const title = this.translate.instant('Are you sure you want to delete this ballot?'); if (await this.promptService.open(title, null)) { await this.assignmentRepo.deletePoll(this.poll).then(null, this.raiseError); } diff --git a/client/src/app/site/motions/modules/motion-import/motion-import-list.component.html b/client/src/app/site/motions/modules/motion-import/motion-import-list.component.html index 175daacc0..ffb631a93 100644 --- a/client/src/app/site/motions/modules/motion-import/motion-import-list.component.html +++ b/client/src/app/site/motions/modules/motion-import/motion-import-list.component.html @@ -14,7 +14,7 @@
- {{ header }}{{ header | translate }}
diff --git a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html index fb3bf1348..a928403b6 100644 --- a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html +++ b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.html @@ -236,7 +236,7 @@ (click)="multiselectWrapper(multiselectService.bulkSetFavorite(selectedRows))" > star - Set/unset Favorite + Set favorite