From 07d3df98952111c2ca4be87751c2066521dca679 Mon Sep 17 00:00:00 2001 From: Amelia <77553571+Fesaa@users.noreply.github.com> Date: Fri, 30 May 2025 09:43:49 +0200 Subject: [PATCH] Fix some more missings labels, change some text to be more helpful --- ...g-profile-library-selection.component.html | 5 --- ...g-profile-library-selection.component.scss | 0 ...ing-profile-library-selection.component.ts | 39 ------------------- .../manage-reading-profiles.component.html | 28 ++----------- .../manage-reading-profiles.component.ts | 4 -- UI/Web/src/assets/langs/en.json | 20 +++++----- 6 files changed, 13 insertions(+), 83 deletions(-) delete mode 100644 UI/Web/src/app/user-settings/manage-reading-profiles/_components/library-selection/reading-profile-library-selection.component.html delete mode 100644 UI/Web/src/app/user-settings/manage-reading-profiles/_components/library-selection/reading-profile-library-selection.component.scss delete mode 100644 UI/Web/src/app/user-settings/manage-reading-profiles/_components/library-selection/reading-profile-library-selection.component.ts diff --git a/UI/Web/src/app/user-settings/manage-reading-profiles/_components/library-selection/reading-profile-library-selection.component.html b/UI/Web/src/app/user-settings/manage-reading-profiles/_components/library-selection/reading-profile-library-selection.component.html deleted file mode 100644 index 8c6c7054f..000000000 --- a/UI/Web/src/app/user-settings/manage-reading-profiles/_components/library-selection/reading-profile-library-selection.component.html +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/UI/Web/src/app/user-settings/manage-reading-profiles/_components/library-selection/reading-profile-library-selection.component.scss b/UI/Web/src/app/user-settings/manage-reading-profiles/_components/library-selection/reading-profile-library-selection.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/UI/Web/src/app/user-settings/manage-reading-profiles/_components/library-selection/reading-profile-library-selection.component.ts b/UI/Web/src/app/user-settings/manage-reading-profiles/_components/library-selection/reading-profile-library-selection.component.ts deleted file mode 100644 index 488ca0873..000000000 --- a/UI/Web/src/app/user-settings/manage-reading-profiles/_components/library-selection/reading-profile-library-selection.component.ts +++ /dev/null @@ -1,39 +0,0 @@ -import {Component, Input, OnInit} from '@angular/core'; -import {FormGroup} from "@angular/forms"; -import {ReadingProfile} from "../../../../_models/preferences/reading-profiles"; -import {Library} from "../../../../_models/library/library"; -import {LibraryService} from "../../../../_services/library.service"; -import {ReadingProfileService} from "../../../../_services/reading-profile.service"; -import {TranslocoDirective} from "@jsverse/transloco"; - -@Component({ - selector: 'app-reading-profile-library-selection', - imports: [ - TranslocoDirective - ], - templateUrl: './reading-profile-library-selection.component.html', - styleUrl: './reading-profile-library-selection.component.scss' -}) -export class ReadingProfileLibrarySelectionComponent implements OnInit{ - - @Input({required: true}) readingProfileForm!: FormGroup; - @Input({required: true}) selectedProfile!: ReadingProfile; - - allLibraries: Library[] = [] - - constructor(private libraryService: LibraryService, private readingProfileService: ReadingProfileService) { - } - - ngOnInit(): void { - this.libraryService.getLibraries().subscribe(libs => this.allLibraries = libs); - } - - addToProfile(library: Library) { - this.readingProfileService.addToLibrary(this.selectedProfile.id, library.id).subscribe() - } - - removeFromProfile(library: Library) { - this.readingProfileService.removeFromLibrary(this.selectedProfile.id, library.id).subscribe() - } - -} diff --git a/UI/Web/src/app/user-settings/manage-reading-profiles/manage-reading-profiles.component.html b/UI/Web/src/app/user-settings/manage-reading-profiles/manage-reading-profiles.component.html index 1c8435553..63c351a5d 100644 --- a/UI/Web/src/app/user-settings/manage-reading-profiles/manage-reading-profiles.component.html +++ b/UI/Web/src/app/user-settings/manage-reading-profiles/manage-reading-profiles.component.html @@ -55,10 +55,10 @@ @if (selectedProfile.id !== 0) {
- -
@@ -480,28 +480,6 @@ } - -
  • - {{t('reading-profile-series-settings-title')}} - - @defer (when activeTabId === TabId.Series; prefetch on idle) { - @if (readingProfileForm !== null && selectedProfile !== null) { - } - } - -
    • - -
  • - {{t('reading-profile-library-settings-title')}} - - @defer (when activeTabId === TabId.Libraries; prefetch on idle) { - @if (readingProfileForm !== null && selectedProfile !== null) { - - } - } - -
    • - @@ -518,7 +496,7 @@ -
    {{profile.name | sentenceCase}}
    diff --git a/UI/Web/src/app/user-settings/manage-reading-profiles/manage-reading-profiles.component.ts b/UI/Web/src/app/user-settings/manage-reading-profiles/manage-reading-profiles.component.ts index ad5709790..db551eee0 100644 --- a/UI/Web/src/app/user-settings/manage-reading-profiles/manage-reading-profiles.component.ts +++ b/UI/Web/src/app/user-settings/manage-reading-profiles/manage-reading-profiles.component.ts @@ -44,15 +44,12 @@ import { import {filter} from "rxjs"; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; import {LoadingComponent} from "../../shared/loading/loading.component"; -import {ReadingProfileLibrarySelectionComponent} from "./_components/library-selection/reading-profile-library-selection.component"; import {ToastrService} from "ngx-toastr"; enum TabId { ImageReader = "image-reader", BookReader = "book-reader", PdfReader = "pdf-reader", - Series = "series", - Libraries = "libraries", } @Component({ @@ -85,7 +82,6 @@ enum TabId { NgbNavContent, NgbNavOutlet, LoadingComponent, - ReadingProfileLibrarySelectionComponent ], templateUrl: './manage-reading-profiles.component.html', styleUrl: './manage-reading-profiles.component.scss', diff --git a/UI/Web/src/assets/langs/en.json b/UI/Web/src/assets/langs/en.json index 6bdfe9928..532ad21a5 100644 --- a/UI/Web/src/assets/langs/en.json +++ b/UI/Web/src/assets/langs/en.json @@ -882,7 +882,7 @@ "series-detail": { "page-settings-title": "Page Settings", "close": "{{common.close}}", - "layout-mode-label": "{{user-preferences.layout-mode-book-label}}", + "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}", "layout-mode-option-card": "Card", "layout-mode-option-list": "List", "continue-from": "Continue {{title}}", @@ -1122,31 +1122,31 @@ "reader-settings": { "general-settings-title": "General Settings", - "font-family-label": "{{user-preferences.font-family-label}}", - "font-size-label": "{{user-preferences.font-size-book-label}}", - "line-spacing-label": "{{user-preferences.line-height-book-label}}", - "margin-label": "{{user-preferences.margin-book-label}}", + "font-family-label": "{{manage-reading-profiles.font-family-label}}", + "font-size-label": "{{manage-reading-profiles.font-size-book-label}}", + "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}", + "margin-label": "{{manage-reading-profiles.margin-book-label}}", "reset-to-defaults": "Reset to Defaults", "save-global": "Save to your reading profile", "reader-settings-title": "Reader Settings", - "reading-direction-label": "{{user-preferences.reading-direction-book-label}}", + "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}", "right-to-left": "Right to Left", "left-to-right": "Left to Right", "horizontal": "Horizontal", "vertical": "Vertical", - "writing-style-label": "{{user-preferences.writing-style-label}}", + "writing-style-label": "{{manage-reading-profiles.writing-style-label}}", "writing-style-tooltip": "Changes the direction of the text. Horizontal is left to right, vertical is top to bottom.", "tap-to-paginate-label": "Tap Pagination", "tap-to-paginate-tooltip": "Click the edges of the screen to paginate", "on": "On", "off": "Off", - "immersive-mode-label": "{{user-preferences.immersive-mode-label}}", + "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}", "immersive-mode-tooltip": "This will hide the menu behind a click on the reader document and turn tap to paginate on", "fullscreen-label": "Fullscreen", "fullscreen-tooltip": "Put reader in fullscreen mode", "exit": "Exit", "enter": "Enter", - "layout-mode-label": "{{user-preferences.layout-mode-book-label}}", + "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}", "layout-mode-tooltip": "Scroll: Mirrors epub file (usually one long scrolling page per chapter).
    1 Column: Creates a single virtual page at a time.
    2 Column: Creates two virtual pages at a time laid out side-by-side.", "layout-mode-option-scroll": "Scroll", "layout-mode-option-1col": "1 Column", @@ -2799,7 +2799,7 @@ "manage-reading-profiles": { "description": "Not all your series may be read in the same way, set up distinct reading profiles per library or series to make getting back in your series as seamless as possible.", - "extra-tip": "When changing reading settings for a specific series, an implicit profile is created until you save it to one you created. To keep your list from cluttering with every little change you might need", + "extra-tip": "Assign reading profiles via the action menu on series and libraries, or in bulk. When changing settings in a reader, a hidden profile is created that remembers your choices for that series. This profile is removed when you assign or update one of your own reading profiles to the series.", "profiles-title": "Your reading profiles", "default-profile": "Default", "add": "{{common.add}}",