Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2025-07-09 03:04:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Shakeout (#2195)

Browse Source 
* Fixed some localization issues. Fixed double slash on base url.

* Weblate Changes (#2194)

* Translated using Weblate (Spanish)

Currently translated at 40.9% (585 of 1427 strings)

Translation: Kavita/ui
Translate-URL: https://hosted.weblate.org/projects/kavita/ui/es/

* Translated using Weblate (Spanish)

Currently translated at 40.9% (585 of 1427 strings)

Translation: Kavita/ui
Translate-URL: https://hosted.weblate.org/projects/kavita/ui/es/

* Translated using Weblate (Dutch)

Currently translated at 48.5% (693 of 1427 strings)

Translation: Kavita/ui
Translate-URL: https://hosted.weblate.org/projects/kavita/ui/nl/

* Translated using Weblate (Portuguese)

Currently translated at 96.8% (153 of 158 strings)

Translation: Kavita/backend
Translate-URL: https://hosted.weblate.org/projects/kavita/backend/pt/

* Translated using Weblate (Portuguese)

Currently translated at 24.3% (348 of 1427 strings)

Translation: Kavita/ui
Translate-URL: https://hosted.weblate.org/projects/kavita/ui/pt/

* Translated using Weblate (Spanish)

Currently translated at 3.7% (6 of 158 strings)

Translation: Kavita/backend
Translate-URL: https://hosted.weblate.org/projects/kavita/backend/es/

* Translated using Weblate (Italian)

Currently translated at 11.2% (161 of 1427 strings)

Translation: Kavita/ui
Translate-URL: https://hosted.weblate.org/projects/kavita/ui/it/

---------

Co-authored-by: ThePromidius <thepromidiusyt@gmail.com>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Co-authored-by: Hans Kalisvaart <hans.kalisvaart@gmail.com>
Co-authored-by: Duarte Silva <smallflake@protonmail.com>
Co-authored-by: Tomas Battistini <tomas.battistini@gmail.com>

---------

Co-authored-by: Weblate (bot) <hosted@weblate.org>
Co-authored-by: ThePromidius <thepromidiusyt@gmail.com>
Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Co-authored-by: Hans Kalisvaart <hans.kalisvaart@gmail.com>
Co-authored-by: Duarte Silva <smallflake@protonmail.com>
Co-authored-by: Tomas Battistini <tomas.battistini@gmail.com>
This commit is contained in:
Joe Milazzo 2023-08-10 08:43:56 -05:00 committed by GitHub
parent 7988353290
commit 17409dd2a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
API/Controllers/AccountController.cs
View File

@ -1018,7 +1018,20 @@ public class AccountController : BaseApiController
if (!string.IsNullOrEmpty(serverSettings.HostName)) origin = serverSettings.HostName;
var baseUrl = string.Empty;
if (!string.IsNullOrEmpty(serverSettings.BaseUrl) && !serverSettings.BaseUrl.Equals(Configuration.DefaultBaseUrl)) baseUrl = serverSettings.BaseUrl + "/";
if (!string.IsNullOrEmpty(serverSettings.BaseUrl) &&
!serverSettings.BaseUrl.Equals(Configuration.DefaultBaseUrl))
{
baseUrl = serverSettings.BaseUrl + "/";
if (baseUrl.EndsWith("//"))
{
baseUrl = baseUrl.Replace("//", "/");
}
if (baseUrl.StartsWith("/"))
{
baseUrl = baseUrl.Substring(1, baseUrl.Length - 1);
}
}
return Ok(origin + "/" + baseUrl + "api/opds/" + user!.ApiKey);
}

7
API/config/appsettings.Development.json
View File

@ -2,6 +2,7 @@
"TokenKey": "super secret unguessable key that is longer because we require it",
"Port": 5000,
"IpAddresses": "",
"BaseUrl": "/",
"Cache": 90
}
"BaseUrl": "/test/",
"Cache": 90,
"XFrameOrigins": "SAMEORIGIN"
}

4
UI/Web/src/app/admin/invite-user/invite-user.component.html
View File

@ -5,9 +5,7 @@
<button type="button" class="btn-close" [attr.aria-label]="t('close')" (click)="close()"></button>
</div>
<div class="modal-body scrollable-modal">
<p>
{{t('description')}}
</p>
<p [innerHTML]="t('description') | safeHtml"></p>
<form [formGroup]="inviteForm" *ngIf="emailLink === ''">
<div class="row g-0">

3
UI/Web/src/app/admin/invite-user/invite-user.component.ts
View File

@ -13,13 +13,14 @@ import { LibrarySelectorComponent } from '../library-selector/library-selector.c
import { RoleSelectorComponent } from '../role-selector/role-selector.component';
import { NgIf } from '@angular/common';
import {translate, TranslocoDirective} from "@ngneat/transloco";
import {SafeHtmlPipe} from "../../pipe/safe-html.pipe";
@Component({
selector: 'app-invite-user',
templateUrl: './invite-user.component.html',
styleUrls: ['./invite-user.component.scss'],
standalone: true,
imports: [NgIf, ReactiveFormsModule, RoleSelectorComponent, LibrarySelectorComponent, RestrictionSelectorComponent, ApiKeyComponent, TranslocoDirective]
imports: [NgIf, ReactiveFormsModule, RoleSelectorComponent, LibrarySelectorComponent, RestrictionSelectorComponent, ApiKeyComponent, TranslocoDirective, SafeHtmlPipe]
})
export class InviteUserComponent implements OnInit {

2
UI/Web/src/app/admin/manage-library/manage-library.component.ts
View File

@ -118,7 +118,7 @@ export class ManageLibraryComponent implements OnInit {
}
async deleteLibrary(library: Library) {
if (await this.confirmService.confirm(translate('toast.confirm-library-delete', {name: library.name}))) {
if (await this.confirmService.confirm(translate('toasts.confirm-library-delete', {name: library.name}))) {
this.deletionInProgress = true;
this.libraryService.delete(library.id).pipe(take(1)).subscribe(() => {
this.deletionInProgress = false;

2
openapi.json
View File

@ -7,7 +7,7 @@
"name": "GPL-3.0",
"url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE"
},
"version": "0.7.6.14"
"version": "0.7.6.15"
},
"servers": [
{