Merge pull request #4674 from emanuelschuetze/translation-20190507

Updated translations

client/src/app/site/agenda/components/agenda-sort/agenda-sort.component.ts

@@ -194,8 +194,8 @@ export class AgendaSortComponent extends BaseViewComponent implements CanCompone
      */
     public async canDeactivate(): Promise<boolean> {
         if (this.hasChanged) {
-            const title = this.translate.instant('You made changes.');
+            const title = this.translate.instant('Do you really want to exit this page?');
-            const content = this.translate.instant('Do you really want to exit?');
+            const content = this.translate.instant('You made changes.');
             return await this.promptService.open(title, content);
         }
         return true;

client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.html

@@ -221,7 +221,7 @@
                     />
                 </mat-form-field>
             </div>
-            <h4 translate>Description:</h4>
+            <h4>{{ 'Description' | translate }}:</h4>
 
             <!-- description: HTML Editor -->
             <editor

client/src/app/site/assignments/components/assignment-poll-dialog/assignment-poll-dialog.component.html

@@ -32,7 +32,7 @@
                 [value]="getSumValue(sumValue)"
                 (change)="setSumValue(sumValue, $event.target.value)"
             />
-            <mat-label>{{ pollService.getLabel(sumValue) }}</mat-label>
+            <mat-label>{{ pollService.getLabel(sumValue) | translate }}</mat-label>
         </mat-form-field>
     </div>
 </div>

client/src/app/site/assignments/components/assignment-poll/assignment-poll.component.ts

@@ -201,7 +201,7 @@ export class AssignmentPollComponent extends BaseViewComponent implements OnInit
             // TODO deep copy of this.poll (JSON parse is ugly workaround) or sending just copy of the options
             data: this.poll.copy(),
             maxHeight: '90vh',
-            minWidth: '300px',
+            minWidth: '450px',
             maxWidth: '80vw',
             disableClose: true
         });

client/src/app/site/assignments/services/assignment-pdf-export.service.ts

@@ -31,7 +31,7 @@ export class AssignmentPdfExportService {
      */
     public exportSingleAssignment(assignment: ViewAssignment): void {
         const doc = this.assignmentPdfService.assignmentToDocDef(assignment);
-        const filename = `${this.translate.instant('Assignments')} ${assignment.title}`;
+        const filename = `${this.translate.instant('Election')}_${assignment.title}`;
         const metadata = {
             title: filename
         };

client/src/app/site/global-spinner/global-spinner.component.spec.ts

@@ -1,6 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { GlobalSpinnerComponent } from './global-spinner.component';
+import { E2EImportsModule } from 'e2e-imports.module';
 
 describe('GlobalSpinnerComponent', () => {
     let component: GlobalSpinnerComponent;
@@ -8,7 +9,7 @@ describe('GlobalSpinnerComponent', () => {
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
-            declarations: [GlobalSpinnerComponent]
+            imports: [E2EImportsModule]
         }).compileComponents();
     }));
 

client/src/app/site/global-spinner/global-spinner.component.ts

@@ -1,6 +1,7 @@
 // External imports
 import { Component, OnInit, OnDestroy, ChangeDetectorRef } from '@angular/core';
 import { Subscription } from 'rxjs';
+import { TranslateService } from '@ngx-translate/core';
 
 // Internal imports
 import { SpinnerService } from 'app/core/ui-services/spinner.service';
@@ -32,7 +33,7 @@ export class GlobalSpinnerComponent implements OnInit, OnDestroy {
     /**
      * Constant string as default message when the spinner is shown.
      */
-    private LOADING = 'Loading data. Please wait...';
+    private LOADING = this.translate.instant('Loading data. Please wait...');
 
     /**
      *
@@ -40,7 +41,11 @@ export class GlobalSpinnerComponent implements OnInit, OnDestroy {
      * @param translate Service to get translations for the messages.
      * @param detector Service to manual initiate a change of the UI.
      */
-    public constructor(private spinnerService: SpinnerService, private detector: ChangeDetectorRef) {}
+    public constructor(
+        private spinnerService: SpinnerService,
+        protected translate: TranslateService,
+        private detector: ChangeDetectorRef
+    ) {}
 
     /**
      * Init method
@@ -50,8 +55,7 @@ export class GlobalSpinnerComponent implements OnInit, OnDestroy {
             .getVisibility()
             .subscribe((value: { isVisible: boolean; text: string }) => {
                 this.isVisible = value.isVisible;
-                this.text = value.text;
+                this.text = this.translate.instant(value.text);
-
                 if (!this.text) {
                     this.text = this.LOADING;
                 }

client/src/app/site/motions/modules/call-list/call-list.component.ts

@@ -121,8 +121,8 @@ export class CallListComponent extends BaseViewComponent implements CanComponent
      */
     public async canDeactivate(): Promise<boolean> {
         if (this.hasChanged) {
-            const title = this.translate.instant('You made changes.');
+            const title = this.translate.instant('Do you really want to exit this page?');
-            const content = this.translate.instant('Do you really want to exit?');
+            const content = this.translate.instant('You made changes.');
             return await this.promptService.open(title, content);
         }
         return true;

client/src/app/site/motions/modules/category/components/category-sort/category-sort.component.ts

@@ -177,9 +177,8 @@ export class CategorySortComponent extends BaseViewComponent implements OnInit,
      * Only an array containing ids from the motions will be sent.
      */
     public async sendUpdate(): Promise<void> {
-        const title = this.translate.instant('Save changes');
+        const title = this.translate.instant('Do you really want to save your changes?');
-        const content = this.translate.instant('Do you really want to save your changes?');
+        if (await this.promptService.open(title, null)) {
-        if (await this.promptService.open(title, content)) {
             const ids = this.motionsCopy.map(motion => motion.id);
             this.repo.sortMotionsInCategory(this.category.category, ids);
             this.hasChanged = false;
@@ -226,8 +225,8 @@ export class CategorySortComponent extends BaseViewComponent implements OnInit,
      */
     public async canDeactivate(): Promise<boolean> {
         if (this.hasChanged) {
-            const title = this.translate.instant('You made changes.');
+            const title = this.translate.instant('Do you really want to exit this page?');
-            const content = this.translate.instant('Do you really want to exit?');
+            const content = this.translate.instant('You made changes.');
             return await this.promptService.open(title, content);
         }
         return true;

client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.ts

@@ -103,7 +103,7 @@ export class MotionBlockListComponent extends ListViewBaseComponent<ViewMotionBl
      * Observe the agendaItems for changes.
      */
     public ngOnInit(): void {
-        super.setTitle('Motion Blocks');
+        super.setTitle('Motion blocks');
         this.initTable();
 
         this.items = this.itemRepo.getViewModelListBehaviorSubject();

client/src/app/site/motions/modules/motion-list/components/motion-export-dialog/motion-export-dialog.component.html

@@ -47,7 +47,7 @@
             <p class="toggle-group-head" translate>Meta information</p>
             <mat-button-toggle-group class="smaller-buttons" multiple formControlName="metaInfo">
                 <mat-button-toggle *ngFor="let metaInfo of metaInfoExportOrder" [value]="metaInfo">
-                    <span translate>{{ getLabelForMetadata(metaInfo) }}</span>
+                    <span>{{ getLabelForMetadata(metaInfo) | translate }}</span>
                 </mat-button-toggle>
                 <mat-button-toggle value="polls" #votingResultButton>
                     <span translate>Voting result</span>

client/src/assets/i18n/de.po

@@ -260,10 +260,16 @@ msgid "Are you sure you want to renumber all motions of this category?"
 msgstr ""
 "Sollen alle Anträge dieses Sachgebiets wirklich neu nummeriert werden?"
 
+msgid "Are you sure you want to send an invitation email to the user?"
+msgstr "Soll wirklich eine E-Mail den diesen Nutzer gesendet werden?"
+
 msgid "Are you sure you want to send emails to all selected participants?"
 msgstr ""
 "Sollen E-Mails wirklich an alle ausgewählten Teilnehmende gesendet werden?"
 
+msgid "Assignments"
+msgstr ""
+
 msgid ""
 "At least given name or surname have to be filled in. All other fields are "
 "optional and may be empty."
@@ -456,6 +462,9 @@ msgstr "Geänderte Fassung"
 msgid "Changed version in line"
 msgstr "Geänderte Fassung in Zeile"
 
+msgid "Check for updates"
+msgstr "Auf Updates prüfen"
+
 msgid "Check in or check out participants based on their participant numbers:"
 msgstr ""
 "An- oder Abmeldung von Teilnehmenden basierend auf ihren Teilnehmernummern:"
@@ -652,6 +661,9 @@ msgstr "Chronik löschen"
 msgid "Deletion"
 msgstr "Streichung"
 
+msgid "Description"
+msgstr "Beschreibung"
+
 msgid "Deselect all"
 msgstr "Alle abwählen"
 
@@ -686,6 +698,12 @@ msgstr "Nicht befassen"
 msgid "Do not decide"
 msgstr "Nicht entscheiden"
 
+msgid "Do you really want to exit this page?"
+msgstr "Wollen Sie diese Seite wirklich verlassen?"
+
+msgid "Do you really want to save your changes?"
+msgstr "Wollen Sie wirklich Ihre Änderungen speichern?"
+
 msgid "Does not have notes"
 msgstr "Hat keine Notizen"
 
@@ -739,6 +757,9 @@ msgstr "Gewählt"
 msgid "Election"
 msgstr "Wahl"
 
+msgid "Election documents"
+msgstr "Wahlunterlagen"
+
 msgid "Election method"
 msgstr "Wahlmethode"
 
@@ -760,6 +781,9 @@ msgstr "Nachrichtentext"
 msgid "Email sender"
 msgstr "Absender"
 
+msgid "Email sent"
+msgstr "E-Mail gesendet"
+
 msgid "Email subject"
 msgstr "Betreff"
 
@@ -800,6 +824,9 @@ msgstr ""
 msgid "Error"
 msgstr "Fehler"
 
+msgid "Error during PDF creation of motion:"
+msgstr "Fehler bei der PDF-Erstellung in Antrag"
+
 msgid "Error: The new passwords do not match."
 msgstr "Fehler: Die neuen Passwörter stimmen nicht überein."
 
@@ -1020,6 +1047,9 @@ msgstr "Laufende Nummer im PDF und DOCX anzeigen"
 msgid "Initial password"
 msgstr "Initiales Passwort"
 
+msgid "Initiate update check for all clients"
+msgstr "Update-Prüfung für alle Clients starten"
+
 msgid "Inline"
 msgstr "innerhalb"
 
@@ -1104,6 +1134,9 @@ msgstr "Beschriftungsfarbe"
 msgid "Last email send"
 msgstr "Letzte gesendet E-Mail"
 
+msgid "Last email sent"
+msgstr "Letzte gesendete E-Mail"
+
 msgid "Last modified"
 msgstr "Zuletzt geändert"
 
@@ -1140,6 +1173,9 @@ msgstr "Redeliste"
 msgid "List of speakers overlay"
 msgstr "Redelisten-Einblendung"
 
+msgid "Loading data. Please wait..."
+msgstr "Daten werden geladen. Bitte warten..."
+
 msgid "Login"
 msgstr "Anmelden"
 
@@ -1311,6 +1347,9 @@ msgstr "Keine Daten"
 msgid "No decision"
 msgstr "Keine Entscheidung"
 
+msgid "No email sent"
+msgstr "Keine E-Mail gesendet"
+
 msgid "No emails were send."
 msgstr "Es wurden keine E-Mails versandt."
 
@@ -1716,6 +1755,9 @@ msgstr "Erforderliche Mehrheit"
 msgid "Reset"
 msgstr "Zurücksetzen"
 
+msgid "Reset cache"
+msgstr "Cache leeren"
+
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
@@ -1794,6 +1836,9 @@ msgstr "Ausgewählte Werte"
 msgid "Send invitation email"
 msgstr "Einladungs-E-Mail senden"
 
+msgid "Sending an invitation email"
+msgstr "Einladungs-E-Mail senden"
+
 msgid "Separator used for all csv exports and examples"
 msgstr "Feldtrenner für alle CSV-Exporte und -Beispiele"
 
@@ -2135,6 +2180,10 @@ msgstr ""
 "Alle ausgewählten Anträge unter oder nach dem folgenden Antrag in der "
 "Aufrufliste verschieben:"
 
+msgid "This will send an update notification to all active clients"
+msgstr ""
+"Es wird eine Update-Benachrichtigung an alle aktiven Clients gesendet."
+
 msgid "This will set the favorite status for all selected motions:"
 msgstr "Favoriten-Markierung für alle ausgewählten Anträge setzen:"
 
@@ -2363,6 +2412,9 @@ msgstr "Sie können {event_name} und {username} als Platzhalter verwenden."
 msgid "You do not have the required permission to see that page!"
 msgstr "Sie haben leider keine Berechtigung diese Seite zu sehen."
 
+msgid "You made changes."
+msgstr "Sie haben Änderungen vorgenommen."
+
 msgid "You override the personally set password!"
 msgstr "Sie überschreiben hiermit das persönlich gesetzte Passwort!"
 
@@ -2448,6 +2500,9 @@ msgstr "inaktiv"
 msgid "inline"
 msgstr "innerhalb"
 
+msgid "is elected"
+msgstr "gewählt"
+
 msgid "is hidden"
 msgstr "ist versteckt"
 

client/src/assets/i18n/template-en.pot

@@ -242,9 +242,15 @@ msgstr ""
 msgid "Are you sure you want to renumber all motions of this category?"
 msgstr ""
 
+msgid "Are you sure you want to send an invitation email to the user?"
+msgstr ""
+
 msgid "Are you sure you want to send emails to all selected participants?"
 msgstr ""
 
+msgid "Assignments"
+msgstr ""
+
 msgid ""
 "At least given name or surname have to be filled in. All other fields are "
 "optional and may be empty."
@@ -433,6 +439,9 @@ msgstr ""
 msgid "Changed version in line"
 msgstr ""
 
+msgid "Check for updates"
+msgstr ""
+
 msgid "Check in or check out participants based on their participant numbers:"
 msgstr ""
 
@@ -612,6 +621,9 @@ msgstr ""
 msgid "Deletion"
 msgstr ""
 
+msgid "Description"
+msgstr ""
+
 msgid "Deselect all"
 msgstr ""
 
@@ -644,6 +656,12 @@ msgstr ""
 msgid "Do not decide"
 msgstr ""
 
+msgid "Do you really want to exit this page?"
+msgstr ""
+
+msgid "Do you really want to save your changes?"
+msgstr ""
+
 msgid "Does not have notes"
 msgstr ""
 
@@ -694,6 +712,9 @@ msgstr ""
 msgid "Election"
 msgstr ""
 
+msgid "Election documents"
+msgstr ""
+
 msgid "Election method"
 msgstr ""
 
@@ -715,6 +736,9 @@ msgstr ""
 msgid "Email sender"
 msgstr ""
 
+msgid "Email sent"
+msgstr ""
+
 msgid "Email subject"
 msgstr ""
 
@@ -751,6 +775,9 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
+msgid "Error during PDF creation of motion:"
+msgstr ""
+
 msgid "Error: The new passwords do not match."
 msgstr ""
 
@@ -969,6 +996,9 @@ msgstr ""
 msgid "Initial password"
 msgstr ""
 
+msgid "Initiate update check for all clients"
+msgstr ""
+
 msgid "Inline"
 msgstr ""
 
@@ -1053,6 +1083,9 @@ msgstr ""
 msgid "Last email send"
 msgstr ""
 
+msgid "Last email sent"
+msgstr ""
+
 msgid "Last modified"
 msgstr ""
 
@@ -1089,6 +1122,9 @@ msgstr ""
 msgid "List of speakers overlay"
 msgstr ""
 
+msgid "Loading data. Please wait..."
+msgstr ""
+
 msgid "Login"
 msgstr ""
 
@@ -1260,6 +1296,9 @@ msgstr ""
 msgid "No decision"
 msgstr ""
 
+msgid "No email sent"
+msgstr ""
+
 msgid "No emails were send."
 msgstr ""
 
@@ -1656,6 +1695,9 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
+msgid "Reset cache"
+msgstr ""
+
 msgid "Reset password"
 msgstr ""
 
@@ -1734,6 +1776,9 @@ msgstr ""
 msgid "Send invitation email"
 msgstr ""
 
+msgid "Sending an invitation email"
+msgstr ""
+
 msgid "Separator used for all csv exports and examples"
 msgstr ""
 
@@ -2047,6 +2092,9 @@ msgid ""
 "the call list:"
 msgstr ""
 
+msgid "This will send an update notification to all active clients"
+msgstr ""
+
 msgid "This will set the favorite status for all selected motions:"
 msgstr ""
 
@@ -2262,6 +2310,9 @@ msgstr ""
 msgid "You do not have the required permission to see that page!"
 msgstr ""
 
+msgid "You made changes."
+msgstr ""
+
 msgid "You override the personally set password!"
 msgstr ""
 
@@ -2346,6 +2397,9 @@ msgstr ""
 msgid "inline"
 msgstr ""
 
+msgid "is elected"
+msgstr ""
+
 msgid "is hidden"
 msgstr ""