From b7c9b3f2aee06bc871a32de261446c43b4cd8a06 Mon Sep 17 00:00:00 2001 From: Joshua Sangmeister Date: Tue, 6 Aug 2019 09:56:38 +0200 Subject: [PATCH] w --- client/package.json | 3 +- .../motion-block-list.component.html | 2 +- .../motion-block-list.component.ts | 15 ++-- ...motion-comment-section-list.component.html | 3 +- .../motion-comment-section-list.component.ts | 12 +-- .../statute-paragraph-list.component.html | 3 +- .../statute-paragraph-list.component.ts | 12 +-- .../tag-list/tag-list.component.html | 3 +- .../components/tag-list/tag-list.component.ts | 8 +- client/src/assets/i18n/template-en.pot | 77 ++++++++++++------- openslides/core/views.py | 1 - 11 files changed, 82 insertions(+), 57 deletions(-) diff --git a/client/package.json b/client/package.json index 2ced716f8..81a104ac2 100644 --- a/client/package.json +++ b/client/package.json @@ -24,7 +24,8 @@ "po2json-tempfix": "./node_modules/.bin/po2json -f mf src/assets/i18n/de.po /dev/stdout | sed -f sed_replacements > src/assets/i18n/de.json && ./node_modules/.bin/po2json -f mf src/assets/i18n/cs.po /dev/stdout | sed -f sed_replacements > src/assets/i18n/cs.json", "prettify-check": "prettier --config ./.prettierrc --list-different \"src/{app,environments}/**/*{.ts,.js,.json,.css,.scss}\"", "prettify-write": "prettier --config ./.prettierrc --write \"src/{app,environments}/**/*{.ts,.js,.json,.css,.scss}\"", - "cleanup": "npm run lint-write; npm run prettify-write" + "cleanup": "npm run lint-write; npm run prettify-write", + "cleanup-win": "npm run lint-write & npm run prettify-write" }, "dependencies": { "@angular/animations": "^8.0.3", 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 af403280c..1b9dddd0c 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 @@ -38,7 +38,7 @@

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

diff --git a/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.ts b/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.ts index 478a093ad..ae1afea8d 100644 --- a/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.ts +++ b/client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.ts @@ -13,11 +13,11 @@ import { StorageService } from 'app/core/core-services/storage.service'; import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service'; import { MotionBlockRepositoryService } from 'app/core/repositories/motions/motion-block-repository.service'; import { MotionBlock } from 'app/shared/models/motions/motion-block'; +import { infoDialogSettings } from 'app/shared/utils/dialog-settings'; import { ViewItem } from 'app/site/agenda/models/view-item'; import { BaseListViewComponent } from 'app/site/base/base-list-view'; import { ViewMotionBlock } from 'app/site/motions/models/view-motion-block'; import { MotionBlockSortService } from 'app/site/motions/services/motion-block-sort.service'; -import { infoDialogSettings } from 'app/shared/utils/dialog-settings'; /** * Table for the motion blocks @@ -147,11 +147,11 @@ export class MotionBlockListComponent extends BaseListViewComponent { + dialogRef.afterClosed().subscribe(res => { if (res) { this.save(); } - }) + }); } /** @@ -163,13 +163,8 @@ export class MotionBlockListComponent extends BaseListViewComponent

- {{ (currentComment ? "Edit comment field" : "New comment field") | translate }} + Edit comment field + New comment field

diff --git a/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-list/motion-comment-section-list.component.ts b/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-list/motion-comment-section-list.component.ts index 6a72f1c15..b2eb97269 100644 --- a/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-list/motion-comment-section-list.component.ts +++ b/client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-list/motion-comment-section-list.component.ts @@ -11,10 +11,10 @@ import { MotionCommentSectionRepositoryService } from 'app/core/repositories/mot import { GroupRepositoryService } from 'app/core/repositories/users/group-repository.service'; import { PromptService } from 'app/core/ui-services/prompt.service'; import { MotionCommentSection } from 'app/shared/models/motions/motion-comment-section'; +import { infoDialogSettings } from 'app/shared/utils/dialog-settings'; import { BaseViewComponent } from 'app/site/base/base-view'; import { ViewMotionCommentSection } from 'app/site/motions/models/view-motion-comment-section'; import { ViewGroup } from 'app/site/users/models/view-group'; -import { infoDialogSettings } from 'app/shared/utils/dialog-settings'; /** * List view for the comment sections. @@ -110,7 +110,7 @@ export class MotionCommentSectionListComponent extends BaseViewComponent impleme write_groups_id: commentSection ? commentSection.write_groups_id : [] }); const dialogRef = this.dialog.open(this.motionCommentDialog, infoDialogSettings); - dialogRef.afterClosed().subscribe((res) => { + dialogRef.afterClosed().subscribe(res => { if (res) { this.save(); } @@ -124,10 +124,12 @@ export class MotionCommentSectionListComponent extends BaseViewComponent impleme if (this.commentFieldForm.valid) { // eiher update or create if (this.currentComment) { - this.repo.update(this.commentFieldForm.value as Partial, this.currentComment).catch(this.raiseError); + this.repo + .update(this.commentFieldForm.value as Partial, this.currentComment) + .catch(this.raiseError); } else { - const c = new MotionCommentSection(this.commentFieldForm.value); - this.repo.create(c).catch(this.raiseError); + const comment = new MotionCommentSection(this.commentFieldForm.value); + this.repo.create(comment).catch(this.raiseError); } this.commentFieldForm.reset(); } diff --git a/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.html b/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.html index 8d4baf4a7..fcccfbbcd 100644 --- a/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.html +++ b/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.html @@ -64,7 +64,8 @@

- {{ ((currentStatuteParagraph ? "Edit" : "New") + "statute paragraph") | translate }} + Edit statute paragraph + New statute paragraph

diff --git a/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.ts b/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.ts index ae7e9dca5..eee59d970 100644 --- a/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.ts +++ b/client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.ts @@ -9,10 +9,10 @@ import { TranslateService } from '@ngx-translate/core'; import { StatuteParagraphRepositoryService } from 'app/core/repositories/motions/statute-paragraph-repository.service'; import { PromptService } from 'app/core/ui-services/prompt.service'; import { StatuteParagraph } from 'app/shared/models/motions/statute-paragraph'; +import { largeDialogSettings } from 'app/shared/utils/dialog-settings'; import { BaseViewComponent } from 'app/site/base/base-view'; import { ViewStatuteParagraph } from 'app/site/motions/models/view-statute-paragraph'; import { StatuteCsvExportService } from 'app/site/motions/services/statute-csv-export.service'; -import { largeDialogSettings } from 'app/shared/utils/dialog-settings'; /** * List view for the statute paragraphs. @@ -95,7 +95,7 @@ export class StatuteParagraphListComponent extends BaseViewComponent implements }); } const dialogRef = this.dialog.open(this.statuteParagraphDialog, largeDialogSettings); - dialogRef.afterClosed().subscribe((res) => { + dialogRef.afterClosed().subscribe(res => { if (res) { this.save(); } @@ -109,10 +109,12 @@ export class StatuteParagraphListComponent extends BaseViewComponent implements if (this.statuteParagraphForm.valid) { // eiher update or create if (this.currentStatuteParagraph) { - this.repo.update(this.statuteParagraphForm.value as Partial, this.currentStatuteParagraph).catch(this.raiseError); + this.repo + .update(this.statuteParagraphForm.value as Partial, this.currentStatuteParagraph) + .catch(this.raiseError); } else { - const p = new StatuteParagraph(this.statuteParagraphForm.value); - this.repo.create(p).catch(this.raiseError); + const paragraph = new StatuteParagraph(this.statuteParagraphForm.value); + this.repo.create(paragraph).catch(this.raiseError); } this.statuteParagraphForm.reset(); } diff --git a/client/src/app/site/tags/components/tag-list/tag-list.component.html b/client/src/app/site/tags/components/tag-list/tag-list.component.html index 651d0be7c..740d706ed 100644 --- a/client/src/app/site/tags/components/tag-list/tag-list.component.html +++ b/client/src/app/site/tags/components/tag-list/tag-list.component.html @@ -37,7 +37,8 @@

- {{ (currentTag ? 'Edit tag' : 'New tag') | translate }} + Edit tag + New tag

diff --git a/client/src/app/site/tags/components/tag-list/tag-list.component.ts b/client/src/app/site/tags/components/tag-list/tag-list.component.ts index 4b2200f20..38da6f29a 100644 --- a/client/src/app/site/tags/components/tag-list/tag-list.component.ts +++ b/client/src/app/site/tags/components/tag-list/tag-list.component.ts @@ -10,9 +10,9 @@ import { PblColumnDefinition } from '@pebula/ngrid'; import { TagRepositoryService } from 'app/core/repositories/tags/tag-repository.service'; import { PromptService } from 'app/core/ui-services/prompt.service'; import { Tag } from 'app/shared/models/core/tag'; +import { infoDialogSettings } from 'app/shared/utils/dialog-settings'; import { BaseListViewComponent } from 'app/site/base/base-list-view'; import { ViewTag } from '../../models/view-tag'; -import { infoDialogSettings } from 'app/shared/utils/dialog-settings'; /** * Listview for the complete list of available Tags @@ -94,11 +94,11 @@ export class TagListComponent extends BaseListViewComponent implements this.tagForm.reset(); this.tagForm.get('name').setValue(this.currentTag ? this.currentTag.name : ''); const dialogRef = this.dialog.open(this.tagDialog, infoDialogSettings); - dialogRef.afterClosed().subscribe((res) => { + dialogRef.afterClosed().subscribe(res => { if (res) { this.save(); } - }) + }); } /** @@ -113,7 +113,7 @@ export class TagListComponent extends BaseListViewComponent implements } else { this.repo.create(this.tagForm.value).catch(this.raiseError); } - this.tagForm.reset(); // reset here so pressing shift+enter wont save when dialog isnt open + this.tagForm.reset(); // reset here so pressing shift+enter wont save when dialog isnt open } /** diff --git a/client/src/assets/i18n/template-en.pot b/client/src/assets/i18n/template-en.pot index 6f9671ca0..c6e930f80 100644 --- a/client/src/assets/i18n/template-en.pot +++ b/client/src/assets/i18n/template-en.pot @@ -174,9 +174,6 @@ msgstr "" msgid "Amendments can change multiple paragraphs" msgstr "" -msgid "An email with a password reset link was send!" -msgstr "" - msgid "An unknown error occurred." msgstr "" @@ -252,6 +249,11 @@ msgstr "" msgid "Are you sure you want to delete this workflow?" msgstr "" +msgid "" +"Are you sure you want to generate new passwords for all selected " +"participants?" +msgstr "" + msgid "Are you sure you want to number all agenda items?" msgstr "" @@ -272,6 +274,9 @@ msgstr "" msgid "Are you sure you want to renumber all motions of this category?" msgstr "" +msgid "Are you sure you want to reset all passwords to the default ones?" +msgstr "" + msgid "Are you sure you want to send an invitation email to the user?" msgstr "" @@ -737,18 +742,12 @@ msgstr "" msgid "Edit" msgstr "" -msgid "Edit comment field:" -msgstr "" - msgid "Edit details" msgstr "" msgid "Edit details for" msgstr "" -msgid "Edit statute paragraph:" -msgstr "" - msgid "Edit the whole motion text" msgstr "" @@ -927,6 +926,9 @@ msgid "" "candidate the sum of all votes is 100 %." msgstr "" +msgid "Foreground color" +msgstr "" + msgid "Forgot Password?" msgstr "" @@ -1043,6 +1045,9 @@ msgstr "" msgid "Import topics" msgstr "" +msgid "Inactive" +msgstr "" + msgid "Initial password" msgstr "" @@ -1301,9 +1306,6 @@ msgstr "" msgid "New change recommendation" msgstr "" -msgid "New comment field" -msgstr "" - msgid "New directory" msgstr "" @@ -1331,12 +1333,6 @@ msgstr "" msgid "New state" msgstr "" -msgid "New statute paragraph" -msgstr "" - -msgid "New tag name" -msgstr "" - msgid "New topic" msgstr "" @@ -1421,6 +1417,12 @@ msgstr "" msgid "None" msgstr "" +msgid "Noone" +msgstr "" + +msgid "Note, that the default password will be changed to the new generated one." +msgstr "" + msgid "" "Note: Your own password was not changed. Please use the password change " "dialog instead." @@ -1823,6 +1825,9 @@ msgstr "" msgid "Reset password" msgstr "" +msgid "Reset passwords to the default ones" +msgstr "" + msgid "Reset recommendation" msgstr "" @@ -1910,9 +1915,6 @@ msgstr "" msgid "Serially numbered" msgstr "" -msgid "Set active status for selected participants:" -msgstr "" - msgid "Set as favorite" msgstr "" @@ -1928,9 +1930,6 @@ msgstr "" msgid "Set committee ..." msgstr "" -msgid "Set committee status for selected participants:" -msgstr "" - msgid "Set favorite" msgstr "" @@ -1952,9 +1951,6 @@ msgstr "" msgid "Set presence ..." msgstr "" -msgid "Set presence status for selected participants:" -msgstr "" - msgid "Set public" msgstr "" @@ -2042,6 +2038,9 @@ msgstr "" msgid "Sort" msgstr "" +msgid "Sort Comments" +msgstr "" + msgid "Sort agenda" msgstr "" @@ -2108,6 +2107,9 @@ msgstr "" msgid "Structure level" msgstr "" +msgid "Subcategory" +msgstr "" + msgid "Submitters" msgstr "" @@ -2162,6 +2164,9 @@ msgstr "" msgid "The assembly may decide:" msgstr "" +msgid "The event manager hasn't set up a legal notice yet." +msgstr "" + msgid "The event manager hasn't set up a privacy policy yet." msgstr "" @@ -2177,11 +2182,17 @@ msgstr "" msgid "The link is broken. Please contact your system administrator." msgstr "" +msgid "The list of speakers is closed" +msgstr "" + msgid "" "The maximum number of characters per line. Relevant when line numbering is " "enabled. Min: 40" msgstr "" +msgid "The number has to be greater than \"0\" " +msgstr "" + msgid "The reason field may not be blank." msgstr "" @@ -2204,6 +2215,9 @@ msgstr "" msgid "The text field may not be blank." msgstr "" +msgid "The title is required" +msgstr "" + msgid "The title of the motion is always applied." msgstr "" @@ -2222,6 +2236,9 @@ msgstr "" msgid "This element does not exist at this time." msgstr "" +msgid "This field is required" +msgstr "" + msgid "This field is required." msgstr "" @@ -2408,6 +2425,9 @@ msgstr "" msgid "Web interface header logo" msgstr "" +msgid "Web workers are not supported on your browser." +msgstr "" + msgid "Welcome to OpenSlides" msgstr "" @@ -2692,4 +2712,7 @@ msgid "with local storage" msgstr "" msgid "withdrawed" +msgstr "" + +msgid "{{ option.label }}" msgstr "" \ No newline at end of file diff --git a/openslides/core/views.py b/openslides/core/views.py index 71ef04fc8..11f71b968 100644 --- a/openslides/core/views.py +++ b/openslides/core/views.py @@ -186,7 +186,6 @@ class ProjectorViewSet(ModelViewSet): If `reset_scroll` is True, the scoll of the projector will reset. """ projector = self.get_object() - projector.scroll = 0 elements = request.data.get("elements") preview = request.data.get("preview") history_element = request.data.get("append_to_history")