From c585e4c72b3edfab05a43febfe482ee4c06f8bbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20K=C3=A4sler?= <tom.kaesler@mni.thm.de>
Date: Sun, 28 Jul 2019 00:15:24 +0200
Subject: [PATCH] Move i18n for moderator to creator to avoid double entries
---
src/app/components/creator/creator.module.ts | 2 ++
.../components/moderator/moderator.module.ts | 2 +-
src/assets/i18n/creator/en.json | 3 +-
src/assets/i18n/moderator/de.json | 36 -------------------
src/assets/i18n/moderator/en.json | 36 -------------------
5 files changed, 5 insertions(+), 74 deletions(-)
delete mode 100644 src/assets/i18n/moderator/de.json
delete mode 100644 src/assets/i18n/moderator/en.json
diff --git a/src/app/components/creator/creator.module.ts b/src/app/components/creator/creator.module.ts
index b2838e0e1..09ffadc3a 100644
--- a/src/app/components/creator/creator.module.ts
+++ b/src/app/components/creator/creator.module.ts
@@ -8,6 +8,7 @@ import { ContentTextCreatorComponent } from './content-text-creator/content-text
import { ContentYesNoCreatorComponent } from './content-yes-no-creator/content-yes-no-creator.component';
import { RoomCreatorPageComponent } from './room-creator-page/room-creator-page.component';
import { EssentialsModule } from '../essentials/essentials.module';
+import { ModeratorModule } from '../moderator/moderator.module';
import { RoomDeleteComponent } from './_dialogs/room-delete/room-delete.component';
import { RoomEditComponent } from './_dialogs/room-edit/room-edit.component';
import { AnswerEditComponent } from './_dialogs/answer-edit/answer-edit.component';
@@ -31,6 +32,7 @@ import { ModeratorDeleteComponent } from './_dialogs/moderator-delete/moderator-
CreatorRoutingModule,
EssentialsModule,
SharedModule,
+ ModeratorModule,
TranslateModule.forChild({
loader: {
provide: TranslateLoader,
diff --git a/src/app/components/moderator/moderator.module.ts b/src/app/components/moderator/moderator.module.ts
index 1e1b21a47..2e4159997 100644
--- a/src/app/components/moderator/moderator.module.ts
+++ b/src/app/components/moderator/moderator.module.ts
@@ -35,5 +35,5 @@ export class ModeratorModule {
}
export function HttpLoaderFactory(http: HttpClient) {
- return new TranslateHttpLoader(http, '../../assets/i18n/moderator/', '.json');
+ return new TranslateHttpLoader(http, '../../assets/i18n/creator/', '.json');
}
diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json
index 43956b409..bea4553b4 100644
--- a/src/assets/i18n/creator/en.json
+++ b/src/assets/i18n/creator/en.json
@@ -41,7 +41,8 @@
"session-id": "ID",
"copy-session-id": "Copy Session-ID",
"session-id-copied": "Session-ID was copied to the clipboard.",
- "settings-direct-send": "Send Questions directly to participants"
+ "settings-direct-send": "Send Questions directly to participants",
+ "moderating-stream": "Moderation"
},
"content": {
"content": "Content",
diff --git a/src/assets/i18n/moderator/de.json b/src/assets/i18n/moderator/de.json
deleted file mode 100644
index 5de058b30..000000000
--- a/src/assets/i18n/moderator/de.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "room-page": {
- "session-id": "Session-ID",
- "public-stream": "Öffentliche Kommentare",
- "moderating-stream": "Moderation"
- },
- "comment-list": {
- "search": "Suchen",
- "filter-comments": "Fragen filtern",
- "sort-comments": "Fragen sortieren",
- "add-comment": "Stell deine Frage!",
- "correct": "Bejaht",
- "favorite": "Hervorgehoben",
- "read": "Beantwortet",
- "unread": "Nicht beantwortet",
- "vote-desc": "Absteigende Votes",
- "vote-asc": "Aufsteigende Votes",
- "time": "Zeit"
- },
- "comment-page": {
- "enter-title": "Titel",
- "enter-comment": "Deine Frage",
- "send": "Senden",
- "abort": "Abbrechen",
- "error-comment": "Bitte gib deine Frage ein.",
- "error-title": "Bitte gib einen Titel ein.",
- "error-both-fields": "Bitte fülle alle Felder aus.",
- "no-comments": "Noch keine Fragen",
- "mark-correct": "Dozent/in hat die Frage bejaht.",
- "mark-favorite": "Dozent/in hält die Frage für besonders interessant.",
- "mark-read": "Dozent/in hat die Frage beantwortet.",
- "vote-up": "Hochvoten",
- "vote-down": "Runtervoten",
- "delete": "Löschen"
- }
-}
diff --git a/src/assets/i18n/moderator/en.json b/src/assets/i18n/moderator/en.json
deleted file mode 100644
index 95b3ad265..000000000
--- a/src/assets/i18n/moderator/en.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "room-page": {
- "session-id": "Session-ID",
- "public-stream": "Public Comments",
- "moderating-stream": "Moderation"
- },
- "comment-list": {
- "search": "Search",
- "filter-comments": "Filter questions",
- "sort-comments": "Sort questions",
- "add-comment": "Ask a question!",
- "correct": "Marked as correct by the professor",
- "favorite": "Professor's favorites",
- "read": "Discussed by the professor",
- "unread": "Not yet discussed",
- "vote-desc": "Descending votes",
- "vote-asc": "Ascending votes",
- "time": "Time"
- },
- "comment-page": {
- "enter-title": "Title",
- "enter-comment": "Your question",
- "send": "Send",
- "abort": "Cancel",
- "error-title": "Please enter a title.",
- "error-comment": "Please enter a question.",
- "error-both-fields": "Please fill in all fields.",
- "no-comments": "No questions yet",
- "mark-correct": "Marked as correct by the professor",
- "mark-favorite": "Professor's favorite",
- "mark-read": "Already discussed by the professor",
- "vote-up": "Vote up",
- "vote-down": "Vote down",
- "delete": "Delete"
- }
-}
--
GitLab