diff --git a/client/package.json b/client/package.json index 7aa33aa0d..ab8cc9333 100644 --- a/client/package.json +++ b/client/package.json @@ -55,7 +55,7 @@ "chart.js": "^2.9.2", "core-js": "^3.6.4", "css-element-queries": "^1.2.3", - "exceljs": "3.8.2", + "exceljs": "1.15.0", "file-saver": "^2.0.2", "lz4js": "^0.2.0", "material-icon-font": "git+https://github.com/petergng/materialIconFont.git", diff --git a/client/src/app/core/core-services/http.service.ts b/client/src/app/core/core-services/http.service.ts index e418a813b..7dfffc0ae 100644 --- a/client/src/app/core/core-services/http.service.ts +++ b/client/src/app/core/core-services/http.service.ts @@ -145,12 +145,11 @@ export class HttpService { if (isDetailResponse(e.error)) { error += this.processDetailResponse(e.error); } else { - error = Object.keys(e.error) - .map(key => { - const capitalizedKey = key.charAt(0).toUpperCase() + key.slice(1); - return this.translate.instant(capitalizedKey) + ': ' + this.processDetailResponse(e.error[key]); - }) - .join(', '); + const errorList = Object.keys(e.error).map(key => { + const capitalizedKey = key.charAt(0).toUpperCase() + key.slice(1); + return `${this.translate.instant(capitalizedKey)}: ${this.processDetailResponse(e.error[key])}`; + }); + error = errorList.join(', '); } } else if (e.status === 500) { error += this.translate.instant('A server error occured. Please contact your system administrator.'); diff --git a/client/src/app/core/pdf-services/pdf-document.service.ts b/client/src/app/core/pdf-services/pdf-document.service.ts index 494d033bc..965c60b09 100644 --- a/client/src/app/core/pdf-services/pdf-document.service.ts +++ b/client/src/app/core/pdf-services/pdf-document.service.ts @@ -256,14 +256,11 @@ export class PdfDocumentService { if (logoHeaderLeftUrl && logoHeaderRightUrl) { text = ''; } else { - const general_event_name = this.configService.instant('general_event_name'); - const general_event_description = this.configService.instant('general_event_description'); - const line1 = [ - this.translate.instant(general_event_name), - this.translate.instant(general_event_description) - ] - .filter(Boolean) - .join(' โ€“ '); + const general_event_name = this.translate.instant(this.configService.instant('general_event_name')); + const general_event_description = this.translate.instant( + this.configService.instant('general_event_description') + ); + const line1 = [general_event_name, general_event_description].filter(Boolean).join(' - '); const line2 = [ this.configService.instant('general_event_location'), this.configService.instant('general_event_date') diff --git a/client/src/app/core/repositories/users/user-repository.service.ts b/client/src/app/core/repositories/users/user-repository.service.ts index c317d27ea..f647bca4a 100644 --- a/client/src/app/core/repositories/users/user-repository.service.ts +++ b/client/src/app/core/repositories/users/user-repository.service.ts @@ -306,7 +306,8 @@ export class UserRepositoryService extends BaseRepository

- Add to agenda + {{ 'Add to agenda' | translate }}

diff --git a/client/src/app/shared/components/assignment-poll-detail-content/assignment-poll-detail-content.component.html b/client/src/app/shared/components/assignment-poll-detail-content/assignment-poll-detail-content.component.html index d044b69dc..8b2e1f615 100644 --- a/client/src/app/shared/components/assignment-poll-detail-content/assignment-poll-detail-content.component.html +++ b/client/src/app/shared/components/assignment-poll-detail-content/assignment-poll-detail-content.component.html @@ -2,17 +2,17 @@ - + - - + +
Candidates{{ 'Candidates' | translate }} - - Yes + + {{ 'Yes' | translate }} - - Votes + + {{ 'Votes' | translate }} NoAbstain{{ 'No' | translate }}{{ 'Abstain' | translate }}
diff --git a/client/src/app/shared/components/attachment-control/attachment-control.component.html b/client/src/app/shared/components/attachment-control/attachment-control.component.html index 609beaabf..c8c639908 100644 --- a/client/src/app/shared/components/attachment-control/attachment-control.component.html +++ b/client/src/app/shared/components/attachment-control/attachment-control.component.html @@ -16,7 +16,7 @@

- Upload files + {{ 'Upload files' | translate }}

- You are using the history mode of OpenSlides. Changes will not be saved. + {{ 'You are using the history mode of OpenSlides. Changes will not be saved.' | translate }} ({{ getHistoryTimestamp() }}) - Exit + {{ 'Exit' | translate }}
OpenSlides {{ versionInfo.openslides_version }} - (License: {{ versionInfo.openslides_license }}) + ({{ 'License' | translate }}: {{ versionInfo.openslides_license }})
-

Installed plugins:

+

+ {{ 'Installed plugins' | translate }}: +

{{ plugin.verbose_name }} {{ plugin.version }} -
(License: {{ plugin.license }})
+
+ ({{ 'License' | translate }}: {{ plugin.license }}) +
diff --git a/client/src/app/shared/components/list-view-table/list-view-table.component.html b/client/src/app/shared/components/list-view-table/list-view-table.component.html index 8c5e295b9..2e5dfcfd5 100644 --- a/client/src/app/shared/components/list-view-table/list-view-table.component.html +++ b/client/src/app/shared/components/list-view-table/list-view-table.component.html @@ -38,7 +38,7 @@
- No data + {{ 'No data' | translate }}
diff --git a/client/src/app/shared/components/media-upload-content/media-upload-content.component.html b/client/src/app/shared/components/media-upload-content/media-upload-content.component.html index 3b05c2a24..63bb23f0f 100644 --- a/client/src/app/shared/components/media-upload-content/media-upload-content.component.html +++ b/client/src/app/shared/components/media-upload-content/media-upload-content.component.html @@ -27,8 +27,9 @@
- Upload to:  - Base folder + {{ 'Upload to:' | translate }} +   + {{ 'Base folder' | translate }} {{ getDirectory(selectedDirectoryId).title }}
@@ -36,7 +37,9 @@ - + + - + + + - + diff --git a/client/src/app/shared/components/privacy-policy-content/privacy-policy-content.component.html b/client/src/app/shared/components/privacy-policy-content/privacy-policy-content.component.html index d7f38cc38..2e1d2e2d0 100644 --- a/client/src/app/shared/components/privacy-policy-content/privacy-policy-content.component.html +++ b/client/src/app/shared/components/privacy-policy-content/privacy-policy-content.component.html @@ -1,8 +1,8 @@
-
- The event manager hasn't set up a privacy policy yet. +
+ {{ 'The event manager has not set up a privacy policy yet.' | translate }}
diff --git a/client/src/app/shared/components/projection-dialog/projection-dialog.component.html b/client/src/app/shared/components/projection-dialog/projection-dialog.component.html index eb9bc185c..f57c08522 100644 --- a/client/src/app/shared/components/projection-dialog/projection-dialog.component.html +++ b/client/src/app/shared/components/projection-dialog/projection-dialog.component.html @@ -1,5 +1,5 @@

- Project selection? + {{ 'Project selection?' | translate }}

{{ projectorElementBuildDescriptor.getDialogTitle() }} diff --git a/client/src/app/shared/components/sort-filter-bar/sort-filter-bar.component.html b/client/src/app/shared/components/sort-filter-bar/sort-filter-bar.component.html index 6f3e0c178..921e5ba5b 100644 --- a/client/src/app/shared/components/sort-filter-bar/sort-filter-bar.component.html +++ b/client/src/app/shared/components/sort-filter-bar/sort-filter-bar.component.html @@ -1,7 +1,7 @@
- {{ filterCount }} of + {{ filterCount }} {{ 'of' | translate }}  {{ totalCount }}  ยท {{ extraItemInfo }}
@@ -30,10 +30,10 @@ @@ -58,7 +58,7 @@
diff --git a/client/src/app/shared/components/sorting-list/sorting-list.component.html b/client/src/app/shared/components/sorting-list/sorting-list.component.html index 957a2fdd7..bd4660240 100644 --- a/client/src/app/shared/components/sorting-list/sorting-list.component.html +++ b/client/src/app/shared/components/sorting-list/sorting-list.component.html @@ -1,6 +1,6 @@
- No data + {{ 'No data' | translate }}
- {{ multiSelectedIndex.length }} items selected + {{ multiSelectedIndex.length }} {{ 'items selected' | translate }}
diff --git a/client/src/app/shared/components/speaker-button/speaker-button.component.html b/client/src/app/shared/components/speaker-button/speaker-button.component.html index 74cc4befa..af94c160e 100644 --- a/client/src/app/shared/components/speaker-button/speaker-button.component.html +++ b/client/src/app/shared/components/speaker-button/speaker-button.component.html @@ -13,7 +13,7 @@ person - Show profile + {{ 'Show profile' | translate }} @@ -42,19 +42,19 @@ mat-list-item > vpn_key - Change password + {{ 'Change password' | translate }} vpn_key - Change password + {{ 'Change password' | translate }} exit_to_app - Logout + {{ 'Logout' | translate }}
@@ -62,7 +62,7 @@ exit_to_app - Login + {{ 'Login' | translate }} diff --git a/client/src/app/shared/components/voting-privacy-warning/voting-privacy-warning.component.html b/client/src/app/shared/components/voting-privacy-warning/voting-privacy-warning.component.html index d0598e19d..e23e3e9e5 100644 --- a/client/src/app/shared/components/voting-privacy-warning/voting-privacy-warning.component.html +++ b/client/src/app/shared/components/voting-privacy-warning/voting-privacy-warning.component.html @@ -1,15 +1,20 @@

- Secret voting can not be guaranteed + {{ 'Secret voting can not be guaranteed' | translate }}

- - During non-nominal voting OpenSlides does NOT store the individual user ID of the voter. This in no way means that a non-nominal vote is completely anonymous and secure. The votes cannot track their individual votes after the data has been submitted. The validity of the data cannot always be guaranteed. + + {{ + 'During non-nominal voting OpenSlides does NOT store the individual user ID of the voter. This in no way means + that a non-nominal vote is completely anonymous and secure. The votes cannot track their individual votes after + the data has been submitted. The validity of the data cannot always be guaranteed.' + | translate + }}
diff --git a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html index d19363f57..f330d319e 100644 --- a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html +++ b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html @@ -1,6 +1,8 @@ -

Agenda

+
+

{{ 'Agenda' | translate }}

+
@@ -9,7 +11,7 @@
- {{ selectedRows.length }} selected + {{ selectedRows.length }} {{ 'selected' | translate }}
@@ -79,17 +81,17 @@
@@ -99,28 +101,28 @@
@@ -128,26 +130,26 @@
@@ -155,26 +157,26 @@
@@ -193,13 +195,13 @@ @@ -209,7 +211,7 @@ *ngIf="item.contentObjectData.collection !== 'topics/topic'" > remove - Remove from agenda + {{ 'Remove from agenda' | translate }} diff --git a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts index 3b43f4a3d..0b95bd627 100644 --- a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts +++ b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; @@ -36,6 +36,7 @@ import { ViewListOfSpeakers } from '../../models/view-list-of-speakers'; @Component({ selector: 'os-agenda-list', templateUrl: './agenda-list.component.html', + changeDetection: ChangeDetectionStrategy.OnPush, styleUrls: ['./agenda-list.component.scss'] }) export class AgendaListComponent extends BaseListViewComponent implements OnInit { 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 030971da5..df39ecced 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 @@ -1,11 +1,8 @@ - - + -

Sort agenda

+
+

{{ 'Sort agenda' | translate }}

+
@@ -13,7 +10,10 @@
-
Active filters: 
+
+ {{ 'Active filters' | translate }}:  +
- +
- {{ seenNodes[0] }} of {{ seenNodes[1] }} - items + {{ seenNodes[0] }} {{ 'of' | translate }} {{ seenNodes[1] }} + {{ 'items' | translate }}
- Your input does not match the following structure 'hh:mm'... + + {{ 'Your input does not match the following structure: "hh:mm"' | translate }} + @@ -37,6 +37,10 @@
- - + +
diff --git a/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.html b/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.html index 5d1bd5f5e..ce5cdbdc3 100644 --- a/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.html +++ b/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.html @@ -8,9 +8,9 @@

- List of speakers - Current list of speakers - Sort list of speakers + {{ 'List of speakers' | translate }} + {{ 'Current list of speakers' | translate }} + {{ 'Sort list of speakers' | translate }}

@@ -39,7 +39,7 @@ - Last speakers + {{ 'Last speakers' | translate }} @@ -96,7 +96,7 @@ - {{ hasSpokenCount(speaker) + 1 }}. contribution + {{ hasSpokenCount(speaker) + 1 }}. {{ 'contribution' | translate }} ({{ speaker.gender | translate }}) @@ -154,11 +154,11 @@ *ngIf="!isOpInList() && canAddSelf" > add - Add me + {{ 'Add me' | translate }}
@@ -167,7 +167,7 @@ lock_open - Open list of speakers + {{ 'Open list of speakers' | translate }} diff --git a/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.html b/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.html index 74bf74784..0b0190271 100644 --- a/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.html +++ b/client/src/app/site/assignments/components/assignment-detail/assignment-detail.component.html @@ -9,8 +9,8 @@ >
-

Election

-

New election

+

{{ 'Election' | translate }}

+

{{ 'New election' | translate }}

@@ -25,7 +25,7 @@ @@ -37,11 +37,11 @@
@@ -51,7 +51,7 @@ @@ -76,7 +76,7 @@
@@ -98,11 +98,11 @@
-

Number of persons to be elected

+

{{ 'Number of persons to be elected' | translate }}

{{ assignment.assignment.open_posts }}
-

Phase

+

{{ 'Phase' | translate }}

-

Election documents

+

{{ 'Election documents' | translate }}

{{ file.getTitle() }} @@ -136,7 +136,7 @@ -

Candidates

+

{{ 'Candidates' | translate }}

@@ -291,7 +291,7 @@
- Number candidates + {{ 'Number candidates' | translate }}
diff --git a/client/src/app/site/assignments/components/assignment-list/assignment-list.component.html b/client/src/app/site/assignments/components/assignment-list/assignment-list.component.html index c9ba01d89..60466bd7d 100644 --- a/client/src/app/site/assignments/components/assignment-list/assignment-list.component.html +++ b/client/src/app/site/assignments/components/assignment-list/assignment-list.component.html @@ -4,7 +4,9 @@ [multiSelectMode]="isMultiSelect" > -

Elections

+
+

{{ 'Elections' | translate }}

+
- {{ selectedRows.length }} selected + {{ selectedRows.length }} {{ 'selected' | translate }}
@@ -90,28 +92,28 @@
diff --git a/client/src/app/site/assignments/components/assignment-list/assignment-list.component.ts b/client/src/app/site/assignments/components/assignment-list/assignment-list.component.ts index b235cea2e..5af62dfad 100644 --- a/client/src/app/site/assignments/components/assignment-list/assignment-list.component.ts +++ b/client/src/app/site/assignments/components/assignment-list/assignment-list.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; import { ActivatedRoute, Router } from '@angular/router'; @@ -23,6 +23,7 @@ import { AssignmentPhases, ViewAssignment } from '../../models/view-assignment'; @Component({ selector: 'os-assignment-list', templateUrl: './assignment-list.component.html', + changeDetection: ChangeDetectionStrategy.OnPush, styleUrls: ['./assignment-list.component.scss'] }) export class AssignmentListComponent extends BaseListViewComponent implements OnInit { diff --git a/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.html b/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.html index 033fe4e7f..ccd9afe98 100644 --- a/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.html +++ b/client/src/app/site/assignments/components/assignment-poll-detail/assignment-poll-detail.component.html @@ -111,7 +111,7 @@ diff --git a/client/src/app/site/assignments/components/assignment-poll-dialog/assignment-poll-dialog.component.html b/client/src/app/site/assignments/components/assignment-poll-dialog/assignment-poll-dialog.component.html index b5c2245ce..84de94055 100644 --- a/client/src/app/site/assignments/components/assignment-poll-dialog/assignment-poll-dialog.component.html +++ b/client/src/app/site/assignments/components/assignment-poll-dialog/assignment-poll-dialog.component.html @@ -68,11 +68,9 @@
- Publish immediately + {{ 'Publish immediately' | translate }} - - Error in form field. - + {{ 'Error in form field.' | translate }}
@@ -85,11 +83,11 @@ *ngIf="pollForm && dialogVoteForm && pollForm.contentForm" [disabled]="pollForm.contentForm.invalid || dialogVoteForm.invalid" > - Save + {{ 'Save' | translate }}
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 f358ad6c9..f380bf9d4 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 @@ -103,7 +103,7 @@
@@ -112,17 +112,17 @@
diff --git a/client/src/app/site/common/components/count-users/count-users.component.html b/client/src/app/site/common/components/count-users/count-users.component.html index f374b667f..3502d760f 100644 --- a/client/src/app/site/common/components/count-users/count-users.component.html +++ b/client/src/app/site/common/components/count-users/count-users.component.html @@ -1,22 +1,24 @@

- {{ userIds().length }} active users ({{ stats.activeUserHandles }} - connections) + {{ userIds().length }} {{ 'active users' | translate }} ({{ stats.activeUserHandles }} + {{ 'connections' | translate }})

-

Groups

+

{{ 'Groups' | translate }}

  • {{ stats.groups[groupId].name }} : {{ userInGroupIds(groupId).length }} - active users - ({{ stats.groups[groupId].userHandleCount }} connections) + {{ 'active users' | translate }} + ({{ stats.groups[groupId].userHandleCount }} {{ 'connections' | translate }})
diff --git a/client/src/app/site/common/components/error/error.component.html b/client/src/app/site/common/components/error/error.component.html index 53dcb5157..6985cd2fc 100644 --- a/client/src/app/site/common/components/error/error.component.html +++ b/client/src/app/site/common/components/error/error.component.html @@ -1,9 +1,9 @@
-

Error

+

{{ 'Error' | translate }}

 -

You do not have the required permission to see that page!

+

{{ 'You do not have the required permission to see that page!' | translate }}

 diff --git a/client/src/app/site/common/components/legal-notice/legal-notice.component.html b/client/src/app/site/common/components/legal-notice/legal-notice.component.html index ab9d28baf..e69ea55c7 100644 --- a/client/src/app/site/common/components/legal-notice/legal-notice.component.html +++ b/client/src/app/site/common/components/legal-notice/legal-notice.component.html @@ -10,7 +10,7 @@ (saveEvent)="saveChanges()" >
-

Legal notice

+

{{ 'Legal notice' | translate }}

@@ -23,13 +23,13 @@
diff --git a/client/src/app/site/common/components/privacy-policy/privacy-policy.component.html b/client/src/app/site/common/components/privacy-policy/privacy-policy.component.html index 6c832c4ec..b21843c70 100644 --- a/client/src/app/site/common/components/privacy-policy/privacy-policy.component.html +++ b/client/src/app/site/common/components/privacy-policy/privacy-policy.component.html @@ -10,7 +10,7 @@ (saveEvent)="saveChanges()" >
-

Privacy Policy

+

{{ 'Privacy Policy' | translate }}

diff --git a/client/src/app/site/common/components/start/start.component.html b/client/src/app/site/common/components/start/start.component.html index 84ef87fdb..87ac8e75b 100644 --- a/client/src/app/site/common/components/start/start.component.html +++ b/client/src/app/site/common/components/start/start.component.html @@ -8,7 +8,7 @@ (cancelEditEvent)="isEditing = !isEditing" >
-

Home

+

{{ 'Home' | translate }}

@@ -30,7 +30,7 @@ required placeholder="{{ 'Front page title' | translate }}" /> - The title is required + {{ 'The title is required' | translate }} diff --git a/client/src/app/site/common/components/super-search/super-search.component.html b/client/src/app/site/common/components/super-search/super-search.component.html index e126697ef..54fbfa001 100644 --- a/client/src/app/site/common/components/super-search/super-search.component.html +++ b/client/src/app/site/common/components/super-search/super-search.component.html @@ -90,7 +90,7 @@
- No search result found + {{ 'No search result found' | translate }}  ({{ 'with filter' | translate }} "{{ searchCollection | translate }}"). diff --git a/client/src/app/site/config/components/config-list/config-list.component.html b/client/src/app/site/config/components/config-list/config-list.component.html index f9218e0f8..ae68e53a1 100644 --- a/client/src/app/site/config/components/config-list/config-list.component.html +++ b/client/src/app/site/config/components/config-list/config-list.component.html @@ -40,6 +40,6 @@ diff --git a/client/src/app/site/config/components/config-overview/config-overview.component.html b/client/src/app/site/config/components/config-overview/config-overview.component.html index 140deffee..37f8c2e6f 100644 --- a/client/src/app/site/config/components/config-overview/config-overview.component.html +++ b/client/src/app/site/config/components/config-overview/config-overview.component.html @@ -1,7 +1,7 @@
-

Settings

+

{{ 'Settings' | translate }}

@@ -45,6 +45,6 @@ diff --git a/client/src/app/site/config/components/custom-translation/custom-translation.component.html b/client/src/app/site/config/components/custom-translation/custom-translation.component.html index 70e771a35..4677dfcf3 100644 --- a/client/src/app/site/config/components/custom-translation/custom-translation.component.html +++ b/client/src/app/site/config/components/custom-translation/custom-translation.component.html @@ -7,12 +7,12 @@ - You have to fill this field. + {{ 'You have to fill this field.' | translate }} arrow_forward - You have to fill this field. + {{ 'You have to fill this field.' | translate }}
@@ -42,13 +42,13 @@ - Timestamp + {{ 'Timestamp' | translate }} {{ getTimestamp(history) }} - Element + {{ 'Element' | translate }}
{{ getElementInfo(history) | translate }}
- Comment + {{ 'Comment' | translate }} {{ parseInformation(history) }} - Changed by + {{ 'Changed by' | translate }} {{ getUserName(history) }} @@ -82,6 +82,6 @@ diff --git a/client/src/app/site/login/components/login-legal-notice/login-legal-notice.component.html b/client/src/app/site/login/components/login-legal-notice/login-legal-notice.component.html index 9b8fa9e11..35ee19aee 100644 --- a/client/src/app/site/login/components/login-legal-notice/login-legal-notice.component.html +++ b/client/src/app/site/login/components/login-legal-notice/login-legal-notice.component.html @@ -1,5 +1,5 @@
-

Legal notice

+

{{ 'Legal notice' | translate }}

diff --git a/client/src/app/site/login/components/login-privacy-policy/login-privacy-policy.component.html b/client/src/app/site/login/components/login-privacy-policy/login-privacy-policy.component.html index a967c9cbd..8af58cef6 100644 --- a/client/src/app/site/login/components/login-privacy-policy/login-privacy-policy.component.html +++ b/client/src/app/site/login/components/login-privacy-policy/login-privacy-policy.component.html @@ -1,5 +1,5 @@
-

Privacy Policy

+

{{ 'Privacy Policy' | translate }}

diff --git a/client/src/app/site/login/components/login-wrapper/login-wrapper.component.html b/client/src/app/site/login/components/login-wrapper/login-wrapper.component.html index 9de20de93..4bc549666 100644 --- a/client/src/app/site/login/components/login-wrapper/login-wrapper.component.html +++ b/client/src/app/site/login/components/login-wrapper/login-wrapper.component.html @@ -1,16 +1,22 @@
+
+
- ยฉ Copyright by OpenSlides + ยฉ Copyright by OpenSlides · - Legal notice + + {{ 'Legal notice' | translate }} + · - Privacy policy + + {{ 'Privacy policy' | translate }} +
diff --git a/client/src/app/site/login/components/reset-password-confirm/reset-password-confirm.component.html b/client/src/app/site/login/components/reset-password-confirm/reset-password-confirm.component.html index 919961543..8dea176ff 100644 --- a/client/src/app/site/login/components/reset-password-confirm/reset-password-confirm.component.html +++ b/client/src/app/site/login/components/reset-password-confirm/reset-password-confirm.component.html @@ -1,6 +1,6 @@
-

Please enter your new password

+

{{ 'Please enter your new password' | translate }}

- - A password is required + + {{ 'A password is required' | translate }}
diff --git a/client/src/app/site/login/components/reset-password/reset-password.component.html b/client/src/app/site/login/components/reset-password/reset-password.component.html index 5f32e70bc..0af4e2056 100644 --- a/client/src/app/site/login/components/reset-password/reset-password.component.html +++ b/client/src/app/site/login/components/reset-password/reset-password.component.html @@ -1,6 +1,6 @@
-

Enter your email to send the password reset link

+

{{ 'Enter your email to send the password reset link' | translate }}

- - Please enter a valid email address! + + {{ 'Please enter a valid email address!' | translate }}
diff --git a/client/src/app/site/mediafiles/components/media-upload/media-upload.component.html b/client/src/app/site/mediafiles/components/media-upload/media-upload.component.html index 06a7a6566..75e8d41c2 100644 --- a/client/src/app/site/mediafiles/components/media-upload/media-upload.component.html +++ b/client/src/app/site/mediafiles/components/media-upload/media-upload.component.html @@ -1,6 +1,8 @@ -

Upload files

+
+

{{ 'Upload files' | translate }}

+
@@ -23,6 +25,6 @@ diff --git a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html index 292e30a57..9dd482a54 100644 --- a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html +++ b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html @@ -1,7 +1,7 @@
-

Files

+

{{ 'Files' | translate }}

@@ -17,7 +17,7 @@
- {{ selectedRows.length }} selected + {{ selectedRows.length }} {{ 'selected' | translate }}
@@ -93,7 +93,12 @@ >
- + @@ -102,7 +107,12 @@
- + @@ -155,7 +165,7 @@
- No data + {{ 'No data' | translate }}
@@ -203,15 +213,15 @@
@@ -222,22 +232,22 @@
@@ -266,7 +276,7 @@ formControlName="title" placeholder="{{ 'New file name' | translate }}" /> - Required + {{ 'Required' | translate }} @@ -287,10 +297,10 @@ color="primary" (click)="onSaveEditedFile(fileEditForm.value)" > - Save + {{ 'Save' | translate }}
@@ -300,7 +310,7 @@

{{ 'New directory' | translate }}

-

Please enter a name for the new directory:

+

{{ 'Please enter a name for the new directory:' | translate }}

@@ -317,10 +327,10 @@
@@ -328,10 +338,10 @@

- Move into directory + {{ 'Move into directory' | translate }}

-

Please select the directory:

+

{{ 'Please select the directory:' | translate }}

diff --git a/client/src/app/site/motions/modules/amendment-list/amendment-list.component.html b/client/src/app/site/motions/modules/amendment-list/amendment-list.component.html index 7a5ddeb48..d9efd0b03 100644 --- a/client/src/app/site/motions/modules/amendment-list/amendment-list.component.html +++ b/client/src/app/site/motions/modules/amendment-list/amendment-list.component.html @@ -1,6 +1,8 @@ -

Amendments

+
+

{{ 'Amendments' | translate }}

+
@@ -20,7 +22,7 @@
- {{ selectedRows.length }} selected + {{ selectedRows.length }} {{ 'selected' | translate }}
@@ -45,7 +47,7 @@ {{ motion.identifier }}  ·  - Line + {{ 'Line' | translate }}  {{ motion.getChangeLines() }}
@@ -53,14 +55,14 @@
- by + {{ 'by' | translate }} {{ motion.submitters }} · - Sequential number + {{ 'Sequential number' | translate }} {{ motion.id }}
@@ -115,26 +117,26 @@
diff --git a/client/src/app/site/motions/modules/call-list/call-list.component.html b/client/src/app/site/motions/modules/call-list/call-list.component.html index bfa130237..a069aa53d 100644 --- a/client/src/app/site/motions/modules/call-list/call-list.component.html +++ b/client/src/app/site/motions/modules/call-list/call-list.component.html @@ -1,7 +1,7 @@
-

Call list

+

{{ 'Call list' | translate }}

@@ -14,15 +14,18 @@
- {{ seenNodes[0] }} of + {{ seenNodes[0] }} {{ 'of' | translate }}  {{ seenNodes[1] }}
-
Active filters: 
+
+ {{ 'Active filters' | translate }}:  +
@@ -34,9 +37,8 @@ [matBadge]="activeCatFilterCount > 0 ? activeCatFilterCount : null" matBadgeColor="accent" [matBadgeOverlap]="false" - translate > - Categories + {{ 'Categories' | translate }}
@@ -47,9 +49,8 @@ [matBadge]="activeTagFilterCount > 0 ? activeTagFilterCount : null" matBadgeColor="accent" [matBadgeOverlap]="false" - translate > - Tags + {{ 'Tags' | translate }}
@@ -103,18 +104,18 @@ diff --git a/client/src/app/site/motions/modules/category/components/categories-sort/categories-sort.component.html b/client/src/app/site/motions/modules/category/components/categories-sort/categories-sort.component.html index 35b089157..bbe7177de 100644 --- a/client/src/app/site/motions/modules/category/components/categories-sort/categories-sort.component.html +++ b/client/src/app/site/motions/modules/category/components/categories-sort/categories-sort.component.html @@ -1,11 +1,7 @@ - +
-

Sort categories

+

{{ 'Sort categories' | translate }}

 @@ -15,7 +11,8 @@ parentKey="parent_id" weightKey="weight" (hasChanged)="receiveChanges($event)" - [model]="categoriesObservable"> + [model]="categoriesObservable" + > {{ item.getTitle() }} diff --git a/client/src/app/site/motions/modules/category/components/category-detail/category-detail.component.html b/client/src/app/site/motions/modules/category/components/category-detail/category-detail.component.html index 5c5b6201d..3d18c75f2 100644 --- a/client/src/app/site/motions/modules/category/components/category-detail/category-detail.component.html +++ b/client/src/app/site/motions/modules/category/components/category-detail/category-detail.component.html @@ -25,7 +25,9 @@
Title + {{ 'Title' | translate }} + @@ -46,13 +49,17 @@ - File name + {{ 'File name' | translate }} + {{ file.filename }} File information + {{ 'File information' | translate }} +
@@ -69,7 +76,9 @@ -
Access groups + {{ 'Access groups' | translate }} + - Remove + {{ 'Remove' | translate }} + diff --git a/client/src/app/shared/components/motion-poll-detail-content/motion-poll-detail-content.component.html b/client/src/app/shared/components/motion-poll-detail-content/motion-poll-detail-content.component.html index 47fbc459c..a5eb066b4 100644 --- a/client/src/app/shared/components/motion-poll-detail-content/motion-poll-detail-content.component.html +++ b/client/src/app/shared/components/motion-poll-detail-content/motion-poll-detail-content.component.html @@ -4,7 +4,7 @@
Votes{{ 'Votes' | translate }}
- Motion + + {{ 'Motion' | translate }} + {{ motion.getTitle() }} @@ -33,7 +35,9 @@ - State + + {{ 'State' | translate }} + {{ getStateLabel(motion) }} @@ -43,7 +47,9 @@ - Recommendation + + {{ 'Recommendation' | translate }} + {{ getRecommendationLabel(motion) }} @@ -69,20 +75,20 @@ @@ -102,10 +108,10 @@
diff --git a/client/src/app/site/motions/modules/category/components/category-list/category-list.component.html b/client/src/app/site/motions/modules/category/components/category-list/category-list.component.html index 59d6b2aba..37cd772df 100644 --- a/client/src/app/site/motions/modules/category/components/category-list/category-list.component.html +++ b/client/src/app/site/motions/modules/category/components/category-list/category-list.component.html @@ -1,7 +1,7 @@
-

Categories

+

{{ 'Categories' | translate }}

@@ -38,14 +38,14 @@

- New category + {{ 'New category' | translate }}

@@ -60,8 +60,8 @@

- - A name is required + + {{ 'A name is required' | translate }}

@@ -69,10 +69,10 @@
diff --git a/client/src/app/site/motions/modules/category/components/category-motions-sort/category-motions-sort.component.html b/client/src/app/site/motions/modules/category/components/category-motions-sort/category-motions-sort.component.html index 79aa99ada..ae307d02a 100644 --- a/client/src/app/site/motions/modules/category/components/category-motions-sort/category-motions-sort.component.html +++ b/client/src/app/site/motions/modules/category/components/category-motions-sort/category-motions-sort.component.html @@ -8,8 +8,10 @@
{{ sortSelector.multiSelectedIndex.length }}  - selected - + {{ 'selected' | translate }} +
diff --git a/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.html b/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.html index 030da074f..f76603e59 100644 --- a/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.html +++ b/client/src/app/site/motions/modules/motion-block/components/motion-block-detail/motion-block-detail.component.html @@ -37,7 +37,7 @@ [disabled]="isFollowingProhibited()" > - Follow recommendations for all motions + {{ 'Follow recommendations for all motions' | translate }} @@ -85,7 +85,7 @@
- by + {{ 'by' | translate }} {{ motion.submitters }} @@ -93,7 +93,7 @@ · - Sequential number + {{ 'Sequential number' | translate }} {{ motion.id }}
@@ -148,7 +148,7 @@ @@ -163,7 +163,7 @@ [disabled]="isFollowingProhibited()" > done_all - Follow recommendations for all motions + {{ 'Follow recommendations for all motions' | translate }} @@ -174,24 +174,24 @@
@@ -210,10 +210,10 @@
diff --git a/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.html b/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.html index 26a9cd7fb..c9d6c02da 100644 --- a/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.html +++ b/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.html @@ -1,6 +1,8 @@ -

Motion blocks

+
+

{{ 'Motion blocks' | translate }}

+

- New motion block + {{ 'New motion block' | translate }}

- - A title is required + + {{ 'A title is required' | translate }}

- Internal + {{ 'Internal' | translate }}

@@ -97,8 +101,10 @@
+ -
diff --git a/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-list/motion-comment-section-list.component.html b/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-list/motion-comment-section-list.component.html index 19fc1acc2..cb2b92c40 100644 --- a/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-list/motion-comment-section-list.component.html +++ b/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-list/motion-comment-section-list.component.html @@ -1,7 +1,7 @@
-

Comment fields

+

{{ 'Comment fields' | translate }}

@@ -40,18 +40,18 @@
-

Name

+

{{ 'Name' | translate }}

{{ section.name }}
-

Groups with read permissions

+

{{ 'Groups with read permissions' | translate }}

  • {{ group.getTitle() }}
-
No groups selected
-

Groups with write permissions

+
{{ 'No groups selected' | translate }}
+

{{ 'Groups with write permissions' | translate }}

  • {{ group.getTitle() }}
-
No groups selected
+
{{ 'No groups selected' | translate }}

- Edit comment field - New comment field + {{ 'Edit comment field' | translate }} + {{ 'New comment field' | translate }}

@@ -82,7 +82,7 @@ - Required + {{ 'Required' | translate }}

@@ -110,10 +110,10 @@
diff --git a/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-sort/motion-comment-section-sort.component.html b/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-sort/motion-comment-section-sort.component.html index 00a17f88a..0af55917b 100644 --- a/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-sort/motion-comment-section-sort.component.html +++ b/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-sort/motion-comment-section-sort.component.html @@ -1,13 +1,12 @@
-

Sort comments

+

{{ 'Sort comments' | translate }}

 - - + diff --git a/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.html b/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.html index 45b136867..2e02a07d9 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.html +++ b/client/src/app/site/motions/modules/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.html @@ -7,7 +7,9 @@ (cancelEditEvent)="cancelCreation()" > -

New amendment

+
+

{{ 'New amendment' | translate }}

+
@@ -17,12 +19,12 @@ [disabled]="contentForm.value.selectedParagraphs.length === 0" (click)="matStepper.next()" > - Next + {{ 'Next' | translate }}
@@ -59,7 +61,9 @@ {{ 'Change paragraph' | translate }} -

Amendment text

+

+ {{ 'Amendment text' | translate }} +

@@ -84,7 +88,8 @@ : '' " > - Reason * + {{ 'Reason' | translate }} * @@ -95,9 +100,8 @@ (contentForm.get('reason').dirty || contentForm.get('reason').touched) " class="red-warning-text" - translate > - This field is required. + {{ 'This field is required.' | translate }} diff --git a/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.html b/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.html index 516afe296..a9c4291cd 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.html +++ b/client/src/app/site/motions/modules/motion-detail/components/manage-submitters/manage-submitters.component.html @@ -1,5 +1,5 @@

- Submitters + {{ 'Submitters' | translate }} - + +

diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-change-recommendation-dialog/motion-change-recommendation-dialog.component.html b/client/src/app/site/motions/modules/motion-detail/components/motion-change-recommendation-dialog/motion-change-recommendation-dialog.component.html index 172f22d54..12d37d0a8 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-change-recommendation-dialog/motion-change-recommendation-dialog.component.html +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-change-recommendation-dialog/motion-change-recommendation-dialog.component.html @@ -1,4 +1,4 @@ -

New change recommendation

+

{{ 'New change recommendation' | translate }}

@@ -9,11 +9,11 @@

- Changed version in line {{ lineRange.from }}: + {{ 'Changed version in line' | translate }} {{ lineRange.from }}:

- Changed version in line {{ lineRange.from }} to - {{ lineRange.to - 1 }}: + {{ 'Changed version in line' | translate }} {{ lineRange.from }} + {{ 'to' | translate }} {{ lineRange.to - 1 }}:

@@ -25,9 +25,9 @@
diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-comments/motion-comments.component.html b/client/src/app/site/motions/modules/motion-detail/components/motion-comments/motion-comments.component.html index e26b162cc..38af9ae84 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-comments/motion-comments.component.html +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-comments/motion-comments.component.html @@ -12,8 +12,8 @@
-
- No comment +
+ {{ 'No comment' | translate }}
@@ -27,9 +27,9 @@ >
- Touch the book icon to enter text + {{ 'Touch the book icon to enter text' | translate }}
- Do not forget to save your changes! + {{ 'Do not forget to save your changes!' | translate }}
diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.html b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.html index dd6a530f8..5d8c464e6 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.html +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail-diff/motion-detail-diff.component.html @@ -26,7 +26,9 @@ --> - โ€“ Rejected + + โ€“ {{ 'Rejected' | translate }} โ€“ {{ change.stateName | translate }} @@ -150,7 +152,7 @@ (click)="setAcceptanceValue(change, 'accepted')" > thumb_up - Accept + {{ 'Accept' | translate }} {{ change.isAccepted() ? 'done' : '' }} diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html index fbb3e8346..c702a10e1 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html @@ -12,13 +12,13 @@

- Motion + {{ 'Motion' | translate }}   {{ motion.identifier }} {{ contentForm.get('identifier').value }}

-

New motion

-

New amendment

+

{{ 'New motion' | translate }}

+

{{ 'New amendment' | translate }}

@@ -62,7 +62,7 @@ @@ -75,11 +75,11 @@
@@ -145,14 +145,15 @@ - Sequential number {{ motion.id }} + + {{ 'Sequential number' | translate }} {{ motion.id }} + ·  - Amendment to  + {{ 'Amendment to' | translate }}  {{ motion.parent.identifier || motion.parent.title }} @@ -208,7 +209,7 @@
-

Supporters

+

{{ 'Supporters' | translate }}

-

Referring motions

+

{{ 'Referring motions' | translate }}

{{ motion.identifierOrTitle }} ยท @@ -337,7 +338,7 @@
-

Category

+

{{ 'Category' | translate }}

@@ -496,7 +499,7 @@ [ngModelOptions]="{ standalone: true }" [errorStateMatcher]="highlightedLineMatcher" /> - Invalid line number + {{ 'Invalid line number' | translate }}
@@ -718,9 +723,8 @@ (contentForm.get('text').dirty || contentForm.get('text').touched) " class="red-warning-text" - translate > - This field is required. + {{ 'This field is required.' | translate }} @@ -743,9 +747,8 @@ contentForm.get('text_' + paragraph.paragraphNo).touched) " class="red-warning-text" - translate > - This field is required. + {{ 'This field is required.' | translate }}
@@ -766,7 +769,8 @@ : '' " > - Reason * + {{ 'Reason' | translate }} *
@@ -784,9 +788,8 @@ (contentForm.get('reason').dirty || contentForm.get('reason').touched) " class="red-warning-text" - translate > - This field is required. + {{ 'This field is required.' | translate }} @@ -869,7 +872,7 @@
- No changes at the text. + {{ 'No changes at the text.' | translate }}
- - There is an error with this amendment. Please edit it manually. - + {{ + 'There is an error with this amendment. Please edit it manually.' | translate + }}
@@ -913,7 +916,7 @@ *ngIf="motion && motion.isParagraphBasedAmendment()" class="show-entire-text-check" > - Show entire motion text + {{ 'Show entire motion text' | translate }}
@@ -923,32 +926,29 @@
@@ -957,46 +957,41 @@ diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.html b/client/src/app/site/motions/modules/motion-detail/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.html index da2b1cde7..9a66b6c1e 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.html +++ b/client/src/app/site/motions/modules/motion-detail/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.html @@ -1,4 +1,4 @@ -

New change recommendation

+

{{ 'New change recommendation' | translate }}

@@ -11,9 +11,9 @@ diff --git a/client/src/app/site/motions/modules/motion-detail/components/personal-note/personal-note.component.html b/client/src/app/site/motions/modules/motion-detail/components/personal-note/personal-note.component.html index 786923272..18a01f2b3 100644 --- a/client/src/app/site/motions/modules/motion-detail/components/personal-note/personal-note.component.html +++ b/client/src/app/site/motions/modules/motion-detail/components/personal-note/personal-note.component.html @@ -1,7 +1,7 @@ - Personal note + {{ 'Personal note' | translate }} @@ -40,8 +40,8 @@
-
- No personal note +
+ {{ 'No personal note' | translate }}
@@ -54,9 +54,9 @@ >
- Touch the book icon to enter text + {{ 'Touch the book icon to enter text' | translate }}
- Do not forget to save your changes! + {{ 'Do not forget to save your changes!' | translate }}
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 213422b4b..236c23e33 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 @@ -1,16 +1,20 @@ -

Import motions

+
+

{{ 'Import motions' | translate }}

+
- Required comma or semicolon separated values with these column header names in the first row: + {{ + 'Required comma or semicolon separated values with these column header names in the first row:' | translate + }}
@@ -19,18 +23,27 @@
    -
  • - Identifier, reason, submitter, category, origin and motion block are optional and may be empty. +
  • + {{ + 'Identifier, reason, submitter, category, origin and motion block are optional and may be empty.' + | translate + }} +
    • +
  • + {{ + 'Additional columns after the required ones may be present and will not affect the import.' | translate + }}
    • -
  • Additional columns after the required ones may be present and won't affect the import.
- +
- Encoding of the file + {{ 'Encoding of the file' | translate }} @@ -40,7 +53,7 @@ - Column separator + {{ 'Column separator' | translate }} {{ option.label | translate }} @@ -48,7 +61,7 @@ - Text separator + {{ 'Text separator' | translate }} {{ option.label | translate }} @@ -67,7 +80,7 @@ (change)="onSelectFile($event)" />
@@ -75,35 +88,35 @@ -

Preview

+

{{ 'Preview' | translate }}

  playlist_add -  {{ newCount }}  Motion(s) will be imported. +  {{ newCount }}  {{ 'Motion(s) will be imported.' | translate }}
  warning -  {{ nonImportableCount }}  entries will be ommitted. +  {{ nonImportableCount }}  {{ 'entries will be ommitted.' | translate }}
  done -  {{ doneCount }}  Motions have been imported. +  {{ doneCount }}  {{ 'Motions have been imported.' | translate }}
- After verifiy the preview click on 'import' please (see top right). + {{ 'After verifiy the preview click on "import" please (see top right).' | translate }}
- Show all - Show errors only - Show correct entries + {{ 'Show all' | translate }} + {{ 'Show errors only' | translate }} + {{ 'Show correct entries' | translate }}
@@ -135,7 +148,7 @@ - Identifier + {{ 'Identifier' | translate }} - Title + {{ 'Title' | translate }} - Motion text + {{ 'Motion text' | translate }} - Reason + {{ 'Reason' | translate }} {{ getShortPreview(entry.newEntry.reason) }} @@ -189,7 +202,7 @@ - Submitters + {{ 'Submitters' | translate }}
- Category + {{ 'Category' | translate }}
- Tags + {{ 'Tags' | translate }}
- Origin + {{ 'Origin' | translate }} {{ entry.newEntry.origin }} - Motion block + {{ 'Motion block' | translate }}
-

Motions

+
+

{{ 'Motions' | translate }}

+
@@ -12,7 +14,7 @@
- {{ selectedRows.length }} selected + {{ selectedRows.length }} {{ 'selected' | translate }}
@@ -89,7 +91,7 @@
- by + {{ 'by' | translate }} {{ motion.submitters }} @@ -97,7 +99,7 @@ · - Sequential number + {{ 'Sequential number' | translate }} {{ motion.id }}
@@ -228,7 +230,7 @@
@@ -239,7 +241,7 @@ color_lens - Amendments + {{ 'Amendments' | translate }}
@@ -247,7 +249,7 @@
@@ -255,7 +257,7 @@
@@ -267,31 +269,31 @@ @@ -300,14 +302,14 @@
@@ -316,17 +318,17 @@
@@ -337,7 +339,7 @@ (click)="multiselectWrapper(multiselectService.moveToItem(selectedRows))" > sort - Move to agenda item + {{ 'Move to agenda item' | translate }} @@ -406,10 +408,10 @@
diff --git a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.ts b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.ts index 26e611589..c417ba95d 100644 --- a/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.ts +++ b/client/src/app/site/motions/modules/motion-list/components/motion-list/motion-list.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; @@ -89,7 +89,8 @@ interface InfoDialog { @Component({ selector: 'os-motion-list', templateUrl: './motion-list.component.html', - styleUrls: ['./motion-list.component.scss'] + styleUrls: ['./motion-list.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush }) export class MotionListComponent extends BaseListViewComponent implements OnInit { /** diff --git a/client/src/app/site/motions/modules/motion-poll/motion-poll-detail/motion-poll-detail.component.html b/client/src/app/site/motions/modules/motion-poll/motion-poll-detail/motion-poll-detail.component.html index 71f260f0f..6e13dca24 100644 --- a/client/src/app/site/motions/modules/motion-poll/motion-poll-detail/motion-poll-detail.component.html +++ b/client/src/app/site/motions/modules/motion-poll/motion-poll-detail/motion-poll-detail.component.html @@ -90,7 +90,7 @@ diff --git a/client/src/app/site/motions/modules/motion-poll/motion-poll-detail/motion-poll-detail.component.ts b/client/src/app/site/motions/modules/motion-poll/motion-poll-detail/motion-poll-detail.component.ts index 80ba969ca..b30ec81c3 100644 --- a/client/src/app/site/motions/modules/motion-poll/motion-poll-detail/motion-poll-detail.component.ts +++ b/client/src/app/site/motions/modules/motion-poll/motion-poll-detail/motion-poll-detail.component.ts @@ -1,4 +1,4 @@ -import { Component, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, Component, ViewEncapsulation } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; import { ActivatedRoute, Router } from '@angular/router'; @@ -21,6 +21,7 @@ import { BasePollDetailComponent } from 'app/site/polls/components/base-poll-det selector: 'os-motion-poll-detail', templateUrl: './motion-poll-detail.component.html', styleUrls: ['./motion-poll-detail.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None }) export class MotionPollDetailComponent extends BasePollDetailComponent { diff --git a/client/src/app/site/motions/modules/motion-poll/motion-poll-dialog/motion-poll-dialog.component.html b/client/src/app/site/motions/modules/motion-poll/motion-poll-dialog/motion-poll-dialog.component.html index 8485ec086..a80adc7ff 100644 --- a/client/src/app/site/motions/modules/motion-poll/motion-poll-dialog/motion-poll-dialog.component.html +++ b/client/src/app/site/motions/modules/motion-poll/motion-poll-dialog/motion-poll-dialog.component.html @@ -49,18 +49,16 @@
- Publish immediately + {{ 'Publish immediately' | translate }} - - Error in form field. - + {{ 'Error in form field.' | translate }}
diff --git a/client/src/app/site/motions/modules/motion-poll/motion-poll/motion-poll.component.html b/client/src/app/site/motions/modules/motion-poll/motion-poll/motion-poll.component.html index 1826bcbab..b7b973e47 100644 --- a/client/src/app/site/motions/modules/motion-poll/motion-poll/motion-poll.component.html +++ b/client/src/app/site/motions/modules/motion-poll/motion-poll/motion-poll.component.html @@ -109,25 +109,25 @@
diff --git a/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.html b/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.html index 4a1d4333b..85bda9e3d 100644 --- a/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.html +++ b/client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.html @@ -18,7 +18,8 @@
- First state: + {{ 'First state' | translate }}: {{ workflow.first_state.name | translate }}
@@ -26,7 +27,7 @@
- +
Permissions{{ 'Permissions' | translate }}
{{ perm.name | translate }} @@ -144,10 +145,10 @@ color="primary" [mat-dialog-close]="{ action: 'update', value: dialogData.value }" > - Save + {{ 'Save' | translate }}
diff --git a/client/src/app/site/motions/modules/motion-workflow/components/workflow-list/workflow-list.component.html b/client/src/app/site/motions/modules/motion-workflow/components/workflow-list/workflow-list.component.html index 8b3b21b93..666d69f77 100644 --- a/client/src/app/site/motions/modules/motion-workflow/components/workflow-list/workflow-list.component.html +++ b/client/src/app/site/motions/modules/motion-workflow/components/workflow-list/workflow-list.component.html @@ -1,6 +1,8 @@ -

Workflows

+
+

{{ 'Workflows' | translate }}

+

- New workflow + {{ 'New workflow' | translate }}

-

Please enter a name for the new workflow:

+

{{ 'Please enter a name for the new workflow:' | translate }}

@@ -46,10 +48,10 @@ [disabled]="newWorkflowTitle === ''" [mat-dialog-close]="newWorkflowTitle" > - Save + {{ 'Save' | translate }}
diff --git a/client/src/app/site/motions/modules/shared-motion/motion-export-dialog/motion-export-dialog.component.html b/client/src/app/site/motions/modules/shared-motion/motion-export-dialog/motion-export-dialog.component.html index 35aa0e002..764205125 100644 --- a/client/src/app/site/motions/modules/shared-motion/motion-export-dialog/motion-export-dialog.component.html +++ b/client/src/app/site/motions/modules/shared-motion/motion-export-dialog/motion-export-dialog.component.html @@ -4,7 +4,7 @@
-

Format

+

{{ 'Format' | translate }}

PDF CSV @@ -13,64 +13,84 @@
-

Line numbering

+

{{ 'Line numbering' | translate }}

- None - Outside + + {{ 'None' | translate }} + + + {{ 'Outside' | translate }} +
-

Change recommendations

+

{{ 'Change recommendations' | translate }}

- Original version + {{ 'Original version' | translate }} + + + {{ 'Changed version' | translate }} - Changed version - Diff version + {{ 'Diff version' | translate }} + + + {{ 'Final version' | translate }} - Final version
-

Content

+

{{ 'Content' | translate }}

- Text - Reason + + {{ 'Text' | translate }} + + + {{ 'Reason' | translate }} +
-

Meta information

+

{{ 'Meta information' | translate }}

{{ getLabelForMetadata(metaInfo) | translate }} - Speakers + {{ 'Speakers' | translate }} - Voting result + {{ 'Voting result' | translate }}
-

PDF options

+

{{ 'PDF options' | translate }}

- Table of contents - Page numbers - Current date - Enforce page breaks + + {{ 'Table of contents' | translate }} + + + {{ 'Page numbers' | translate }} + + + {{ 'Current date' | translate }} + + + {{ 'Enforce page breaks' | translate }} +
-

Comments

+

{{ 'Comments' | translate }}

- Personal note + {{ 'Personal note' | translate }} {{ comment.name }} @@ -85,8 +105,10 @@
+ -
diff --git a/client/src/app/site/motions/modules/shared-motion/motion-multiselect-actions/motion-multiselect-actions.component.html b/client/src/app/site/motions/modules/shared-motion/motion-multiselect-actions/motion-multiselect-actions.component.html index 71ffa4e65..5fe018f73 100644 --- a/client/src/app/site/motions/modules/shared-motion/motion-multiselect-actions/motion-multiselect-actions.component.html +++ b/client/src/app/site/motions/modules/shared-motion/motion-multiselect-actions/motion-multiselect-actions.component.html @@ -4,7 +4,7 @@ (click)="action.emit(multiselectService.bulkSetFavorite(selectedMotions))" > star - Set favorite + {{ 'Set favorite' | translate }} @@ -70,7 +70,7 @@ diff --git a/client/src/app/site/motions/modules/statute-paragraph/components/statute-import-list/statute-import-list.component.html b/client/src/app/site/motions/modules/statute-paragraph/components/statute-import-list/statute-import-list.component.html index 29fc83015..43afc1ad6 100644 --- a/client/src/app/site/motions/modules/statute-paragraph/components/statute-import-list/statute-import-list.component.html +++ b/client/src/app/site/motions/modules/statute-paragraph/components/statute-import-list/statute-import-list.component.html @@ -1,28 +1,40 @@ -

Import statute

+
+

{{ 'Import statute' | translate }}

+
- Required comma or semicolon separated values with these column header names in the first row: + {{ + 'Required comma or semicolon separated values with these column header names in the first row:' | translate + }}
-
Title, Text
+
+ {{ 'Title' | translate }}, {{ 'Text' | translate }} +
    -
  • Additional columns after the required ones may be present and won't affect the import.
    • +
  • + {{ + 'Additional columns after the required ones may be present and will not affect the import.' | translate + }} +
- +
- Encoding of the file + {{ 'Encoding of the file' | translate }} @@ -32,7 +44,7 @@ - Column separator + {{ 'Column separator' | translate }} {{ option.label | translate }} @@ -40,7 +52,7 @@ - Text separator + {{ 'Text separator' | translate }} {{ option.label | translate }} @@ -58,42 +70,44 @@ (change)="onSelectFile($event)" />
-

Preview

+

{{ 'Preview' | translate }}

  playlist_add -  {{ newCount }}  statute paragraphs(s) will be imported. +  {{ newCount }}  + {{ 'statute paragraphs(s) will be imported.' | translate }}
  warning -  {{ nonImportableCount }}  entries will be ommitted. +  {{ nonImportableCount }}  {{ 'entries will be ommitted.' | translate }}
  done -  {{ doneCount }}  statute paragraphs have been imported. +  {{ doneCount }}  + {{ 'statute paragraphs have been imported.' | translate }}
- After verifiy the preview click on 'import' please (see top right). + {{ 'After verifiy the preview click on "import" please (see top right).' | translate }}
- Show all - Show errors only - Show correct entries + {{ 'Show all' | translate }} + {{ 'Show errors only' | translate }} + {{ 'Show correct entries' | translate }}
@@ -125,7 +139,7 @@ - Title + {{ 'Title' | translate }} - Text + {{ 'Text' | translate }}
-

Statute

+

{{ 'Statute' | translate }}

@@ -14,10 +14,7 @@ - + {{ statuteParagraph.title }} @@ -43,26 +40,26 @@ -
No statute paragraphs
+
{{ 'No statute paragraphs' | translate }}

- Edit statute paragraph - New statute paragraph + {{ 'Edit statute paragraph' | translate }} + {{ 'New statute paragraph' | translate }}

@@ -70,23 +67,23 @@ - Required + {{ 'Required' | translate }}

-

Statute paragraph

+

{{ 'Statute paragraph' | translate }}
diff --git a/client/src/app/site/polls/components/poll-form/poll-form.component.html b/client/src/app/site/polls/components/poll-form/poll-form.component.html index 2ff0ac862..20d3b1d25 100644 --- a/client/src/app/site/polls/components/poll-form/poll-form.component.html +++ b/client/src/app/site/polls/components/poll-form/poll-form.component.html @@ -17,7 +17,7 @@ {{ option.value | translate }} - This field is required. + {{ 'This field is required.' | translate }} {{ 'Not suitable for formal secret voting!' | translate }} @@ -46,7 +46,7 @@ {{ option.value | translate }} - This field is required. + {{ 'This field is required.' | translate }} diff --git a/client/src/app/site/polls/components/poll-list/poll-list.component.html b/client/src/app/site/polls/components/poll-list/poll-list.component.html index a7eb6415a..4ae2d3e24 100644 --- a/client/src/app/site/polls/components/poll-list/poll-list.component.html +++ b/client/src/app/site/polls/components/poll-list/poll-list.component.html @@ -1,5 +1,5 @@ -
List of electronic votes
+
{{ 'List of electronic votes' | translate }}
 {{ poll.votescast }} / {{ max }}
- Received votes + {{ 'Received votes' | translate }}
diff --git a/client/src/app/site/projector/components/countdown-dialog/countdown-dialog.component.html b/client/src/app/site/projector/components/countdown-dialog/countdown-dialog.component.html index 3f927610b..86832bbfb 100644 --- a/client/src/app/site/projector/components/countdown-dialog/countdown-dialog.component.html +++ b/client/src/app/site/projector/components/countdown-dialog/countdown-dialog.component.html @@ -1,5 +1,5 @@

- Countdown + {{ 'Countdown' | translate }}

@@ -34,12 +34,12 @@ [mat-dialog-close]="countdownForm.value" [disabled]="!countdownForm.valid" > - Save + {{ 'Save' | translate }}
diff --git a/client/src/app/site/projector/components/message-dialog/message-dialog.component.html b/client/src/app/site/projector/components/message-dialog/message-dialog.component.html index 5a789fffb..7b0eb9d5b 100644 --- a/client/src/app/site/projector/components/message-dialog/message-dialog.component.html +++ b/client/src/app/site/projector/components/message-dialog/message-dialog.component.html @@ -1,5 +1,5 @@

- Message + {{ 'Message' | translate }}

@@ -16,12 +16,12 @@ [mat-dialog-close]="messageForm.value" [disabled]="!messageForm.valid" > - Save + {{ 'Save' | translate }}
diff --git a/client/src/app/site/projector/components/presentation-control/presentation-control.component.html b/client/src/app/site/projector/components/presentation-control/presentation-control.component.html index a3b01a6e6..defc61488 100644 --- a/client/src/app/site/projector/components/presentation-control/presentation-control.component.html +++ b/client/src/app/site/projector/components/presentation-control/presentation-control.component.html @@ -1,6 +1,6 @@ - Media file + {{ 'Media file' | translate }}
{{ getMediafile(element).getTitle() }} @@ -11,18 +11,23 @@ - fullscreen + {{ 'fullscreen' | translate }}
- - Page {{ getPage(element) }}/{{ getMediafile(element).pages }} -
+ {{ 'Page' | translate }} {{ getPage(element) }}/{{ getMediafile(element).pages }} +
diff --git a/client/src/app/site/projector/components/projector-detail/projector-detail.component.html b/client/src/app/site/projector/components/projector-detail/projector-detail.component.html index 6298e8c90..0fcd8a63d 100644 --- a/client/src/app/site/projector/components/projector-detail/projector-detail.component.html +++ b/client/src/app/site/projector/components/projector-detail/projector-detail.component.html @@ -33,7 +33,7 @@ @@ -143,7 +143,7 @@ [disabled]="projector?.elements_history.length === 0" > arrow_back - Previous + {{ 'Previous' | translate }}
@@ -186,7 +186,7 @@ - Queue + {{ 'Queue' | translate }}
- Countdowns + {{ 'Countdowns' | translate }} @@ -247,7 +247,7 @@ @@ -255,7 +255,7 @@ - Messages + {{ 'Messages' | translate }} @@ -271,7 +271,7 @@ @@ -279,7 +279,7 @@ - Current list of speakers + {{ 'Current list of speakers' | translate }} @@ -293,7 +293,7 @@ > videocam - Slide + {{ 'Slide' | translate }} @@ -308,7 +308,7 @@ > videocam - Overlay + {{ 'Overlay' | translate }} @@ -323,14 +323,14 @@ > videocam - Chyron + {{ 'Chyron' | translate }} - Previous slides + {{ 'Previous slides' | translate }}
  1. diff --git a/client/src/app/site/projector/components/projector-edit-dialog/projector-edit-dialog.component.html b/client/src/app/site/projector/components/projector-edit-dialog/projector-edit-dialog.component.html index 7c8c83363..97ca3841c 100644 --- a/client/src/app/site/projector/components/projector-edit-dialog/projector-edit-dialog.component.html +++ b/client/src/app/site/projector/components/projector-edit-dialog/projector-edit-dialog.component.html @@ -1,5 +1,5 @@

    - Edit projector + {{ 'Edit projector' | translate }}

    @@ -9,11 +9,11 @@ - Required + {{ 'Required' | translate }} -

    Resolution and size

    +

    {{ 'Resolution and size' | translate }}

    @@ -72,28 +72,28 @@
    - Show header and footer + {{ 'Show header and footer' | translate }}
    - Show title + {{ 'Show title' | translate }}
    - Show logo + {{ 'Show logo' | translate }}
    - Show clock + {{ 'Show clock' | translate }}
    -

    Projection defaults

    +

    {{ 'Projection defaults' | translate }}

    @@ -176,18 +182,18 @@
    -

    Preview

    +

    {{ 'Preview' | translate }}

    diff --git a/client/src/app/site/projector/components/projector-list/projector-list.component.html b/client/src/app/site/projector/components/projector-list/projector-list.component.html index 6eef16d0c..d36ffa8e1 100644 --- a/client/src/app/site/projector/components/projector-list/projector-list.component.html +++ b/client/src/app/site/projector/components/projector-list/projector-list.component.html @@ -1,14 +1,14 @@
    -

    Projectors

    +

    {{ 'Projectors' | translate }}

    - New Projector + {{ 'New Projector' | translate }}

    @@ -16,17 +16,17 @@ - Required + {{ 'Required' | translate }}
    diff --git a/client/src/app/site/site.component.html b/client/src/app/site/site.component.html index 197d187ef..20bd32292 100644 --- a/client/src/app/site/site.component.html +++ b/client/src/app/site/site.component.html @@ -48,7 +48,7 @@ (click)="mobileAutoCloseNav()" > info - Legal notice + {{ 'Legal notice' | translate }} security - Privacy policy + {{ 'Privacy policy' | translate }} -

    Tags

    +
    +

    {{ 'Tags' | translate }}

    +

    - Edit tag - New tag + {{ 'Edit tag' | translate }} + {{ 'New tag' | translate }}

    @@ -48,10 +50,10 @@
    diff --git a/client/src/app/site/topics/components/topic-detail/topic-detail.component.html b/client/src/app/site/topics/components/topic-detail/topic-detail.component.html index c1d9660ee..3ec116a89 100644 --- a/client/src/app/site/topics/components/topic-detail/topic-detail.component.html +++ b/client/src/app/site/topics/components/topic-detail/topic-detail.component.html @@ -11,9 +11,9 @@

    - New topic - Edit topic - Topic + {{ 'New topic' | translate }} + {{ 'Edit topic' | translate }} + {{ 'Topic' | translate }}

    @@ -38,7 +38,8 @@

    - Attachments: + {{ 'Attachments' | translate }}: {{ file.getTitle() }} @@ -58,13 +59,13 @@ formControlName="title" placeholder="{{ 'Title' | translate }}" /> - A name is required + {{ 'A name is required' | translate }}

    -

    Text

    +

    {{ 'Text' | translate }}

    @@ -108,7 +109,7 @@
    diff --git a/client/src/app/site/topics/components/topic-import-list/topic-import-list.component.html b/client/src/app/site/topics/components/topic-import-list/topic-import-list.component.html index a0a440b78..197ea0f1e 100644 --- a/client/src/app/site/topics/components/topic-import-list/topic-import-list.component.html +++ b/client/src/app/site/topics/components/topic-import-list/topic-import-list.component.html @@ -1,10 +1,12 @@ -

    Import topics

    +
    +

    {{ 'Import topics' | translate }}

    +
    @@ -15,8 +17,8 @@
    - Paste/write your topics in this textbox. - Keep each item in a single line. + {{ 'Paste/write your topics in this textbox.' | translate }} + {{ 'Keep each item in a single line.' | translate }}