From 6b8923cfe348195bf8af474965d4f039de77f751 Mon Sep 17 00:00:00 2001
From: Stefan Plociennik <stefan.plociennik@mni.thm.de>
Date: Mon, 28 Jun 2021 20:27:44 +0200
Subject: [PATCH] fixes some merge conflicts
---
.../topic-cloud-administration.component.html | 21 +++++++++----------
src/assets/i18n/creator/de.json | 10 ++++-----
src/assets/i18n/creator/en.json | 10 ++++-----
3 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html
index c282c94d6..c9951cbf3 100644
--- a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html
+++ b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html
@@ -28,15 +28,9 @@
</mat-radio-group>
</mat-card>
- <mat-slide-toggle [(ngModel)]="considerVotes">
- {{'topic-cloud-dialog.consider-votes' | translate}}
- </mat-slide-toggle>
- <div *ngIf="isCreatorOrMod">
- <mat-slide-toggle (change)="changeProfanityFilter()" [(ngModel)]="profanityFilter">
- {{'topic-cloud-dialog.profanity' | translate}}
- </mat-slide-toggle>
- <mat-slide-toggle [(ngModel)]="blacklistIsActive">
- {{'topic-cloud-dialog.hide-blacklist-words' | translate}}
+ <mat-card style="background: none;">
+ <mat-slide-toggle [(ngModel)]="considerVotes">
+ {{'topic-cloud-dialog.consider-votes' | translate}}
</mat-slide-toggle>
</mat-card>
<div *ngIf="isCreatorOrMod">
@@ -255,6 +249,9 @@
</mat-tab>
</mat-tab-group>
</mat-expansion-panel>
+ </mat-accordion>
+
+ <mat-accordion>
<mat-expansion-panel class="color-background">
<mat-expansion-panel-header class="color-background">
<mat-panel-title>
@@ -298,6 +295,7 @@
</table>
</mat-expansion-panel>
</mat-accordion>
+
</mat-expansion-panel>
</mat-accordion>
@@ -349,7 +347,8 @@
</button>
</mat-menu>
- <mat-card class="color-surface" *ngIf="(keywords.length === 0 || (searchMode && filteredKeywords.length === 0))&&!isLoading">
+ <mat-card class="color-surface"
+ *ngIf="(keywords.length === 0 || (searchMode && filteredKeywords.length === 0))&&!isLoading">
<p class="color-on-surface" fxLayoutAlign="center">
{{'topic-cloud-dialog.no-keywords-note' | translate}}
</p>
@@ -409,4 +408,4 @@
</mat-expansion-panel>
</mat-accordion>
</div>
-</mat-dialog-content>
\ No newline at end of file
+</mat-dialog-content>
diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json
index 5c7697fc7..7cc73ca3d 100644
--- a/src/assets/i18n/creator/de.json
+++ b/src/assets/i18n/creator/de.json
@@ -413,11 +413,7 @@
"word-is-not-profanity": "Wort ist nicht profan",
"words-in-profanity": "Profane Wörter",
"language": "Sprache",
- "preview": "Vorschau"
- },
- "dialog-comment": {
- "read-more": "Mehr lesen",
- "read-less": "Weniger lesen",
+ "preview": "Vorschau",
"topic-requirement-title": "Themen Anforderung",
"topic-requirement-questions": "Minimale Anzahl an Fragen",
"topic-requirement-questioners": "Minimale Anzahl an Fragensteller*innen",
@@ -425,6 +421,10 @@
"topic-requirement-begin-datetime": "Frühester Kommentar",
"topic-requirement-end-datetime": "Letzter Kommentar"
},
+ "dialog-comment": {
+ "read-more": "Mehr lesen",
+ "read-less": "Weniger lesen"
+ },
"tag-cloud": {
"demo-data-topic": "Thema %d",
"overview-question-topic-tooltip": "Anzahl gestellter Fragen mit diesem Thema",
diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json
index 463c5fa96..a2873ae08 100644
--- a/src/assets/i18n/creator/en.json
+++ b/src/assets/i18n/creator/en.json
@@ -421,11 +421,7 @@
"word-is-not-profanity": "Word is not profane",
"words-in-profanity": "Words in profanity filter",
"language": "Language",
- "preview": "Preview"
- },
- "dialog-comment": {
- "read-more": "read more",
- "read-less": "read less",
+ "preview": "Preview",
"topic-requirement-title": "Topic requirement",
"topic-requirement-questions": "Minimum number of questions",
"topic-requirement-questioners": "Minimum number of questioners",
@@ -433,6 +429,10 @@
"topic-requirement-begin-datetime": "Earliest comment",
"topic-requirement-end-datetime": "Last comment"
},
+ "dialog-comment": {
+ "read-more": "read more",
+ "read-less": "read less"
+ },
"tag-cloud-config":{
"general":"General",
"overflow":"Overflow",
--
GitLab