diff --git a/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.html b/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.html index aadff087cfc38dcbd323e9067faa3f68484aba41..cf04bef1a22cb1d9be4f35206be3f1cc4a872aaa 100644 --- a/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.html +++ b/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.html @@ -22,8 +22,6 @@ </mat-label> </ars-row> </span> - <span *ngIf="keywords.length > 0"></span> - <ars-row class="list-container"> <div fxLayout="row" fxLayoutAlign="center center" fxFill> <mat-progress-spinner *ngIf="isLoading" mode="indeterminate"></mat-progress-spinner> @@ -61,10 +59,7 @@ </mat-list> </ars-row> <ars-row> - <span *ngIf="keywords.length <= 0 && !this.isLoading"> - <p>{{ 'spacy-dialog.empty-nouns' | translate }}</p> - </span> - <span *ngIf="!langSupported"> + <span *ngIf="!isLoading && (!langSupported || !hasKeywordsFromSpacy)"> <p class="manual-input-title">{{ 'spacy-dialog.add-manually' | translate }}</p> <textarea class="manual-input" [(ngModel)]="manualKeywords" (input)="manualKeywordsToKeywords()"></textarea> </span> 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 45166229b358cbcc4c6a3c2c4765931d45931961..37f836ac17168aaee562b7bd97c3f8dfb40cbc83 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 @@ -29,10 +29,11 @@ export class SpacyDialogComponent implements OnInit, AfterContentInit { commentBodyChecked: string; keywords: Keyword[] = []; keywordsOriginal: Keyword[] = []; + hasKeywordsFromSpacy = false; isLoading = false; langSupported: boolean; manualKeywords = ''; - _concurrentEdits = 0 + _concurrentEdits = 0; constructor( protected langService: LanguagetoolService, @@ -84,6 +85,7 @@ export class SpacyDialogComponent implements OnInit, AfterContentInit { ) .subscribe(words => { this.keywords = words; + this.hasKeywordsFromSpacy = this.keywords.length > 0; //deep copy this.keywordsOriginal = [...words]; for (let i = 0; i < this.keywordsOriginal.length; i++) { @@ -92,6 +94,7 @@ export class SpacyDialogComponent implements OnInit, AfterContentInit { }, () => { this.keywords = []; this.keywordsOriginal = []; + this.hasKeywordsFromSpacy = false; }, () => { this.isLoading = false; }); @@ -150,6 +153,6 @@ export class SpacyDialogComponent implements OnInit, AfterContentInit { onEditChange(change: number) { this._concurrentEdits += change; - this.appDialogActionButtons.confirmButtonDisabled = (this._concurrentEdits > 0) + this.appDialogActionButtons.confirmButtonDisabled = (this._concurrentEdits > 0); } } diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json index 2002c269489ebc3c0230471daf0ce991b499fc13..6b7b47f167c99cb665721771ffb659dbeae95aef 100644 --- a/src/assets/i18n/creator/de.json +++ b/src/assets/i18n/creator/de.json @@ -95,7 +95,8 @@ "edit-keyword-hint": "Stichwort editieren", "editing-done-hint": "Editierung abschliessen", "force-language-selection": "Automatische Spracherkennung unpräzise, bitte gewählte Sprache prüfen!", - "add-manually": "Geben Sie bitte die Stichwörter unten mit separatem Komma ein" + "add-manually": "Geben Sie bitte die Stichwörter unten mit separatem Komma ein", + "select-keywords": "Wählen Sie die Stichwörter für Ihre Frage aus" }, "comment-page": { "a11y-comment_delete": "Löscht diese Frage", diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json index af74d8abae3339883382be940cc9d6ff2943396e..a6e242a1568137342a2c2a4f1b1b05e7abe96259 100644 --- a/src/assets/i18n/creator/en.json +++ b/src/assets/i18n/creator/en.json @@ -96,7 +96,8 @@ "edit-keyword-hint": "Edit keyword", "editing-done-hint": "Finish editing", "force-language-selection": "Language detection inaccurate, please check language settings!", - "add-manually": "You can manually enter the keywords separated with a comma " + "add-manually": "You can manually enter the keywords separated with a comma", + "select-keywords": "Choose the keywords for your question" }, "comment-page": { "a11y-comment_delete": "Deletes this question", @@ -462,8 +463,8 @@ "highestWeight-tooltip": "show x tags with the highest weight", "rotate-weight": "Rotate some entries of this weight class randomly by x degrees", "font":"Font", - "reset-btn": "Reset", - "font-family-tooltip": "Select font", + "reset-btn": "Reset", + "font-family-tooltip": "Select font", "bold-notation-tooltip": "Select font-thickness bold", "font-style-bold" : "Bold", "font-style-italic": "Italic",