From 501ad5954c6a619830d159a68eb1f94999a71477 Mon Sep 17 00:00:00 2001
From: Ruben Bimberg <ruben.bimberg@mni.thm.de>
Date: Sun, 27 Jun 2021 14:37:45 +0200
Subject: [PATCH] Finish merge with staging
---
.../_dialogs/create-comment/create-comment.component.ts | 5 ++++-
.../shared/_dialogs/spacy-dialog/spacy-dialog.component.ts | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/app/components/shared/_dialogs/create-comment/create-comment.component.ts b/src/app/components/shared/_dialogs/create-comment/create-comment.component.ts
index d5732ec56..5ca59b352 100644
--- a/src/app/components/shared/_dialogs/create-comment/create-comment.component.ts
+++ b/src/app/components/shared/_dialogs/create-comment/create-comment.component.ts
@@ -121,9 +121,12 @@ export class CreateCommentComponent implements OnInit, OnDestroy {
.subscribe((result) => {
if (result.isAcceptable) {
const commentLang = this.languagetoolService.mapLanguageToSpacyModel(result.result.language.code as Language);
+ const selectedLangExtend = this.selectedLang[2] === '-' ? this.selectedLang.substr(0, 2) : this.selectedLang;
// Store language if it was auto-detected
- if(this.selectedLang === 'auto') {
+ if (this.selectedLang === 'auto') {
comment.language = Comment.mapModelToLanguage(commentLang);
+ } else if (CommentLanguage[selectedLangExtend]) {
+ comment.language = CommentLanguage[selectedLangExtend];
}
const dialogRef = this.dialog.open(SpacyDialogComponent, {
data: {
diff --git a/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts b/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts
index 9bdf7571d..45166229b 100644
--- a/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts
+++ b/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts
@@ -1,4 +1,4 @@
-import {AfterContentInit, Component, Inject, OnInit, ViewChild} from '@angular/core';
+import { AfterContentInit, Component, Inject, OnInit, ViewChild } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { CreateCommentComponent } from '../create-comment/create-comment.component';
@@ -6,7 +6,7 @@ import { SpacyService, Model } from '../../../../services/http/spacy.service';
import { LanguagetoolService } from '../../../../services/http/languagetool.service';
import { Comment } from '../../../../models/comment';
import { map } from 'rxjs/operators';
-import {DialogActionButtonsComponent} from "../../dialog/dialog-action-buttons/dialog-action-buttons.component";
+import { DialogActionButtonsComponent } from '../../dialog/dialog-action-buttons/dialog-action-buttons.component';
export interface Keyword {
word: string;
--
GitLab