Merge pull request #6116 from r-peschke/PR_Move_translation_from_org_to_meeting

- Move custom_translation from organization to meeting
- Initialization of custom_translations as {}
This commit is contained in:
Ralf Peschke 2021-06-15 11:36:06 +02:00 committed by GitHub
commit 8c1fa5be91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View File

@ -8,7 +8,6 @@
"privacy_policy": "", "privacy_policy": "",
"login_text": "Welcome to OpenSlides. Please login.", "login_text": "Welcome to OpenSlides. Please login.",
"theme": "openslides-theme", "theme": "openslides-theme",
"custom_translations": "",
"reset_password_verbose_errors": false, "reset_password_verbose_errors": false,
"enable_electronic_voting": false, "enable_electronic_voting": false,
@ -104,6 +103,7 @@
"url_name": "openslides_1", "url_name": "openslides_1",
"template_for_committee_id": null, "template_for_committee_id": null,
"enable_anonymous": false, "enable_anonymous": false,
"custom_translations": {},
"conference_show": false, "conference_show": false,
"conference_auto_connect": false, "conference_auto_connect": false,

View File

@ -8,7 +8,6 @@
"privacy_policy": "", "privacy_policy": "",
"login_text": "Guten Morgen!", "login_text": "Guten Morgen!",
"theme": "openslides-theme", "theme": "openslides-theme",
"custom_translations": [],
"enable_electronic_voting": true, "enable_electronic_voting": true,
"reset_password_verbose_errors": true, "reset_password_verbose_errors": true,
@ -234,6 +233,7 @@
"url_name": "os3_test", "url_name": "os3_test",
"template_for_committee_id": null, "template_for_committee_id": null,
"enable_anonymous": false, "enable_anonymous": false,
"custom_translations": {},
"name": "OpenSlides - Die Veranstaltung (Teil II)", "name": "OpenSlides - Die Veranstaltung (Teil II)",
"description": "Presentation and assembly system", "description": "Presentation and assembly system",

View File

@ -71,7 +71,6 @@ organization:
privacy_policy: string privacy_policy: string
login_text: string login_text: string
theme: string theme: string
custom_translations: JSON
reset_password_verbose_errors: boolean reset_password_verbose_errors: boolean
# Configuration (only for the server owner) # Configuration (only for the server owner)
@ -365,6 +364,7 @@ meeting:
enable_anonymous: enable_anonymous:
type: boolean type: boolean
default: False default: False
custom_translations: JSON
# Jitsi/Livestream settings # Jitsi/Livestream settings
conference_show: conference_show: