From 80b05fda2f1a46cbaaf2995e4cc3de230585523e Mon Sep 17 00:00:00 2001 From: Ralf Peschke Date: Mon, 14 Jun 2021 15:08:01 +0200 Subject: [PATCH 1/3] Move custom_translation from organization to meeting --- docs/models.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/models.yml b/docs/models.yml index 7bce69ce5..826764f92 100644 --- a/docs/models.yml +++ b/docs/models.yml @@ -71,7 +71,6 @@ organization: privacy_policy: string login_text: string theme: string - custom_translations: JSON reset_password_verbose_errors: boolean # Configuration (only for the server owner) @@ -365,6 +364,7 @@ meeting: enable_anonymous: type: boolean default: False + custom_translations: JSON # Jitsi/Livestream settings conference_show: From 18534b6f755e842be1dcc1157d9cc86fb9bb1fc8 Mon Sep 17 00:00:00 2001 From: Ralf Peschke Date: Mon, 14 Jun 2021 15:18:51 +0200 Subject: [PATCH 2/3] Move custom_translation from organization to meeting: initial and example.json --- docker/initial-data.json | 2 +- docs/example-data.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/initial-data.json b/docker/initial-data.json index 1503737f4..81d25d59f 100644 --- a/docker/initial-data.json +++ b/docker/initial-data.json @@ -8,7 +8,6 @@ "privacy_policy": "", "login_text": "Welcome to OpenSlides. Please login.", "theme": "openslides-theme", - "custom_translations": "", "reset_password_verbose_errors": false, "enable_electronic_voting": false, @@ -104,6 +103,7 @@ "url_name": "openslides_1", "template_for_committee_id": null, "enable_anonymous": false, + "custom_translations": "", "conference_show": false, "conference_auto_connect": false, diff --git a/docs/example-data.json b/docs/example-data.json index 0ef47a3bb..de8bd7104 100644 --- a/docs/example-data.json +++ b/docs/example-data.json @@ -8,7 +8,6 @@ "privacy_policy": "", "login_text": "Guten Morgen!", "theme": "openslides-theme", - "custom_translations": [], "enable_electronic_voting": true, "reset_password_verbose_errors": true, @@ -234,6 +233,7 @@ "url_name": "os3_test", "template_for_committee_id": null, "enable_anonymous": false, + "custom_translations": [], "name": "OpenSlides - Die Veranstaltung (Teil II)", "description": "Presentation and assembly system", From 6816419da9a4ba104f850be176c8590142426995 Mon Sep 17 00:00:00 2001 From: Ralf Peschke Date: Tue, 15 Jun 2021 11:31:48 +0200 Subject: [PATCH 3/3] Initialization of custom_translations as {} --- docker/initial-data.json | 2 +- docs/example-data.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/initial-data.json b/docker/initial-data.json index 81d25d59f..bda3cb05b 100644 --- a/docker/initial-data.json +++ b/docker/initial-data.json @@ -103,7 +103,7 @@ "url_name": "openslides_1", "template_for_committee_id": null, "enable_anonymous": false, - "custom_translations": "", + "custom_translations": {}, "conference_show": false, "conference_auto_connect": false, diff --git a/docs/example-data.json b/docs/example-data.json index de8bd7104..cdf5f5bd7 100644 --- a/docs/example-data.json +++ b/docs/example-data.json @@ -233,7 +233,7 @@ "url_name": "os3_test", "template_for_committee_id": null, "enable_anonymous": false, - "custom_translations": [], + "custom_translations": {}, "name": "OpenSlides - Die Veranstaltung (Teil II)", "description": "Presentation and assembly system",