From 518b8400e4132bc9698dcd99bff1411f6ed99d3f Mon Sep 17 00:00:00 2001 From: Joe Milazzo Date: Sat, 5 Aug 2023 15:31:03 -0500 Subject: [PATCH] Fixed leftover commas in json (#2183) --- UI/Web/src/app/_interceptors/error.interceptor.ts | 7 ++++--- UI/Web/src/assets/langs/en.json | 4 ++-- openapi.json | 12 ++---------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/UI/Web/src/app/_interceptors/error.interceptor.ts b/UI/Web/src/app/_interceptors/error.interceptor.ts index cb16bcb42..a7815c439 100644 --- a/UI/Web/src/app/_interceptors/error.interceptor.ts +++ b/UI/Web/src/app/_interceptors/error.interceptor.ts @@ -10,7 +10,7 @@ import { Router } from '@angular/router'; import { ToastrService } from 'ngx-toastr'; import { catchError } from 'rxjs/operators'; import { AccountService } from '../_services/account.service'; -import {TranslocoService} from "@ngneat/transloco"; +import {translate, TranslocoService} from "@ngneat/transloco"; @Injectable() export class ErrorInterceptor implements HttpInterceptor { @@ -41,8 +41,9 @@ export class ErrorInterceptor implements HttpInterceptor { break; default: // Don't throw multiple Something unexpected went wrong - if (this.toastr.previousToastMessage !== 'Something unexpected went wrong.' && this.toastr.previousToastMessage !== 'errors.generic') { - this.toast('errors.generic'); + const genericError = this.translocoService.translate('errors.generic'); + if (this.toastr.previousToastMessage !== 'Something unexpected went wrong.' && this.toastr.previousToastMessage !== genericError) { + this.toast(genericError); } break; } diff --git a/UI/Web/src/assets/langs/en.json b/UI/Web/src/assets/langs/en.json index 095f1bc84..42f9bbb03 100644 --- a/UI/Web/src/assets/langs/en.json +++ b/UI/Web/src/assets/langs/en.json @@ -953,7 +953,7 @@ "range-hours": "{{value}} {{hourWord}}", "hour": "Hour", "hours": "Hours", - "read-time-title": "{{series-info-cards.read-time-title}}", + "read-time-title": "{{series-info-cards.read-time-title}}" }, "series-info-cards": { @@ -1706,7 +1706,7 @@ "collection-updated": "Collection updated", "reading-list-deleted": "Reading list deleted", "reading-list-updated": "Reading list updated", - "confirm-delete-reading-list": "'Are you sure you want to delete the reading list? This cannot be undone.'", + "confirm-delete-reading-list": "Are you sure you want to delete the reading list? This cannot be undone.", "item-removed": "Item removed", "nothing-to-remove": "Nothing to remove", "series-added-to-reading-list": "Series added to reading list", diff --git a/openapi.json b/openapi.json index 3532700cf..948ed4477 100644 --- a/openapi.json +++ b/openapi.json @@ -7,7 +7,7 @@ "name": "GPL-3.0", "url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE" }, - "version": "0.7.6.6" + "version": "0.7.6.8" }, "servers": [ { @@ -12031,17 +12031,9 @@ "description": "Volume Id this Chapter belongs to", "format": "int32" }, - "created": { - "type": "string", - "description": "When chapter was created", - "format": "date-time" - }, - "lastModified": { - "type": "string", - "format": "date-time" - }, "createdUtc": { "type": "string", + "description": "When chapter was created", "format": "date-time" }, "lastModifiedUtc": {