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 1ec035038d65be930905ed4c900b084b39da5f74..2486376ddd4b319ab42b533b6fa64027ca6fe453 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
@@ -7,8 +7,8 @@
<mat-slide-toggle (change)="refreshAllLists()" [(ngModel)]="profanityFilter">
{{'topic-cloud-dialog.profanity' | translate}}
</mat-slide-toggle>
- <mat-slide-toggle [(ngModel)]="hideIrrelevant">
- {{'topic-cloud-dialog.hide-irrelevant' | translate}}
+ <mat-slide-toggle [(ngModel)]="hideBlacklist">
+ {{'topic-cloud-dialog.hide-blacklist' | translate}}
</mat-slide-toggle>
<mat-accordion class="new-Badword" multi>
@@ -47,24 +47,24 @@
</mat-expansion-panel>
<mat-expansion-panel class="color-background"
- (opened)="enterIrrelevantWord = true; focusInput('irrelevant-word-input')"
- (closed)="enterIrrelevantWord = false">
+ (opened)="enterBlacklistWord = true; focusInput('blacklist-word-input')"
+ (closed)="enterBlacklistWord = false">
<mat-expansion-panel-header class="color-background">
<mat-panel-description>
- {{'topic-cloud-dialog.edit-irrelevant-list' | translate}}
+ {{'topic-cloud-dialog.edit-blacklist-list' | translate}}
</mat-panel-description>
</mat-expansion-panel-header>
<mat-form-field>
<mat-label>{{'topic-cloud-dialog.enter-word' | translate}}</mat-label>
- <input matInput id="irrelevant-word-input" [(ngModel)]="newIrrelevantWord">
+ <input matInput id="blacklist-word-input" [(ngModel)]="newBlacklistWord">
</mat-form-field>
- <button mat-stroked-button color="primary" class="margin-left" (click)="addIrrelevantWord()">
+ <button mat-stroked-button color="primary" class="margin-left" (click)="addBlacklistWord()">
{{'topic-cloud-dialog.add-word' | translate}}
</button>
- <mat-list role="list" *ngIf="showIrrelevantWordList">
+ <mat-list role="list" *ngIf="showBlacklistWordList">
<mat-list-item class="color-on-surface" *ngFor="let word of getBadWordList()" role="listitem">{{word}}
<button style="margin-left: auto" mat-icon-button class="red">
<mat-icon mat-list-icon style="margin-bottom: 6px;">delete</mat-icon>
@@ -73,9 +73,9 @@
</mat-list>
<div>
- <button mat-raised-button *ngIf="getIrrelevantWordList().length > 0" class="primaryBackground"
- (click)="showIrrelevantWordList=!showIrrelevantWordList">
- {{showIrrelevantWordList ? "Hide irrelevantword list" : "Show irrelevantword list"}}
+ <button mat-raised-button *ngIf="getBlacklistWordList().length > 0" class="primaryBackground"
+ (click)="showBlacklistWordList=!showBlacklistWordList">
+ {{showBlacklistWordList ? "Hide blacklistword list" : "Show blacklistword list"}}
</button>
</div>
diff --git a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts
index 94adf89a7f01ad72c4b581c7670d0148ef59ceb9..4c6cbb19d84c87e763e325e74700ac475ccf84f9 100644
--- a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts
+++ b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts
@@ -18,21 +18,21 @@ export class TopicCloudAdministrationComponent implements OnInit {
public panelOpenState = false;
public considerVotes: boolean; // should be sent back to tagCloud component
public profanityFilter = true; // should be sent back to tagCloud component
- public hideIrrelevant: boolean; // should be sent back to tagCloud component
+ public hideBlacklist: boolean; // should be sent back to tagCloud component
newKeyword = undefined;
edit = false;
isCreatorOrMod: boolean;
enterBadword = false;
- enterIrrelevantWord = false;
+ enterBlacklistWord = false;
newBadWord: string = undefined;
- newIrrelevantWord: string = undefined;
+ newBlacklistWord: string = undefined;
sortMode = 'alphabetic';
searchedKeyword = undefined;
searchMode = false;
filteredKeywords: Keyword[] = [];
showBadWordList = false;
- showIrrelevantWordList = false;
+ showBlacklistWordList = false;
keywords: Keyword[] = [
{
@@ -123,8 +123,8 @@ export class TopicCloudAdministrationComponent implements OnInit {
return this.topicCloudAdminService.getBadWordList();
}
- getIrrelevantWordList() {
- return this.topicCloudAdminService.getIrrelevantWordList();
+ getBlacklistWordList() {
+ return this.topicCloudAdminService.getBlacklistWordList();
}
sortQuestions(sortMode?: string) {
@@ -267,9 +267,9 @@ export class TopicCloudAdministrationComponent implements OnInit {
}
}
- addIrrelevantWord() {
- this.topicCloudAdminService.addToIrrelevantwordList(this.newIrrelevantWord);
- this.newIrrelevantWord = undefined;
+ addBlacklistWord() {
+ this.topicCloudAdminService.addToBlacklistWordList(this.newBlacklistWord);
+ this.newBlacklistWord = undefined;
if (this.searchMode){
this.searchKeyword();
}
diff --git a/src/app/services/util/topic-cloud-admin.service.ts b/src/app/services/util/topic-cloud-admin.service.ts
index b85bd9a158eccc5523e907b2d7dd76bae3125107..616fc7507b0b21f2e1ceb3d3998974535a691e33 100644
--- a/src/app/services/util/topic-cloud-admin.service.ts
+++ b/src/app/services/util/topic-cloud-admin.service.ts
@@ -8,8 +8,8 @@ import * as BadWords from 'naughty-words';
export class TopicCloudAdminService {
private badWords = [];
private profanityWords = [];
- private irrelevantWords = []; // should be stored in backend
- private blacklistKey = 'custom-Profanity-List';
+ private blacklist = []; // should be stored in backend
+ private profanityKey = 'custom-Profanity-List';
constructor() {
this.badWords = BadWords;
@@ -38,7 +38,7 @@ export class TopicCloudAdminService {
}
getBadWordList(): string[] {
- const list = localStorage.getItem(this.blacklistKey);
+ const list = localStorage.getItem(this.profanityKey);
return list ? list.split(',') : [];
}
@@ -49,7 +49,7 @@ export class TopicCloudAdminService {
return;
}
newList.push(word);
- localStorage.setItem(this.blacklistKey, newList.toString());
+ localStorage.setItem(this.profanityKey, newList.toString());
}
}
@@ -60,25 +60,25 @@ export class TopicCloudAdminService {
list.splice(list.indexOf(word, 0), 1);
}
});
- localStorage.setItem(this.blacklistKey, list.toString());
+ localStorage.setItem(this.profanityKey, list.toString());
}
removeBadwordList(){
- localStorage.removeItem(this.blacklistKey);
+ localStorage.removeItem(this.profanityKey);
}
- getIrrelevantWordList(): string[] {
- return this.irrelevantWords;
+ getBlacklistWordList(): string[] {
+ return this.blacklist;
}
- addToIrrelevantwordList(word: string) {
+ addToBlacklistWordList(word: string) {
if (word !== undefined) {
- this.irrelevantWords.push(word);
+ this.blacklist.push(word);
}
}
- removeFromIrrelevantWordList(irrelevantWord: string) {
- this.irrelevantWords.splice(this.irrelevantWords.indexOf(irrelevantWord), 1);
+ removeWordFromBlacklist(word: string) {
+ this.blacklist.splice(this.blacklist.indexOf(word), 1);
}
diff --git a/src/assets/i18n/participant/de.json b/src/assets/i18n/participant/de.json
index e6ebe2e09a8b550aae02c9b8e5d96136e3c9d2c9..6ed6e6f341b102d2b1141a96293ede6d4d20fc17 100644
--- a/src/assets/i18n/participant/de.json
+++ b/src/assets/i18n/participant/de.json
@@ -237,13 +237,13 @@
"no-keywords-note": "Es gibt keine Themen",
"consider-votes": "Votes berücksichtigen",
"profanity": "Schimpfwörter zensieren",
- "hide-irrelevant": "Irrelevante Stichworte verbergen",
+ "hide-blacklist": "Blackliste Stichworte verbergen",
"sort-alpha": "Alphabetisch",
"sort-count": "Fragenanzahl",
"sort-vote": "Votes",
"keyword-search": "Stichwort suchen",
"edit-profanity-list": "Zensurliste bearbeiten",
- "edit-irrelevant-list": "Irrelevantliste bearbeiten",
+ "edit-blacklist-list": "Blacklistliste bearbeiten",
"add-word": "Wort hinzufügen",
"enter-word": "Wort eingeben"
},
diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json
index 17fe905e57a4c48a270258bc57a284c248e5e977..b323ef8c160983921a7021371af8056d889c5c4a 100644
--- a/src/assets/i18n/participant/en.json
+++ b/src/assets/i18n/participant/en.json
@@ -242,13 +242,13 @@
"no-keywords-note": "There are no topics!",
"consider-votes": "Consider Votes",
"profanity": "Censor profanity",
- "hide-irrelevant": "Hide irrelevant keywords",
+ "hide-blacklist": "Hide blacklist keywords",
"sort-alpha": "Alphabetically",
"sort-count": "Questions count",
"sort-vote": "Votes",
"keyword-search": "Search keyword",
"edit-profanity-list": "Edit profanity list",
- "edit-irrelevant-list": "Edit irrelevant list",
+ "edit-blacklist-list": "Edit blacklist list",
"add-word": "Add Word",
"enter-word": "Enter word"
},