{{log}}
diff --git a/src-ui/src/app/components/manage/logs/logs.component.scss b/src-ui/src/app/components/manage/logs/logs.component.scss index aae238167..834c8c1cb 100644 --- a/src-ui/src/app/components/manage/logs/logs.component.scss +++ b/src-ui/src/app/components/manage/logs/logs.component.scss @@ -17,7 +17,7 @@ .log-container { overflow-y: scroll; - height: calc(100vh - 190px); + height: calc(100vh - 200px); top: 70px; p { diff --git a/src-ui/src/app/components/manage/logs/logs.component.ts b/src-ui/src/app/components/manage/logs/logs.component.ts index d77fcde4a..26ceb5c57 100644 --- a/src-ui/src/app/components/manage/logs/logs.component.ts +++ b/src-ui/src/app/components/manage/logs/logs.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; +import { Component, ElementRef, OnInit, AfterViewChecked, ViewChild } from '@angular/core'; import { LogService } from 'src/app/services/rest/log.service'; @Component({ @@ -6,7 +6,7 @@ import { LogService } from 'src/app/services/rest/log.service'; templateUrl: './logs.component.html', styleUrls: ['./logs.component.scss'] }) -export class LogsComponent implements OnInit { +export class LogsComponent implements OnInit, AfterViewChecked { constructor(private logService: LogService) { } @@ -16,6 +16,8 @@ export class LogsComponent implements OnInit { activeLog: string + @ViewChild('logContainer') logContainer: ElementRef + ngOnInit(): void { this.logService.list().subscribe(result => { this.logFiles = result @@ -26,6 +28,10 @@ export class LogsComponent implements OnInit { }) } + ngAfterViewChecked() { + this.scrollToBottom(); + } + reloadLogs() { this.logService.get(this.activeLog).subscribe(result => { this.logs = result @@ -48,4 +54,12 @@ export class LogsComponent implements OnInit { } } + scrollToBottom(): void { + this.logContainer?.nativeElement.scroll({ + top: this.logContainer.nativeElement.scrollHeight, + left: 0, + behavior: 'auto' + }); + } + } diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index dcc0a3148..ec07208dc 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -92,6 +92,7 @@ export class SettingsService { {code: "de-de", name: $localize`German`, englishName: "German", dateInputFormat: "dd.mm.yyyy"}, {code: "nl-nl", name: $localize`Dutch`, englishName: "Dutch", dateInputFormat: "dd-mm-yyyy"}, {code: "fr-fr", name: $localize`French`, englishName: "French", dateInputFormat: "dd/mm/yyyy"}, + {code: "pt-pt", name: $localize`Portuguese`, englishName: "Portuguese", dateInputFormat: "dd/mm/yyyy"}, {code: "pt-br", name: $localize`Portuguese (Brazil)`, englishName: "Portuguese (Brazil)", dateInputFormat: "dd/mm/yyyy"}, {code: "it-it", name: $localize`Italian`, englishName: "Italian", dateInputFormat: "dd/mm/yyyy"}, {code: "ro-ro", name: $localize`Romanian`, englishName: "Romanian", dateInputFormat: "dd.mm.yyyy"}, diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts index 82a55b979..acc5843f8 100644 --- a/src-ui/src/environments/environment.prod.ts +++ b/src-ui/src/environments/environment.prod.ts @@ -3,7 +3,7 @@ export const environment = { apiBaseUrl: "/api/", apiVersion: "2", appTitle: "Paperless-ng", - version: "1.3.1", + version: "1.3.2", webSocketHost: window.location.host, webSocketProtocol: (window.location.protocol == "https:" ? "wss:" : "ws:") }; diff --git a/src-ui/src/locale/messages.cs_CZ.xlf b/src-ui/src/locale/messages.cs_CZ.xlf index d0f519a70..c24654569 100644 --- a/src-ui/src/locale/messages.cs_CZ.xlf +++ b/src-ui/src/locale/messages.cs_CZ.xlf @@ -1384,18 +1384,10 @@