From 0c670e25c348f3f9bbd845e6c13b143074d99c3e Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Tue, 3 May 2022 11:15:31 -0700 Subject: [PATCH 001/291] Includes a version.json file with the current version in export. On import, catch certain errors and check the version if possible --- .../management/commands/document_exporter.py | 9 ++++++- .../management/commands/document_importer.py | 24 ++++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py index b110475a5..27f1fd8a9 100644 --- a/src/documents/management/commands/document_exporter.py +++ b/src/documents/management/commands/document_exporter.py @@ -22,6 +22,7 @@ from documents.settings import EXPORTER_ARCHIVE_NAME from documents.settings import EXPORTER_FILE_NAME from documents.settings import EXPORTER_THUMBNAIL_NAME from filelock import FileLock +from paperless import version from paperless.db import GnuPG from paperless_mail.models import MailAccount from paperless_mail.models import MailRule @@ -232,12 +233,18 @@ class Command(BaseCommand): archive_target, ) - # 4. write manifest to target forlder + # 4.1 write manifest to target folder manifest_path = os.path.abspath(os.path.join(self.target, "manifest.json")) with open(manifest_path, "w") as f: json.dump(manifest, f, indent=2) + # 4.2 write version information to target folder + version_path = os.path.abspath(os.path.join(self.target, "version.json")) + + with open(version_path, "w") as f: + json.dump({"version": version.__full_version_str__}, f, indent=2) + if self.delete: # 5. Remove files which we did not explicitly export in this run diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py index d1ae33afb..398bc05b4 100644 --- a/src/documents/management/commands/document_importer.py +++ b/src/documents/management/commands/document_importer.py @@ -6,9 +6,11 @@ from contextlib import contextmanager import tqdm from django.conf import settings +from django.core.exceptions import FieldDoesNotExist from django.core.management import call_command from django.core.management.base import BaseCommand from django.core.management.base import CommandError +from django.core.serializers.base import DeserializationError from django.db.models.signals import m2m_changed from django.db.models.signals import post_save from documents.models import Document @@ -16,6 +18,7 @@ from documents.settings import EXPORTER_ARCHIVE_NAME from documents.settings import EXPORTER_FILE_NAME from documents.settings import EXPORTER_THUMBNAIL_NAME from filelock import FileLock +from paperless import version from ...file_handling import create_source_path_directory from ...signals.handlers import update_filename_and_move_files @@ -53,6 +56,7 @@ class Command(BaseCommand): BaseCommand.__init__(self, *args, **kwargs) self.source = None self.manifest = None + self.version = None def handle(self, *args, **options): @@ -72,6 +76,11 @@ class Command(BaseCommand): with open(manifest_path) as f: self.manifest = json.load(f) + version_path = os.path.join(self.source, "version.json") + if os.path.exists(version_path): + with open(version_path) as f: + self.version = json.load(f)["version"] + self._check_manifest() with disable_signal( post_save, @@ -84,7 +93,20 @@ class Command(BaseCommand): sender=Document.tags.through, ): # Fill up the database with whatever is in the manifest - call_command("loaddata", manifest_path) + try: + call_command("loaddata", manifest_path) + except (FieldDoesNotExist, DeserializationError) as e: + if ( + self.version is not None + and self.version != version.__full_version_str__ + ): + raise CommandError( + "Error loading database, version mismatch. " + f"Currently {version.__full_version_str__}," + f" importing {self.version}", + ) from e + else: + raise CommandError("Error loading database") from e self._import_files_from_manifest(options["no_progress_bar"]) From 0129675c1a61ccbbe62c99ecd3dbb81170b1c757 Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Wed, 4 May 2022 19:41:49 -0700 Subject: [PATCH 002/291] Uses the correct styling for output messages --- .pre-commit-config.yaml | 2 +- .../management/commands/document_archiver.py | 2 +- .../management/commands/document_importer.py | 22 ++++++++++++++++--- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f0bf9bace..fb824db9f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -37,7 +37,7 @@ repos: exclude: "(^Pipfile\\.lock$)" # Python hooks - repo: https://github.com/asottile/reorder_python_imports - rev: v3.0.1 + rev: v3.1.0 hooks: - id: reorder-python-imports exclude: "(migrations)" diff --git a/src/documents/management/commands/document_archiver.py b/src/documents/management/commands/document_archiver.py index f33ccd7ce..bb376c2dd 100644 --- a/src/documents/management/commands/document_archiver.py +++ b/src/documents/management/commands/document_archiver.py @@ -152,4 +152,4 @@ class Command(BaseCommand): ), ) except KeyboardInterrupt: - print("Aborting...") + self.stdout.write(self.style.NOTICE(("Aborting..."))) diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py index 398bc05b4..18bbe6c7f 100644 --- a/src/documents/management/commands/document_importer.py +++ b/src/documents/management/commands/document_importer.py @@ -80,6 +80,18 @@ class Command(BaseCommand): if os.path.exists(version_path): with open(version_path) as f: self.version = json.load(f)["version"] + # Provide an initial warning if needed to the user + if self.version != version.__full_version_str__: + self.stdout.write( + self.style.WARNING( + "Version mismatch:" + f" {self.version} vs {version.__full_version_str__}." + " Continuing, but import may fail", + ), + ) + + else: + self.stdout.write(self.style.WARNING("No version.json file located")) self._check_manifest() with disable_signal( @@ -110,8 +122,12 @@ class Command(BaseCommand): self._import_files_from_manifest(options["no_progress_bar"]) - print("Updating search index...") - call_command("document_index", "reindex") + self.stdout.write("Updating search index...") + call_command( + "document_index", + "reindex", + no_progress_bar=options["no_progress_bar"], + ) @staticmethod def _check_manifest_exists(path): @@ -154,7 +170,7 @@ class Command(BaseCommand): os.makedirs(settings.THUMBNAIL_DIR, exist_ok=True) os.makedirs(settings.ARCHIVE_DIR, exist_ok=True) - print("Copy files into paperless...") + self.stdout.write("Copy files into paperless...") manifest_documents = list( filter(lambda r: r["model"] == "documents.document", self.manifest), From 070b648e845628a65c280fb8e7d05ae1dc67d111 Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Thu, 5 May 2022 09:17:51 -0700 Subject: [PATCH 003/291] Improves the output to the user --- .../management/commands/document_importer.py | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py index 18bbe6c7f..92742a487 100644 --- a/src/documents/management/commands/document_importer.py +++ b/src/documents/management/commands/document_importer.py @@ -70,13 +70,13 @@ class Command(BaseCommand): if not os.access(self.source, os.R_OK): raise CommandError("That path doesn't appear to be readable") - manifest_path = os.path.join(self.source, "manifest.json") + manifest_path = os.path.normpath(os.path.join(self.source, "manifest.json")) self._check_manifest_exists(manifest_path) with open(manifest_path) as f: self.manifest = json.load(f) - version_path = os.path.join(self.source, "version.json") + version_path = os.path.normpath(os.path.join(self.source, "version.json")) if os.path.exists(version_path): with open(version_path) as f: self.version = json.load(f)["version"] @@ -91,7 +91,7 @@ class Command(BaseCommand): ) else: - self.stdout.write(self.style.WARNING("No version.json file located")) + self.stdout.write(self.style.NOTICE("No version.json file located")) self._check_manifest() with disable_signal( @@ -108,17 +108,24 @@ class Command(BaseCommand): try: call_command("loaddata", manifest_path) except (FieldDoesNotExist, DeserializationError) as e: + self.stdout.write(self.style.ERROR("Database import failed")) if ( self.version is not None and self.version != version.__full_version_str__ ): - raise CommandError( - "Error loading database, version mismatch. " - f"Currently {version.__full_version_str__}," - f" importing {self.version}", - ) from e + self.stdout.write( + self.style.ERROR( + "Version mismatch: " + f"Currently {version.__full_version_str__}," + f" importing {self.version}", + ), + ) + raise e else: - raise CommandError("Error loading database") from e + self.stdout.write( + self.style.ERROR("No version information present"), + ) + raise e self._import_files_from_manifest(options["no_progress_bar"]) From 7f88ec096594588e755f3c82d9f615a7e19c69c8 Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Thu, 5 May 2022 09:23:15 -0700 Subject: [PATCH 004/291] Adds documentation note about version matching --- docs/administration.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/administration.rst b/docs/administration.rst index 1139c3a69..f6b0ed659 100644 --- a/docs/administration.rst +++ b/docs/administration.rst @@ -287,6 +287,10 @@ When you use the provided docker compose script, put the export inside the ``export`` folder in your paperless source directory. Specify ``../export`` as the ``source``. +.. note:: + + Importing from a previous version of Paperless may work, but for best results + it is suggested to match the versions. .. _utilities-retagger: From 2e47b6b22fe7606de62b7be9057cbd33f0f9a9aa Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 8 May 2022 09:03:29 -0700 Subject: [PATCH 005/291] loading indicator for dashboard widgets --- .../saved-view-widget/saved-view-widget.component.html | 2 +- .../widgets/saved-view-widget/saved-view-widget.component.ts | 4 ++++ .../statistics-widget/statistics-widget.component.html | 2 +- .../widgets/statistics-widget/statistics-widget.component.ts | 4 ++++ .../widgets/widget-frame/widget-frame.component.html | 4 ++++ .../dashboard/widgets/widget-frame/widget-frame.component.ts | 3 +++ 6 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html index 01809d1c6..8d5b9c43f 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html @@ -1,4 +1,4 @@ - + Show all diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts index 9506e6842..6e8b67900 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts @@ -15,6 +15,8 @@ import { QueryParamsService } from 'src/app/services/query-params.service' styleUrls: ['./saved-view-widget.component.scss'], }) export class SavedViewWidgetComponent implements OnInit, OnDestroy { + loading: boolean = true + constructor( private documentService: DocumentService, private router: Router, @@ -43,6 +45,7 @@ export class SavedViewWidgetComponent implements OnInit, OnDestroy { } reload() { + this.loading = true this.documentService .listFiltered( 1, @@ -52,6 +55,7 @@ export class SavedViewWidgetComponent implements OnInit, OnDestroy { this.savedView.filter_rules ) .subscribe((result) => { + this.loading = false this.documents = result.results }) } diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html index a29b50f78..106d30610 100644 --- a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html @@ -1,4 +1,4 @@ - +

Documents in inbox: {{statistics?.documents_inbox}}

Total documents: {{statistics?.documents_total}}

diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts index a13839f19..3d9f7b5e7 100644 --- a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts @@ -15,6 +15,8 @@ export interface Statistics { styleUrls: ['./statistics-widget.component.scss'], }) export class StatisticsWidgetComponent implements OnInit, OnDestroy { + loading: boolean = true + constructor( private http: HttpClient, private consumerStatusService: ConsumerStatusService @@ -29,7 +31,9 @@ export class StatisticsWidgetComponent implements OnInit, OnDestroy { } reload() { + this.loading = true this.getStatistics().subscribe((statistics) => { + this.loading = false this.statistics = statistics }) } diff --git a/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html b/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html index a9d3d306a..4eaee4761 100644 --- a/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html +++ b/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html @@ -2,6 +2,10 @@
{{title}}
+ + + +
diff --git a/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.ts b/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.ts index f21f6ca35..b1e926eef 100644 --- a/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.ts @@ -11,5 +11,8 @@ export class WidgetFrameComponent implements OnInit { @Input() title: string + @Input() + loading: boolean = false + ngOnInit(): void {} } From 1e7404662e2f86cad59f04f2591a027786494a6e Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 8 May 2022 14:16:37 -0700 Subject: [PATCH 006/291] loading indicators for sidebar saved views --- .../src/app/components/app-frame/app-frame.component.html | 3 ++- .../src/app/components/app-frame/app-frame.component.scss | 5 +++++ src-ui/src/app/services/rest/saved-view.service.ts | 8 +++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index d90d3b2d9..8f480dea4 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -70,8 +70,9 @@ -
+
Saved views +
  • diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index 5fe408660..296df26c3 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -9,6 +9,11 @@ z-index: 995; /* Behind the navbar */ padding: 50px 0 0; /* Height of navbar */ box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1); + + .sidebar-heading .spinner-border { + width: 0.8em; + height: 0.8em; + } } @media (max-width: 767.98px) { .sidebar { diff --git a/src-ui/src/app/services/rest/saved-view.service.ts b/src-ui/src/app/services/rest/saved-view.service.ts index dae205cb3..46df5e72c 100644 --- a/src-ui/src/app/services/rest/saved-view.service.ts +++ b/src-ui/src/app/services/rest/saved-view.service.ts @@ -9,13 +9,19 @@ import { AbstractPaperlessService } from './abstract-paperless-service' providedIn: 'root', }) export class SavedViewService extends AbstractPaperlessService { + loading: boolean + constructor(http: HttpClient) { super(http, 'saved_views') this.reload() } private reload() { - this.listAll().subscribe((r) => (this.savedViews = r.results)) + this.loading = true + this.listAll().subscribe((r) => { + this.savedViews = r.results + this.loading = false + }) } private savedViews: PaperlessSavedView[] = [] From 261e331e47013a7f73e99270a2e03a1c64edb7e0 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 8 May 2022 14:17:11 -0700 Subject: [PATCH 007/291] dashboard loading indicator, remove duplicate call to saved views --- .../components/dashboard/dashboard.component.html | 9 +++++++-- .../components/dashboard/dashboard.component.ts | 15 ++------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html index cfb25b96e..4b6bc223b 100644 --- a/src-ui/src/app/components/dashboard/dashboard.component.html +++ b/src-ui/src/app/components/dashboard/dashboard.component.html @@ -21,9 +21,14 @@
    - + + + Loading... + - + + + diff --git a/src-ui/src/app/components/dashboard/dashboard.component.ts b/src-ui/src/app/components/dashboard/dashboard.component.ts index 3dd648212..640883f6f 100644 --- a/src-ui/src/app/components/dashboard/dashboard.component.ts +++ b/src-ui/src/app/components/dashboard/dashboard.component.ts @@ -1,6 +1,5 @@ import { Component, OnInit } from '@angular/core' import { Meta } from '@angular/platform-browser' -import { PaperlessSavedView } from 'src/app/data/paperless-saved-view' import { SavedViewService } from 'src/app/services/rest/saved-view.service' @Component({ @@ -8,8 +7,8 @@ import { SavedViewService } from 'src/app/services/rest/saved-view.service' templateUrl: './dashboard.component.html', styleUrls: ['./dashboard.component.scss'], }) -export class DashboardComponent implements OnInit { - constructor(private savedViewService: SavedViewService, private meta: Meta) {} +export class DashboardComponent { + constructor(public savedViewService: SavedViewService, private meta: Meta) {} get displayName() { let tagFullName = this.meta.getTag('name=full_name') @@ -30,14 +29,4 @@ export class DashboardComponent implements OnInit { return $localize`Welcome to Paperless-ngx!` } } - - savedViews: PaperlessSavedView[] = [] - - ngOnInit(): void { - this.savedViewService.listAll().subscribe((results) => { - this.savedViews = results.results.filter( - (savedView) => savedView.show_on_dashboard - ) - }) - } } From a944ef1ca6c9be15dc5a82e64369d4859c61ceb2 Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Tue, 12 Apr 2022 19:52:56 -0700 Subject: [PATCH 008/291] Adds additional testing for both date parsing and consumed document created date --- src/documents/consumer.py | 47 ++++--- src/documents/models.py | 9 +- src/documents/parsers.py | 43 +++--- .../samples/documents/originals/0000005.pdf | Bin 0 -> 20299 bytes .../samples/documents/originals/0000006.pdf | Bin 0 -> 21044 bytes src/documents/tests/test_consumer.py | 126 +++++++++++++++++- src/documents/tests/test_date_parsing.py | 100 +++++++++++++- src/paperless/settings.py | 17 ++- src/paperless/tests/test_settings.py | 45 +++++++ 9 files changed, 345 insertions(+), 42 deletions(-) create mode 100755 src/documents/tests/samples/documents/originals/0000005.pdf create mode 100755 src/documents/tests/samples/documents/originals/0000006.pdf create mode 100644 src/paperless/tests/test_settings.py diff --git a/src/documents/consumer.py b/src/documents/consumer.py index 4fe6b02ed..44fb1cb97 100644 --- a/src/documents/consumer.py +++ b/src/documents/consumer.py @@ -3,6 +3,8 @@ import hashlib import os import uuid from subprocess import Popen +from typing import Optional +from typing import Type import magic from asgiref.sync import async_to_sync @@ -23,6 +25,7 @@ from .models import Document from .models import DocumentType from .models import FileInfo from .models import Tag +from .parsers import DocumentParser from .parsers import get_parser_class_for_mime_type from .parsers import parse_date from .parsers import ParseError @@ -186,7 +189,7 @@ class Consumer(LoggingMixin): override_document_type_id=None, override_tag_ids=None, task_id=None, - ): + ) -> Document: """ Return the document object if it was successfully created. """ @@ -220,7 +223,10 @@ class Consumer(LoggingMixin): self.log("debug", f"Detected mime type: {mime_type}") - parser_class = get_parser_class_for_mime_type(mime_type) + # Based on the mime type, get the parser for that type + parser_class: Optional[Type[DocumentParser]] = get_parser_class_for_mime_type( + mime_type, + ) if not parser_class: self._fail(MESSAGE_UNSUPPORTED_TYPE, f"Unsupported mime type {mime_type}") @@ -241,7 +247,10 @@ class Consumer(LoggingMixin): # This doesn't parse the document yet, but gives us a parser. - document_parser = parser_class(self.logging_group, progress_callback) + document_parser: DocumentParser = parser_class( + self.logging_group, + progress_callback, + ) self.log("debug", f"Parser: {type(document_parser).__name__}") @@ -270,7 +279,7 @@ class Consumer(LoggingMixin): text = document_parser.get_text() date = document_parser.get_date() - if not date: + if date is None: self._send_progress(90, 100, "WORKING", MESSAGE_PARSE_DATE) date = parse_date(self.filename, text) archive_path = document_parser.get_archive_path() @@ -342,7 +351,7 @@ class Consumer(LoggingMixin): ).hexdigest() # Don't save with the lock active. Saving will cause the file - # renaming logic to aquire the lock as well. + # renaming logic to acquire the lock as well. document.save() # Delete the file only if it was successfully consumed @@ -362,7 +371,8 @@ class Consumer(LoggingMixin): except Exception as e: self._fail( str(e), - f"The following error occured while consuming " f"{self.filename}: {e}", + f"The following error occurred while consuming " + f"{self.filename}: {e}", exc_info=True, ) finally: @@ -376,21 +386,26 @@ class Consumer(LoggingMixin): return document - def _store(self, text, date, mime_type): + def _store(self, text, date, mime_type) -> Document: # If someone gave us the original filename, use it instead of doc. file_info = FileInfo.from_filename(self.filename) - stats = os.stat(self.path) - self.log("debug", "Saving record to database") - created = ( - file_info.created - or date - or timezone.make_aware(datetime.datetime.fromtimestamp(stats.st_mtime)) - ) + if file_info.created is not None: + create_date = file_info.created + self.log("debug", f"Creation date from FileInfo: {create_date}") + elif date is not None: + create_date = date + self.log("debug", f"Creation date from parse_date: {create_date}") + else: + stats = os.stat(self.path) + create_date = timezone.make_aware( + datetime.datetime.fromtimestamp(stats.st_mtime), + ) + self.log("debug", "Creation date from st_mtime: {create_date}") storage_type = Document.STORAGE_TYPE_UNENCRYPTED @@ -400,8 +415,8 @@ class Consumer(LoggingMixin): content=text, mime_type=mime_type, checksum=hashlib.md5(f.read()).hexdigest(), - created=created, - modified=created, + created=create_date, + modified=create_date, storage_type=storage_type, ) diff --git a/src/documents/models.py b/src/documents/models.py index 8f531e401..c7bd3767e 100644 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -380,6 +380,10 @@ class SavedViewFilterRule(models.Model): # TODO: why is this in the models file? +# TODO: how about, what is this and where is it documented? +# It appears to parsing JSON from an environment variable to get a title and date from +# the filename, if possible, as a higher priority than either document filename or +# content parsing class FileInfo: REGEXES = OrderedDict( @@ -387,8 +391,7 @@ class FileInfo: ( "created-title", re.compile( - r"^(?P\d\d\d\d\d\d\d\d(\d\d\d\d\d\d)?Z) - " - r"(?P.*)$", + r"^(?P<created>\d{8}(\d{6})?Z) - " r"(?P<title>.*)$", flags=re.IGNORECASE, ), ), @@ -428,7 +431,7 @@ class FileInfo: properties[name] = getattr(cls, "_get_{}".format(name))(properties[name]) @classmethod - def from_filename(cls, filename): + def from_filename(cls, filename) -> "FileInfo": # Mutate filename in-place before parsing its components # by applying at most one of the configured transformations. for (pattern, repl) in settings.FILENAME_PARSE_TRANSFORMS: diff --git a/src/documents/parsers.py b/src/documents/parsers.py index 269fddbb4..8335d433e 100644 --- a/src/documents/parsers.py +++ b/src/documents/parsers.py @@ -1,3 +1,4 @@ +import datetime import logging import mimetypes import os @@ -5,6 +6,8 @@ import re import shutil import subprocess import tempfile +from typing import Optional +from typing import Set import magic from django.conf import settings @@ -40,11 +43,11 @@ DATE_REGEX = re.compile( logger = logging.getLogger("paperless.parsing") -def is_mime_type_supported(mime_type): +def is_mime_type_supported(mime_type) -> bool: return get_parser_class_for_mime_type(mime_type) is not None -def get_default_file_extension(mime_type): +def get_default_file_extension(mime_type) -> str: for response in document_consumer_declaration.send(None): parser_declaration = response[1] supported_mime_types = parser_declaration["mime_types"] @@ -59,14 +62,14 @@ def get_default_file_extension(mime_type): return "" -def is_file_ext_supported(ext): +def is_file_ext_supported(ext) -> bool: if ext: return ext.lower() in get_supported_file_extensions() else: return False -def get_supported_file_extensions(): +def get_supported_file_extensions() -> Set[str]: extensions = set() for response in document_consumer_declaration.send(None): parser_declaration = response[1] @@ -121,7 +124,7 @@ def run_convert( auto_orient=False, extra=None, logging_group=None, -): +) -> None: environment = os.environ.copy() if settings.CONVERT_MEMORY_LIMIT: @@ -146,11 +149,11 @@ def run_convert( raise ParseError("Convert failed at {}".format(args)) -def get_default_thumbnail(): +def get_default_thumbnail() -> str: return os.path.join(os.path.dirname(__file__), "resources", "document.png") -def make_thumbnail_from_pdf_gs_fallback(in_path, temp_dir, logging_group=None): +def make_thumbnail_from_pdf_gs_fallback(in_path, temp_dir, logging_group=None) -> str: out_path = os.path.join(temp_dir, "convert_gs.png") # if convert fails, fall back to extracting @@ -184,7 +187,7 @@ def make_thumbnail_from_pdf_gs_fallback(in_path, temp_dir, logging_group=None): return get_default_thumbnail() -def make_thumbnail_from_pdf(in_path, temp_dir, logging_group=None): +def make_thumbnail_from_pdf(in_path, temp_dir, logging_group=None) -> str: """ The thumbnail of a PDF is just a 500px wide image of the first page. """ @@ -209,12 +212,12 @@ def make_thumbnail_from_pdf(in_path, temp_dir, logging_group=None): return out_path -def parse_date(filename, text): +def parse_date(filename, text) -> Optional[datetime.datetime]: """ Returns the date of the document. """ - def __parser(ds, date_order): + def __parser(ds: str, date_order: str) -> datetime.datetime: """ Call dateparser.parse with a particular date ordering """ @@ -230,9 +233,9 @@ def parse_date(filename, text): }, ) - def __filter(date): + def __filter(date: datetime.datetime) -> Optional[datetime.datetime]: if ( - date + date is not None and date.year > 1900 and date <= timezone.now() and date.date() not in settings.IGNORE_DATES @@ -244,8 +247,10 @@ def parse_date(filename, text): # if filename date parsing is enabled, search there first: if settings.FILENAME_DATE_ORDER: + logger.info("Attempting parsing from filename") for m in re.finditer(DATE_REGEX, filename): date_string = m.group(0) + logger.info(f"Found potential date: {date_string}") try: date = __parser(date_string, settings.FILENAME_DATE_ORDER) @@ -255,11 +260,16 @@ def parse_date(filename, text): date = __filter(date) if date is not None: + logger.info(f"Found date: {date}") return date + else: + logger.info("Filtered date out") + logger.info("Attempting parsing from content") # Iterate through all regex matches in text and try to parse the date for m in re.finditer(DATE_REGEX, text): date_string = m.group(0) + logger.info(f"Found potential date: {date_string}") try: date = __parser(date_string, settings.DATE_ORDER) @@ -269,7 +279,10 @@ def parse_date(filename, text): date = __filter(date) if date is not None: - break + logger.info(f"Found date: {date}") + return date + else: + logger.info("Filtered date out") return date @@ -294,7 +307,7 @@ class DocumentParser(LoggingMixin): self.archive_path = None self.text = None - self.date = None + self.date: Optional[datetime.datetime] = None self.progress_callback = progress_callback def progress(self, current_progress, max_progress): @@ -342,7 +355,7 @@ class DocumentParser(LoggingMixin): def get_text(self): return self.text - def get_date(self): + def get_date(self) -> Optional[datetime.datetime]: return self.date def cleanup(self): diff --git a/src/documents/tests/samples/documents/originals/0000005.pdf b/src/documents/tests/samples/documents/originals/0000005.pdf new file mode 100755 index 0000000000000000000000000000000000000000..cc78528f5b1004a3107eef12dfbafde59d3e1279 GIT binary patch literal 20299 zcmaHSb8u$Q*6zf%ZQHhO^NsmtVkZ+P6Wi9rnb@{%XJXr#o8LL-e&^Qr$F1sJd+k+E zuhpy9v#Pp#?@ggBF3G^c$PP;}e|EA9%R<ad>|kO8%g@iGZtY@cPE4%<booaxBQ|p| zb+tDKy3oKfDLXlsxtf|g5mT$#S_7EAOc2|%FtZX%IXGB;^$~Y4btYCd2b!5XnLE)4 z3c`Mg{}^TauW?fVF$*k{r~)yQqJxt?!0x{wj{kxrt?gXCoG?k+0bI<*%}pK5%wd`2 z&4HFKR>bVAtb&5X&Mr>o0DD-EtU--+#eQaZ-)XHsP$TC95oj<Zzk46yPl>*#2RA?s z{grDt(_a7GuiGn5))=qk9CNV(qgOtRvCPD<C1^j<?uhHYRO4W8wjMQ{Y)`e`m|hiV z;GYILokg!E@AhV5IN6T^7Kv6)L?~}NCD7l&T3^hrZ9~|&Sg|`rN2SYZOWm}VHiVg_ zg@9UDm2<(NGJ~hrnSL&NKk7`j0m`}!hMz9u3`OrItbmRt2LnZ1LXgM!Jke!ZP+K2K zc2J<g)Jxu@(?Z%H>{!kc{|vUX9?aaDHdx_e_yVdLvPr8(mP!G7y8yk<01JL(5a0a^ zyOwvQ?-)d_XvyG;-&|v?8`^*}k`2^YGEQy2EDhw_e$bEHeu1kOx#HZ!mZP!sgn@Z$ zqDt&v%bm_`aK0_U1H|pV5%A|N<)ky1;vogX#Z&H`#IU(YG5gl$h&_zn09gepqV?{- zvCn9=LGoEQP&eCJLYqL;tc7*tXC$U(#|!53IhID=TlClAGX?a@AL{c;Z6dz0yg85% z+<CCj#I*z-5DP!lsVO?r;FGH7gh0F>31a@C!G99=A40JHH`nT(-_41clmV7sDONRi zc5rnvHFqZdqTv_UOx4U?i1q$OGbVL&4;Nx48T&7w=zs2F|GCQ;z%ogAxJaqFe9`5f zu2O8o|4>f#i(E{S4nUWGbdv1E?ElvNqg60Bvj&Jdco6F`e<?XxSc$oKSij7OeWAao z?o9j-8&zSM)LfigO<j}$PXAIee^tQ0L}JeWnEy{a|2+QR>iM5|oc}TB`sMwL@N(8> z&cu5Egsp1uU&?d+?`~oM7l56E<v(sLzh>codEx#q{NKgELd?d(%EtN?<o~B&ShzUZ zx&Pmix#)!RK$lqJ@+)sE^}d`Jc+#_=OgBSi6()vxl7^K2hVYaLg9^jdI!+P(i&{hi zS!KrHs(QyjKb`~zJI+Acd=tYQpp{~<s-dhhYY_Y((Ls5aU7jNYdir+x=AZNTPT=aP zW3$XCx4OK#T+nr@Ol^_l8~8VTXwrLZO%<M`oZ?)N84T=pkCn99eTTD$87uj$A5TYN z(Yf3!&$gam-(>cDV`ujxe`>WD#Q^-6ww4vjv2_FvyF86RU0Ml*KVG6j<}o7?+H9FW z*h{#kwY%tV#jlzEev9jdjHA@A_jv4U2LAE{@8Jc#s>v3p@?-Jn{c(^A@H2l5#H;r7 zO8un!0iylcGw*D{sDE?Lchv#EvjJy3Go8+1e<*WwrcKBb@!~z*3+)|2f_3#fI*!kB zw+_SoV~`hn+``_l)_69`+JC|SJG!t3{Jb8fqTX-q=JB~7*4jei)!9woQ%b9k+P}5! zVr%{OQ2D4+C*kkOF+Yh+ozl&6xBDabqY~^}iIHj6H?O=rP?_R5i;fQ1t{<$=5F^+% z!YJ~hm!09Bt{zO^gj8QDCy02iJw1)rsj&-sn%BEKRd!jh2()gn$y|ojxa?0FPLR_b z`{y8#(>q<3e8MNvIeclvG3E8#7{qzUz_YL7m8VlJlp2$L%aD#e?-Pj*vFgq;O(D-; z-Mr82Anq+XI2x9zq0dGr?HUcA!mGg}VXU-vW4|Lbp1CfNM<fxD9*LHk{yA1DBnfzM znD5-=Oi3C6lQ9isp$^FkKQRPkiCddKq|L`ND_YxQaARQ%seJ!|Hwz~?Kx{^GxG$3j zmjk}%flA$*C``l;quz56uE7lI$Q~t@1-%%acthTSSyepcqQvtXLoY4s`Y}9w^LNA6 z43QizY(D^A{)eqGBYoi6j@LwMbSKE+DWpIi*8N$ME$&1BL@j$F-NUZG*Oc_+vq<-+ zzd!*qG-P}-IfXu@X5?a<>l}&O>Dm3$`!#!1PyOtS6~6E23)2NV!$;ZtUcFm=v{p$) z{RO~#1>oe<t9ZnANyp#cvH$Ez`Yj;4cQ`0EEVbC&g;^dXK+aN2fwxtkwR%6GgM5XI zfc-?=RA@4{5&h0>sDZxT2fZ=odgn;#WEauu2Ofas(ST+dA%%8_&7fB5El*$m4{Kft zC#hl1E1tHnu==&3g1HE0C@j1f3;ZxM=_368H7`m{;<aw{@@QJ>ZRtW&ji-)0X?7Wp z{3kP}2G*JIDC(?VFTY)^B-)>WTXu!sp9uxCpr_Iz8JK(rv%7pc^9{l1#z;&OG+Cjj zoT%pZs1to}UW}>o<KDaLkKz$op=I<IDD**iacK3-7f#yYH}x!6jp6c6WZANjc`*}x z&u4Ktp}(=VUH`2A<ca(pn&Tl^3*qdsDpY9?y~QArvCAH{th<uE+)8Y)tzQX1ELkkI ztvPb2$9JT3N#!krxOm#uf_w#q?>l;A)~yVSz*aP-?q@Dj+Zd7ebBld(|I257<_8sf zXDJwbH2<XZxAcX|`eps>6`ALGo4?jq%eVzh!Ux_k%;Z<!Bk!EG?dX-U0VUI1vkX&@ zE@o^#DOxPQPSAAfzH=+Kzh2u#0ubq$`Pp?kKq)FeIb?wfTe04DePh8oWvY4t??;Nu zH=ieaGe)~0-)mZ)FeQ7bOOF1l-XIP^NV?slTFhcM)}f7v4?e`=R!~1hpI<@}*Wj`b zXy2jl3}Kp$nOY;b9%w29Ir`S07jPFw@spBRs5#sdQOeF{yt0rT#4ZQ|R2$ORi^|oW ziZ0~@5T<*8yH91B%=sk~J$K5d&YMPR{!%A7pilk%-vc)+S0dJ2DNc8QyI9mlvCxgA zGLwqFkqje}biU9WKyrN2H*0*kT!>s`CLJ31Uez2~3N<KZEo2)NMWO(KA}k!qdRH}7 zGPSVp{HKs~wF_bSC~mu}pxuG{1C@NKUc9b|!)4XK94q38{E6Q}nwA#r5298_iW#|e z^<%CcY@Z46NmOp}+N3R)FwRih@YJMcWgo=fTqyX%l>Fqo3YvFXWjze=GjO9`yCE;l zH$u1j-UgI@j##lqxaCJ4@As)TI2yESPKkH6p%M1YZIe0HMP{4;c4=->_uN%A*GH2u zyvZSB3zTm0OnSMZ<Gh^ccq9dj#E#WpsXv6DTU#{V6ZsLgUu_z&-TRq#=}f46N41?W z(t`@eb)A?z)9^{9Myz?m74z;+bO156;?K$4*wZ&AogSH&h?@p;CrzhKVD|oYZ?qa& zZD2zM{FOsX+p!rlQBF?STfKMSKEf^o;*}nf(wyniz`i?7Coazfex;@ai^>D&mmfZ| zUBpHSSJb!)w6otPOL#maPgK1GK6rei2#4;VKd3$=uc3KF^^Yl%U^x0n?G|+bXgPc# zPZHf8+VUj1k*-L`oM$=9AF5B~msw^h4vRsbRadz-40gUX2y07?0y9f1OIcn-`YU06 ze?+kbT7Fygm*f)|1$3>kQ6D*=vE5E7!Hx>Eg7UB>Pmsxt!2bDj@dxD=-r-HojLGSQ z=?{I=s%TKh<fb(fZ(7XIoegg!V}9nbZ$mm^;WliYF{)jl95s3<Ok*ECApLvL^^Z98 zEz~UxL1aeg?frDrXcO%T6jKv@d`d-(8Z;s-Arzrmh1t%sH)&Q`xMIE{%o8Ig2hTiy zNkY2iF}wqVTNPgd*(2LpG{Z|fr4boGqcY8Tu(wsjaiM>nzp!TxEL%uCIz_Ue($Z|E z4BO;lRUG6Dh#7hon(4^d@`;6403xzv0xc`y;cSksb%L4?2$T7q?RUwI$g4*vde0Cu z%I2B+1RPwL=G{NdqDU-^9WcWoXyTZ;Ke{6%_ed;{o%^tp0*xZTTo>b_KcD6LP@UM$ zi;|CdeM+}~IPw3?69|GSO7mgJb61ecM}I&O6vyMt{lu8cBdiI68kKkC+yJ96qwoQp zF3@zDHK4<gWxR#VrmHSRoP$^27#l)MkOR*~15!2ik<ID6BF4CcNsx6=b%a+5$s3_c z{ycKoAHiSvkvW^IouG@rbzD9u6u(LwClg1NBYxJTN{v~6(*|2LhTdS^uH62VM}SQp zHGs_|I|ZE-8DT|2*n3CPfJQ1iqrY%NH~aGgB%>In0m9;}61)mg_l9eIDBtpio<A!C zVY%co2xx`0RHA7TG2Jg!i;_cSy9VrI;Rw#SBgDzalSMiUEoqy5xF_Jv5&Z7>m$dmV z980kOj-mr6yz9~HhKZSQObt)fU-E=e819W(K8$V$z3bpeyZ<{tD5)X3fKOE{WbnC* z%GmC-RXq(GplAc)HS4{LqXRYnhx^en;T>lCi84)MxHtu-e(jKyh?5ixb)@QS=5r$* zo7J%|PyD54d<^pbYPngdW-ehbN8o3h`x!3NxoRBI_;~c8nN(kXrE$;Io!16qX@4~> zXT_i$EAD+=5gLSSo~^lyl>s?Uh1}2I$Je`?E50tclJaNhDydP%3p0^-<Ycb=dVlt^ zU?w~#DR|Iyr^LM#3&h9rD)pA7&Dj(9)ls4w;zms?;=9^Ob<t#UcJHMX9rhX^PR{Lo zh*eLr)lg&-+N8~$j&FI+=+0<sTL>uk<BsEWhJXfuu-V`un6e_OHV>#9c=D{goUu>7 znZ!op!h}yN3G+FuDq{v|SkL5n3(DcBs_IH;Gs|U{vkY=E3-MAa5?*fW$UA!GV6DWY zP;zra1v5r(ycW8;!n4l@JYDoOLoBZ8sHrT@VqO~g3V`b`$I52Xlh&K0=6y`KW~4I1 zbsi4l%9{JB=-Ty%vt`Kyy&+9^#YqcowIK7IdUgk^&DVVG2S_uM#b@Xx$>jxgs!`lZ z*1oOa&g4hG`hsNo5}+ZubvR<ol#WmhV*60HAk02+1bF|3)~-g?YlNdCl+T-yO^+mQ zTcQE(&JFlz!OQT82*27(0vfnemk+HFXzFD!>+z!1ug!B0*0Yt{=<`{^*s9z+p@*B9 zNrLOC5)8VZjvH$lX$uuHS@ai%?x>BXuaG$>hLX6RC4bWA2;?pt(9Dj!GJ#MKdmZLt z4a>_7OM8x`_DEAwT@-|#;PB$aQo+HchmVNWD*cWId-1IS8l*PQSh@U0?S-pD8X|Tm zUA$)!eYCW!N9?Mg0GYp`TxD+3ZIA7_7bYYBxyK=+JFNO>sj82rBP&K({BhGpE$hVg z)MX&!Tlq0v(n65z{7Mz^CM1(nT&xuxs~MfGPf(_BlzM2t7#w-oaNl)dZB2WEt;zsy zl~Di^P+Fj@XgxgvET5ENLHbM1xWJ}oCLl`@OA?<iQw(eg<rq3Y_rJ?eS>Sm@?{?u& z0b11gzwf<)U~L*L@ZWiX;6;g<F9wgEE#ooCimA-gcJTX(M1;XCuEvwdq=jdshxs#< zefaA9f+0s6sUx8W8_UH^?&_pAC01D8=`E_)Th6ySUaBF&jfOWcYWCBWD+hS77l<!k zmDJ2>Ei+YDjzcTT*-RS*{Fy=E7^&bX5~76&>E$ah+gu@lsRO?MIo*U6Hrot7m6Sb> zYwP9Ub7HCTat9~wHKmC(k3XmE1LpnQk>gYqm?m1u{${mPMjE^G#HI^<&FxDW(-VbR zK1h?!{nN1kGj+%D+?dm1B=~e{u3w|B1dr(Yxvg;YSGO60EV^(X7|2Ib3_6YgfJZ^@ zWX7)+iX4Uf=Tu;h0JUsjFq-qX`qAtDTXTNo+L;)1uoR&5yqBR-saOgH&RyMkV1xkm zSYXPg32R`}>#SkdO4<8AARDVvf8{P8>z4w}u1S-&BA;w%uP+1n1T>TrK>7J07lI2Y z?{9afIxm=yd5TP@Hz?l*O+EoHkYAv<7<9H28=IQ5gj)p2PLR90L*tiF#e)h=xJ)Tm zUUGxdTRzp#$lIHln?vZY-bGjl{F!3EKWlx^2%)u=rG8@A))raAxl|h2z_Z~fP@-eg z8>vS<=b0_wcygu|=#$#kfm{6B4W31F)3U3~i-jHXq4^{V1{&ok<!Eqh9xC@m>PVm= zBphK6w&jVm3QK!NN%Gf_!v<}dObjbxS|2rilpRv4_`Q2B7XGvbrFzxw2K<P=ly)?6 zlkzr*GhCeP$eOgNA2l|mJ+VN-t@Og1&N*;4QWd0a2!vuDq9LGRtTmlMl;Uk5`e~xZ zT+^pMG)&08b`LvE2;;#N520?wM+p7xF$Nu}E1<NqT5e2BLqa3k*zy4C{Mn0g(D-Pz z9<0m1#)m28N@4!eg@E8-{ifrW4~K!DAvg4e*C<jwioOT2F$n<;$ONJEyx^x`He%`c zuG5}#<vX+Yj2&0o*KT%Wgrd%ZBM1r!oW6*RBDj8EIb(=&*Pyh2-_esF^V--ss`Xr? zV*WgUUjBqIQnY>Ry59ms=xdIprDQo%GO|nhPk7gmy0`bA^m?bqVt+%~6GrA*GBJi5 zkdBvQ1peE9tF{f$+d!A#LW=nq&SZ;NZ4~q|@3bBgL=UmE-4&$T>LP3tl7t^Q?rTn7 zv~B#n4Q4(WaqmO}kPjzKXjd8Fh#H{mbojmh<`^)|VuXRB@FOdG@u|Z8<_WoQ6?tpF zCPN+lX}kqZ*G=U;6JIR;O%GA*6~l;h90>L2D<^Y{@pEAHmYOuH&uhhZY@VJxo@rdM zWj;cWd3?k1VQR)d%5S?;N9v{_LcYdZ$fxQh<_^E6l2u)}e*kM5lGcn&VZ>mG^lDNq zdK^NtABNB&o)ScO90LU^t0g6ilO(K@aT%1~aL2aUj^%cB8FDF45%wD@C?w~S`I}lv zROJ`E-;cT%3?#3J%$)gtFpnS=&|($cR#fCIBlAsmMw3^n4yu3igMt}a%|h{4n|Mln z&<qw5_>V3En*QGlyVhRNp#j;sC+p2E4%_s{k)izp0Rm|T_~&r_%;sG3$gmkETi5ZO zqFCG!0k8(R`#QUuqFr%|+{9T{C<O{`TEFd;xkv)Lv`~hj_ekN_S<cZ`xN6Hp!+m|l z^h5GN`rY8)nDKjmgyO{)OES~<)#CKaq>!4y^bSdD<0LUXU+WOPI&t=bS+W!{LnBMl z_c7!4tHa~5*bNci_<ZdGLp87;0o=oCsDY(7U8r{Lr8kUz))~!tY1@kPz|w`=^%6SU zhO?31YmIwO40`?ydef>5ZEwaG8QU7|Yj;2KRu-*jwuD9)T5c#dSFQ)cg9*RkkysHo zK{HC5<Q>D=u)y?gCE?L+btoYRK&uloqxF@2fLb^F8VrhJmzdsT#wf|1XVZlhm^agi z<U(o-^!xS|Vn6W=(zQ=+7gEKs%#ibd6MW{E?mKqB4m_$r#1RbtcHvb(bQhci_85!& z;8(<g@Rlqi_Xgr2pV^c1+^lW*V8#AY>c`vHjh~@bg~Rc@im|5iTfp=A8V@e2Jqc^l ztW-+=0Cs>oR`ZMyhu=H|1#PH6H0s08xS%~9(m(8n5Ae;<TSIlNyO^&4HFCl&)?ZKp zurlxy$$~#Qh(e%4S+Gx;>4%6(T;a=1XMO<CLK(0Vu$9M<G2l_Wko)zpV?>bPVc<=f zk5A$yD@#HMfl&yENKW%YGu!!|(DPznClIfgzS&0GMcoI>T-UgLXCkj&rqu93@@a_A zQGr?zH4<snh27R;jbUm*>TO7#SYL@#jsdWTmSJ<6#2pJ}%yYBZ4T~BE1RZAtTa)>W z)lBy#dPz^fQJIJ-e<Oo8`Ct-*1vr~IM^Ty}@kceon>=lVp$Dy8;Ki9Bw>xsE!kfUQ zkPQ-ZIum}0iKV1pq8F$tG{gN(s`FjHujDjUya=b4fYXWBpSg#T;xmz=<$AO(6rFWK zdwP2D7=eUvcN%!Ea}oq^nSSoMYjW!}30xovLWPVNj&(~0`+$sC9DA^|SRi|c=qo85 zu5`gm!MYy|lQp+AZc}`y*Bmk#f@cv)D!aIJt~lHzu%jc`i1ww}8d;6E!;llXDmL1J zOsZbxuzr^ET#P@8Wbg_#jV7Vc{4r#OqqMA6zx`^f+haCw_nyP&n&Uilc?TR4h3}XH zy>PiUZn^dwo(a#_Og)-%N0Nky^lk90Tu0;EhyRBzu>a7=VM+%c9kV#IC7Y{~dh>Yp zJf<s@>J2$wq5f;#q8vfj9}+EM0vA7<uO9vg!sUE^UT$bll44+_)Acz98Y%+mg|r#o zrJM$oHR9s*OT++@AaM*C!XP=tLy?ddEX4aElX-evz&*ToVSzuK>%xk>%5`9JK~n9S zHVtVnUlW>`D_y|)qw!;Wvag87^Aq?`yr)V>O5^tX52YDh!V)2D;rJE)l89yTHe~>3 z@+Rd!yENXuZVKW*vyt~GV)21%KZo7M$H&Ye`U6wn5L|I~!w7(jjZ{EH8os3sobQkD zqIcG6;rDQDksn`-6sV`$0Lw&P9uc*(OC_#h$K8WaJf9amBySr-8d<!xYHil1cTcWA zsLi5)GArGx*1Fg1)NvR{r<|I)N4NYnm9j7@p5^=GF6$!(KQ+5b`Av}y{h1TAi{l5X zKnNZ2339pB;&X2iZL2?|x<V{DQ&emd^8U)GjDZWY%vwdBP2Y~$wueS!7H;Y}T8-?O zX?6LQ$cO+3c4pC;F0}kFAPEg-BW2H$lsg#7X+}HPxo+*@Wd`nbTWYHJ_yyRapBSAV z_~{(>6?X^Ltj;J@`H&Ws(MY)rCL3w8hFbDFj-K$QLKpE7EuCAU|8F^k2Oxm>rN9Y4 z5(`puVL`nyPKKXIe59M1NOq#zLr?&5f}TkHo`hkWOt*{Qhw$#84(_nO)q!w2)sp$z zhZOMQws54Wc|J0E;K`5j>&Wv|Ab!dd@eq*H!Jjj{`3=f5C+HF~g^DN65(bh*j(VgX zSqR)Sh4|)<K9RQ$y|{j3HRnLlFj1KI7QB%^B{BW$N~8L`BCLlT-Y>Eio{XZgyJ=<A z<$)73xUD{L?idX{i64o<;W*Ja(cZkrab9s<t29$^(UfqKY#^;O?MWh%$>~dg5~p+P zNg9J$<SQY!&|pWDhW{0%Sn<mmm$Rf{TEca6)llmsjfln$o~|-!k)v`tmi!4Y+OKWk z`>)oI+V5e|W9}pWfG7Z8jl(L@&Z&}!a?r>aXTY{nMNc>q;x63ul+r_ZubBg-)<J0< zgQ%#>Tw4STYC|xQ`K3lbI@ZNpl-SV>KZ1BpGF_U89;I0rMACKM_IlQ%$I~qORxu1# zm|`%DT@C2?EJc*Bkf$usSYYbc5v%*|qfzH`{^yjSF6y`Id2+%Bn<J%~xtvWm<|+Z% zTfMZ1)%3{Tn08ig+|+abXE&oSL0>~&K-Zi&DoGvusco>?FB?z^HD;2|q;@D@8czO& z<sG=CMDDWbq<EkkKjNA|t@~84`Eqd?J5x$=&06BKv~MWI1(c~~N4DvBt*{$3F|yk+ zc!07CTW6bp#$*5TD|#M`d}9Cz{MRX6VEmOgGf75olobeEL2@BNWjO2#vc|yGEP@6K zfw7cJAlPikGeJvl#4!j~0oIM)bpVvL&~qH(4<eQk7C6vw66lgHk>ykXcpY;6?C%dq zC*nYCiFe$ig4J-(xFBq?cUa3`Dg&S+66c^S1EMjGBT5E8s+E7NM4P%(i_-^kn;;#B zuAtq>Ws$i_(Fc$Ys2<1j#?Fg`cIH!=5K)Vq!xfkP?McV(|D1ty{5H&b9PNQ~FM<#4 zi!z>XbP6Xe>^~sF{LPU$i3CyP9ZS8(JUp2h*^xS_bZU2jHh>!+lEe@(2&HC68$t|O zN*H2K8asm*u8=z>6cBD|%)O`G!vDY%wa-mhEu8gDql}FiMUqr;&x0aLv@&$I%wH5C zN+c`F1F|~sx3p5gO?V?S$c;^m8o=a~NEs>-xwJPqd>%z82uC@H8;z1|DzE~%CV-|) z3BWnbqa4YNRjrsE>Zu%d?-K)OjJqeA7IU-Q2R|TzkJUf1KvfHFLBbfa8vcNv+MBg7 z{GDJzLLc!Cxkl<8TC>Mz0MD3YFZw&fo&vsBAL&3QfMt)NmfRIq)6wpS*T7;e{EcP{ z<6zejlT=6cK5mQP1IPvl9rAJ?LipK^<N)7p$--MLp(g1T1efUq<iOJ|um$3VP&=dr zMUxCD$`A9@R~7!$YacEYw5~?AbA*2t#u1LxqdNcvASe+G_5dXe<wGF~cqn_?QE7p@ zVOja{3>OpIFA$yyAlt)S34R9OYriJnh<rxh2zzFKhrhvj_B_41rr*eY#p8!UA{InK zA_X2igYpMI%XwhmNO+(-;ti+nunb&W!wr!0$FzXmaI^PW3{b8FuD~mmYz1UrtDn}? zM(&Savzx&22eshkNNn`qV0aKZGTAA7K=?s05r1av3qDiq`FWt+aMdE*Xn4TfaIEC; zLP8NoJnOB*zp`~q-MG($KYLrr5`=K&;oK0Pi~FFtk#s>Ykr4)B4hZ!C2m0}2dk6=F z`V0qzdTUf2`q#t#0}HQh2ZZ_s2TW^)9;BY(hP(SJ!moO4!-sdj?QL^^68J?vGj_y0 z6TUOLf-8RKhjA!E?0@@?d;{izb|V&3y2CIKyMw$pd<`|Av?G0r^gUz0^jd0QdPk{D z>>9}f?<N<2x<_STdRP0Dfg8?Wgn#(P=vr%lX@_9o?~ncPBOX5(f2B?stQ~`anjL|G z8Wf~HuJ52XdfXAu1Rb%@0>hfm%ny(ay)*;pKEco3oF9MvGe2wo?s9$*{cTeCdrxKe zS}Ig~QtIDV;(rU4`FYa~m{)3Czc0pGy+`^-Ib#1B_5~pNp7|+4mH7$M{6FF+lHIEe za9+tN)9=<lPr?7_Z-Ro*>z50E``5qRnV&+NN`G^0=l#c&{u*U|e(8tpU$6cW)t-Pu z#$)ovGJ=D&QTjxlm;}U-lhIJ9<oRuyOzfaxZC^ykswyth5{b=@unBngpsJo7Ctu)- zx5uSq^R3q169zYq_=DV{8tOty>T+UecwqdDZ-JO^4p-v;6HSL@V>>O(gQ+rCG0=E4 zlP`Au^b<`jH@qAu6oa9&kW#xcVR5$;!C61b?oqIiz?-eS+Br3TX&wUjF_?i}e9-rH z2h%*r>S3a6V#UUmgb~U|y{?_g{3=#3g;S@^59!mgYEg)W6MwBkFI{GA!Lq}di84u# z_;c^(nIu?j#c*k_2k|6~B6~Q2Tyt)C5)+O}Q0ZBoG6JKl7F&73B9y+mb0mf}vp8G{ zrm1L(V=nw;`PW|{yc>Me!sr0Cimu#p`qJuF?J0cSs2m*unZDL@C^#i|NlVG|5X9m5 zodO#^oc^7!YXIKy!<^H6bW`J;*e%!?-q!won#;sJS7vu-Yh`0pqO{NK#7gMEG7Obz zLg`lANKDEjGcq$Z<d{*^!45ra9e$_+Ao(fM#vG<RN22`Um%|$xiVr)eoh8{ch*t`j z2jU9)>!v~F_D!+vz9lk_PJ3{oHD%ly1$S+2G^j63s3P1pax5RZ_f>*P^ZKRgFZ9XL zSRQnD8Ak_=2nlC1>%I5pW_kyGPLHj1CH&6atxY|x>W#LClw_@ix#kFIMsG(OHN8_0 zJ-v0?bwaQ7_kxSw`lAti)~mZ#cjgFzfPyCi*=&>;D%vRBaUR?kJW#2^M@;;XU<rn7 zrs@K`lYXxoiFj<`IhEc#G7DKmTpqfps7T?JuAr}#mW70fh>eVIigK$5M5~8Rs|O&L z%17RV6}7K;&|xVbH0e}ZM^iH;M%)F4VDUxXTN+0PEQ6GB_IU)Ug9dL^7xLgB$4~rX z_!*|rv4FxtN<${W`{8o4G}v#M|M&t1$xpdKzQcNF>{_lLQE^Z+<u^joNC@)7B_s|< zkfU&HVDFoeMOz;<VSh5LL}A2PatQ*Y#%~V-MC*c((Wr8#y}Mu$l{i=)R}xAQ!W0s8 zld}9g3^h@U$EJMDSJ^)KXhJ3O%3n#6edV1-v$JCGNFpd`@g6+=V1x1>R^A~N?b)}m zXpot*Y!6xTY3GQ%EPu=#E6*kAb-h8x%sz5qre26DqOHj*Vi$+#<n9Uc@Q6DL)~Py4 z|0@2KRPNf)H_b85cF3{rob@Z*S9~*kllqJWJ$gU%ElDL{&jU}Urzn!{mZXxGd|2FH z{2_3TgoDvZP5}R!-J54bbPpGN`XSPbs;YZDuTZE_(1d)Y_z2mPu_69zHBCj`R8l2c zUZs_TZOMB}a@TxJ)-b<f_CrH@J6LB^N3nEH!UY54gfIgRQ0EAx^|kr6R8}5Ky36QF zZcItewXPB<UQ4eeu55IR)pO89+(D2<G;^tCT1Z$cwpN&MHXnY?1OLiH1$v`m!ksr; zvI~z&-L+Cu_m!A{r;>ov<4c%B+XGA8`ppB;b{F$|t5$9n>ROY%@@mvaGyd~&#*2`* zUFZHaU#@+HAK+^KtmMHAmz(C{_p#(^Wa6PgU@G2AN&`4+L0RGp=Sv67lIIpNatWRz z+g2Q-3Rw(hQ{3#zAO`Hud`1xiEV%`f$5-eTGT8a1aQuC9lSge7wyv<BD=?3K2M1#~ z2k>s6>C4H>7avJrHzt_cM_9-7K)K=r#7ONj!!kxB==}}2B+sez%QJc|?yK5L_bnWc zA(I6Oa7Gu(`a#+;@H2`^rPb;yE$BCnqLBN(RL6)dfqU!gSsoa$Ce^UXh7~pgyJ?r- zotv2JXQh&u5>^A_>g038mUUz4l}_H8t%5_7Zc)PW5h_0OcTDxACYf!XdeYmH+v{dX zCvZRD*&5f66%6!7e63Hyb9Zm!n}(0}8!s$cAJFF`*<i6S6*On+@?7#9N#tzOJRR>H z+0-UNL@(zRE&c?-gijzB@cfpU+<iN$S^NAmNkNw7rsg|NaCZp&&S~lYIQKK?t|r~{ ztfXmv*e{W^*^|gHv%~cOZEE=BXQt(b*V{#Wc6a6`xAUp#rdW5IrT=;=5nCBxOSI`y z2Ri-=4H2q&#Vv-CQPgLIm8D#)2$fKhr=`aDh}wg#AJ4KZB|-)9l6QqCqXWKG{+8t0 zBz*$`{KW>KDif$_I&uKJmM+4!D$au5pbax($o{dhxC5SQWMPx`&O%5Qq=%F@!4iLF zazr^h^n1)-Z0WTU3V)i%kd27#FGC&|cgK=wxAAfQ8DK5wP(rv>4PP>KbC=tyk*5l= zbkRa&SB_g-40VY?)249^l`#RhFwPm@F$s<qtsrVXsa8rGnWQl$DWU!ehjQnHa))|N zYj`>tp60GL(3N@*iq}eX(BV+%dK4R>`)s1pF1=#oIAYQiewVK~_~X^XrmD+ZKMWG4 zMP#ojoW3l2*#CO9zWzRcgs0A674#=TOBU-Z%<qV9CxMQgr9*qX>J8=E2f|myv++WQ zZg-(sruMh@D?OQ@y3cAbCBZrFwhe{94<_rkH1=4Z&+XoLN~{hp<YTFDRjQcissJut z(<5$&g%oy_(eHA(B)4oP==NBJc9VJsRtJ3p&TOJ4`zb2U%98|`jCN!I)?{dMWn@|H z@WDV+UEx$TC*3F#P)}IzpL`XvBZbWAx8L6mcc;p!E_4Way`*34C7W!fsiADr?OZdj z$S|DxG<GY(<(rhkC$KEW*dFfA*~rH4mm!vqub>I%iCin3f?e$d@AR-y4u+ytR{2FN zU|!;_$TKN^RVJI#qp#x-JFqDggy6KuXTq=v)v_`57j#6K9W=^m8g}+k$dTBg@egA0 zKe65gCn*?2KfCmy?CBEh`DurH8|P!rF~zH0rl0Ek(K$d7@L}EA)xU39ttaHNEh`N< z<Q!c8P@F7x#q4Cuh}bVdSWQY{OG!>|#+@TEKMp|UNtw=8kg;%^oEqx1Li{C5WN{E) zpNI{+&EeT@DCj?z7cqa5*IA#bS0m)~_GVw|=Xi8tf7SGe<2(JUSV_opKAI_fzv|8_ z>YU~Ju6z2I?c1r++4P2J`G{=Y1J`u->qmPd(?SFP=gi~9iD!K5iv@Lrp4)!XjtlA7 z%FeCLh<U7OQsD$n$|msJCajoX$e2k|WTdI!@Gr`|4Qz{MrP2*qi@C*(_#RqkI_p`1 z&CwU{RdmVvxY7cZmYyRKLxmw8M@E$%uYn4u$Py<it%q`h{gS}AN!+HGCRoi1v?1g^ zD3{2<DH1>mP1uWQr9a|;ZKUU4bhfKt9&7nA49fkh&!$b1^M!Cky-eyqLn)Km$4ZM{ zjs~gf8Vjuj;@19uq1{QnlHbOTIr>1KME{;2M}KCD;k~<u5IQ<MTs`<7esVjJ?6pjM zw0LLg9dDbLh~K4W#}t%!)RU<e5woxHCgU6sS0r=@NUEh-EQNoUl<C8vfU)ejxF(!K zl0Pv+Gi8(GG*3{FS6YZfxG$-ee?lcx7i2{A)c3!=&loF9kB|^o_@%y?w3M*cU`SkC zCcTDa#WjsX5TKj&`uBK=e3B5Us8jYX-ERj&S>T*Dw`mZ187VdKWNgp=GI@Szo4<tX z<YTPQU>oh_A=(nyc4MT}<&o9(GEs*St*5p14vtf^;c*eJ;csB~sF<O2?=K*dB()}J z_f~L`*i@4G2vZz;$$Py5sgAmkuz8HWK{6!#4d<1Tv;dKORk)Z{g_<nEs>qys1=O6a zj_TeAVbA9RmHpen@%zoxP<M_1ey6NHXy|4bA_1xmBEjott5{g=`7nq}qN{fgq|QKU ztyG^`xL_JaL2$Y32&7k*M#G1(qAy8&KZ7d02{GWZ5tr1C)Qb651BxjYaLAu~65LBP zrRqUM<D;zXQA2|w7#3AT6^GSg=1eN!`QDU1O`)f1#Bp~*##SLI7*dIVkhW)^OSqKM zNSadYV9Qqmg6;K)?Ic#vj2!onkn;hnkmO_7ohnONxN5}$n=pRi!nYBKj?BM00F<~s z4O$(rSFcYuh#FpvCDKe>L*-~+*?-)@-;}9h&qy`M%AwEOobb!?xf>sCUZAfaa^3F? zTWYu<{<!olu{;=o!irj3dQ1Vv(%BB&H}ym1*xIi1R(a@M<s|0{zTIer*!h3nakCi& zb#V10MvRjiNY`vrqv=43n7u=FzGL%_Qp$c%&I-344Yyh`vmWAo%6+n+jV^gT_eCv5 zCveg!)z6NsaLe-Krd#ZjXF58epN@>EQ45U-m*AMgnv&P`Bv1C=^|f#Nizil@x_CD= zK5Q>}A>8TYO7e{Ly0f6%0c-PM+X$*vRiJUA^rEDq7Jd~j6b%cGgeMA;DSA;VLOx2q zhSL{*d}MXQpc*mvN1;D~l5>({)oH~;dn1)KffzvB?D?=bcBOF}$;aQX4SWWpWL`Tk zOXpfBQ}H<4!m~=zlLrb4XPf_)z*pWM+->w#DKNOSX~h16Du&*9Tj$p(q5mx1AuiDc z2qzW%p#6AU)Y7Ba%vrKL`Qs2aSF#kJ0r|6Pga^)JSD%z!F8iuTLpJ%2_JFq3inUOs zIdHf_CRm`qE7C%vy+w>@KTExp%EGMX*O8pl1f86VsYA(=)I0d!cSE?Nj1cF^zE+Eu zE7|#Gp*Tt-%i@XemPvKu`_s}2O!KV8j!*(9)!HOKZIZLANH?q18peIeur{>rJlFB; z&qfryiE0RD?;e}@T)itFb=onz=9bo83xqi<Gn_KV`-*CyZoeblDu+Iy3PyBiPpBlc zqV=Fi?K*Hz*Dh|8t6xGLuZ)l5v%IuhNE+X|!z8Ql;-W&7geNGnH_W`2gi8-#iW;Vn z24ljA3wu$?jN`qcWO=``pLLC_)F83)zYF%)b6$#mqf_ZV+np+bSKxx3D_e_AW-XRC z#X>851mmd1nin~>8b@7jhHy!-U+?-rN-CgJEgj6`MuyEp@)ew2G-g46rT^?>OzG?M zOWCRx4EPL5#ahy}fjiPU#9VsNc4#deC%csT&||0uoy6MnyRo*ne$v^7gJ}1uLC3!) zV0=zI+XVFu$qY`zFFS`gcMIiZ>o=5VkYb}fhw<JwfRlTR_-Hd^M7-jaF+%H>6yoaI z=vaCWeZd>&a%@y8OAeP+0hX0=ub*VEnX6!}QD~bnGy@xeO(m6WlS>y%^~YV`t>+Ih zqEa;vpO}|)b<pZo+cJ~e^)(|}&6cpyJn5d0X5Wx!xco=}H*V$-9#`&=L97j21hjY2 zgCe~P<{7LAtW%Kl9@XlVkt?vcs;F0W9p@V<3qqcoQ8VW%)g!MMS4ubL&HDBfIwk|# z>CnW3>&clX*Bh8#8hshL#&p>6+OaE-Y1Kp-r4|**icyV4G3McS`mv@0Z;lQu!GucP zA0NjlenmujD~c1A65jVd^iy|-=#KuS;jzUM`iYTFPcmT?xG7^4v^=dIch=zpx$%`7 zmA9iwe-0=YC)Su8qf;uQ@=>1v#W}uwmH2wTi~LmgShKEs;~SQ&Vv<?5p6`XRX_20^ zF_-G^Nlj}jpXaC@mWt9|0T4DX<iQFa02#u&LX%F})j2%A+4{M|HZU4J!<!a^V<pc5 z7LkN1b>}MPL}gCrr;ZEnutlURj=#@#s;aHPMFbt0t466y{ii<c!JW}nynA_}S}WO` zzE<a)DDzED$781DC|!Xu>&9p2yQpQi_DYKg_fZ3l2x~1DBge~jj?@Q=D@^d@z<7!N zvua%5)rX1wHn2vTs7G;;n&apJ1#!!!gHx{)TGzJQ@2v9uyIICE-@ku%^ib12y`pwb z&41$WGpeX*RA0B*)OtHQ!O}ilsdhCw+a~fG_StaWcna9h&GCN~oZ!V#4Dm%Vh_4!1 z71ILB9ZRkZ9aqm1OuwqWYqHQWR#2-zgHxnq8;DelW;zCU;$W?fLk{sXZnR3ti?dM3 zyOuyE{(1pWR<lrE1~@uoxHd#6oa-=UvgSI=+m(#JW(<-K)pv0*kkKCG^0&17qA)%h zBXRQGVV$;G$VUx;%g*y<9Vv7XBFP-VOdvlB$EG|mW1qT7k2m!aOH(vwfuYjBhbEeg z$c`Y~Es$EFV_iMe*{t*&7+;gjs^r~+LpYmXRoFFYY_KE8bMV}tNt#%SEKZIf`z-rt zkl5A@RO(4Mr;ZumE*`v*46st{+PQa`u#;&%%1FIT>++Q;xQH~m$X1f0+G>9vw5-<q zBt={{0^)bx82hfTHko!4Bb{e@Ea!8@cKC%y^O>rahOk+=e*6(~3xXQ%!|y7e<gwbZ z+W%$6e~@N~K+{-VhmsjVZVXQ^xop?~rBKI3oe{oBafZ`xHpQGieZ8V3B3`W>7SlCl z=>n^GqHTQF41i>VfePae^%&wC@;=3P&5=4O>?2DlO)mYg=p3}nk~)IDb6HNu(!-^n z&Tz+d!*S1;1l|!GB9$3WrrYS5>6xS11+PwNBN<1R_gmNpGJHp!$`7-t|LyNZIzL3r zDL@v-Ng1cFY1gVL&^*oqB1oDut-UynR?$j-kg*34{Z?86V~a1f0iH;lVB9M0ASh1N zB2M1I4SyuMb0qrRb7pXGa!_J=@FJV;saC$vsa4*b&Rd?dZrDtacXaJZB}eZPhgx7p zaKr|5ZZuji<C99}*~W4kSKh!YXA&{hLNk5APeS&B=G`<QII*81{Qzxmc1cF|1&Tiw z|11pz)|{_ys>`M0qM|r=tM%e)_o7Q9ak=yQ{^IVE#Fn3lh*D?ZnKZwmSqLSqd#ABE zw$qDlEi0c|j%w!cmzDD)g(hy9)o6W^E-ihV;gn%7-3j<U_tEo?9j_YKICH-a)&`Ma z`CI+I!M0RPY?h_K-)r9i`$#_gn74G1@>{kua`)2Kl*`M{hScJpn!2I9Oh|^-S!U_> zFVe3A9}GMW8sT!a8R&Rx_=%OExCFbTg?A6*8^=ktpYMC-TaljS42ioYBqK+nai!E! z>IFOJ?TYrwvy3dGi<OBsmXsm~{Verr<pY2850+#P5QWa97RO#y%-KM?iV8GJP$GD% zrN_^`>`^k``t)(nTUm|Z=ei=U5|PHK{v^?}zF;%JIfb7g5k38hE78)oXdxqcYn^x& zEjH!V!F@zXXs@~$3Xw{o(f^^lZ(hnSrZyxRR;HsGnNos<xANU=o*Zlv(a}v;{EY9c zr(DR0>+0Cv6$zcAQPQvj_`){5-LMzIN4R~xsg@a0>vv9UGx!qlQ5Dqf`SGj=wGyr# zLiY9IIU25b|0b9UUIZ(fdg0Ut0ZpMk_@zxEREM%Nl83@tGg~&wR9!QU$#ZRc*7vMq z2g`fy?ad1kYE|kL3SxMz^y`4JbQSBh6hcdyP9N(Sq6QRbQt!cUy5V{`2<#<juvcxO zR#zDio}un1d<C6Ph%(>K-7zT66WzWNuHPB0BsRJS$!X`v35NI}yM(EqF6~IhJX~R! z($iK6eeatipE`L5bl8qXCfA*fPawc1)@DW{s6F!<L|Dkr)4}Q^Ch7CU>uG14*eaZH zz#*S3T#0O5WmG}m5+2?0FI{29GB-L3q6vmLQiEZoxMcKXSxZb)begFzwH48K_9T2# zPV#3K<J9K~%dq@X<jJhbO|a`4p@q@9I(dD$R9c@xJ=*>&U-{>4erSk;jkAHU)O6C9 zYO~deF8z;Zd3vxTJV#<+)6-g)3hDaO1j*Aji`i6t&tDGvJcPF9Ua>ZEQAM!dFF$<* zd|<XswhIr3>Gc@Ax{G@f?k}Dq1c#P_h4eFuo1rcAW~BAmFI~dVjl|Z@$)}Qn?q=eV z1+uQcTX;=mMA8HbUy=DxZZ6b2(B!HN2kp)&2>Za4ban+pG-74>EUEQa3h>D1=G%I8 z-AQ;&9m`MS2<`Xt*H)4H=zV*A@e#n!xqW?15Qsy-3P<U<c@CL^9WGfqa^xInyp(^J zXUN1%zPal7Sh4s)!bP6-lNQHJCf2XUq!vmz*$xDi>ZWh8LI(fAkw&q{JNcgWqCcg1 zR*{YEg4R)DacDA=;B!4CHVySykH32F8n7FWAa|IG*g5wJw?ET%g4fjz`O=9gZ2b3U zb>c=h-o^-gYH5-`<^iK~&WhYG^ha%R!h_pqSpl!bN?r&85ItooJ_SkVA>9l%U4R8< zZQSqGEKBL6dqxGE5kD|TXSEZ>>*5B`7{wuFuuSh?J}S{~07#*6OXGQ8ATxsEkQNwQ z?7J<bUg-W4mfOukvkGv@-9Xkmm2&fF!{xVkB;Sc*s|1(pEus5YbHe$4Xl+Xc+jNTm z#sUOi!DNnCdYP{P+ot62$Q_)xg(+k^1I>VfN^++^K-{NZu4UPp61z<Bu(&Xj=}6RD zwqBP{KkR%UbE^ugO3;|9mp%OU`}ns*K-FYbDEB&qY5|Wcuvsp;e4|U2(bfKr;VrdW zebHz0oy9#hAL?n)w^2!Gi8opB_hZS;)5gXttnPyAxj$8pABHgHG=<N?NOy))68G59 zeR=Owy7k^ux>6Y~iPLt9iuxP=xXK>2^FWv$o1(JqVSTscPJh*!6x^7BT|nW0%HfD@ zllB}(snCKAculL&U$gbh-~J7NL_j2o^@;;GfZH;z7nzfulO3D0v``UO71DI&M@}le zYA-QNWmx--t^*123HdDbs3$KnSESxRQHv2jjqKZ?GbscMDPb?4%0iaQn2n-)_ei@D zd)=!<^`433;NS!*ltXEJL?E}Ue;G18!@jpyZN>h^&vKvaj0Hvm)W2mxOeUuOHMT$? z=3mF>Yj;ML$4y5I3<t5}ey_wRd2QaO1Bs8)s#llGsz@*C^|0kuA;wd%3$geZ=d24O zo74H!D^nZVi(&)s`-N&A&$Z7Ies&B_1MOxVcTuVsN$yg#zP7<ONCR1_0w7LVUKt); zL`61S)q(}_+w4(Ew(Hdy;^z2ik$2XM^;@|T-txqrDs8e3P}UtJ3YF;+bP381cG@ez zK~?WnEQal(txBi)Xgxn~Rg@;wP&&!477yRrw!}p@asiq{%*=cRYXUg{es>yKXN^~e z7l{lMr!SXeBHdL<F0|GHS}*jwl^pQov4JU}q}$FvezY*%ghFhEEjWXOK3&P@6+R&4 zz9u4`QqDTZLzds%WBX1;{K;}N1p48aOeKg5nFU&u9X&~3<QzI(TBTcwg>aNC^S0^F zEPw2<!{mAqs>YwGnpD0nAC3sVZpBX!rVkwgnlS@oHur!R-h>PtyNf^2iEH8`<D0}x z&1;5?m0KMOAgDVS;A?cy*RY^=s3mo<pc|@C&-yT?>kTAi#uge7ta6$lnqnX`3Diu2 zV_^~0M3e=df1r^$S&9JEVY603Iy4#Tv_5~dSm_4sx~;wRp9R?-bCtMXzU4=d6N&Yv zW-g0rvYWHrM8)!M>j*YFpqBDZe%dxh^AkK(71CO2_(Y-k9Af4P;EcKnl=-}Abx&La z+;~kC>v4(QBI($C%=nvfSvjd+8M~&3`?-Q{W<%N$vxn2Ee&%L3zxQ4<KoR-p)9{+_ z?B#N4P2>M=>&9;PUsyO<^lrMcnJn$rW^VlZq0}rWji*(KeK*osbyd{)Ggc*W<DZY| z(a52E4XsrK(FGl|&=|SN;~6TC@<ulE;=+>1wi36Jw4#o)HA~lH3?bq-Fv;HBKUqa> zC#~>}$Pk<nMjxD%`o=q9(VnQ}H*%R9-_R(5lJY$KP~Hh&;-ymB3M~&7Vj@eYg$qe9 z)iUK}T^jUfx}<0N>gkvd+!YU#!TIK%g4dI`M2)bVK9G?M$S4M66aWIR7}+aqUh%eL z+t7#P^kEwl<w#1Z)<1(kRI$vH!u&Vwh1jX~`Q6zVWy5WA{a;Y|WGB)Qh58xFAPcvs z@gQU(cJJAR?IgW*jaR~YD2|=!cLU=M^UldJY;!v<H`}O&sD}>wUi!~+(M*wmHTwK@ z&xcE1Uc-%WP@7MhXNH`K6+P+tf{z^#K4#mDSli%7Gj7H*6B*fx6DCQqR4e9%)BN(d z)w$%0$Ch%=53j1l-JRX-sm-coby}@-ooX&>@cT)+-c{aN?)kucKuO(9*Nnitw}2xK zdG-M<AP^XMLwg4bNCBoe2CN>#{H*&KI+h-fZE1mcWrkQ3#24HOB4~v4eKvl*`Dx6j zB*!pvjGoqswA1$x-~HU&9(M#Li}dg?`7sV=<R^absLt?KUJlia?r(g!RdOV2IxMUT z9lg<`xhyyfx=ihrR=}<t0Qt{cZ>gj8TW=M`^#@B_&uJQ<poi+m3BtM$7WDmneT1P` zg`1^JkG0`Nh=={f;BEYB=cL8GScy6n{J!fx!o2G|0%=**?%$umK@RZ&_n|mar96Iv z^X{LI4g<dPLYKU=ZWiwQYkatwOO^IThzb7Fw@puaNFV!}sH7>)TRvy8-M)9kus68q z(aS2d>K;ribt59^@#2H3j^W&f9g_N#vXB}MGkElfi^d=#O7eCg*rkr4feKy)(-GX^ zL5KQZKY6W>ea>(Bv`gK%ie40Xp;}%_JnA|hQ%o6j9?q<X5j?YmeI}`T`_a5PO{l|m zx&s5>0&a(N&nBT(_C{16X$<Pi*VyGHJ9X~<^t2vm83=s8-T~3#6EiuFpy+=SN)@W? z09v1^*g1QiHq?Ug%!>)jl_{t<icAmx&YLIXhz@sMODINZ#UafgabgvB3pLK%Lak`A z%-NqfacJpNj_0GX)SQy-7YJQ<&UJmSJF5sB+_~`<5GZdWygLSUAuX0=Veu+GF2ydv zE=?;*E7d+cIl?)_IZ8iFKhnuCoqTC}*9Q6lQ@2_Zqd7{_f2Tu?7mPdMIr&@oO!ye} z1{qvk-848>yp+9{!ey9rN4LVU5=tqChFgShz{mR;(cHnR9u^l(*vd{6docl!9x^MZ zr`hl%{K*ed6*lYN?OeHrmy?-BUdDV2ebs!|eZzbcCb1qFZnLi=0Nav84<E1;J%fLT zahm?lkJizVi~RaOeVlnblxrKu(;jECloaAgq{5iRY@)Iyvb@Hcu^ht~6NAifnrsOP zMYckADO*PrWlv-&j-4nZ*{8hLLXGo0opVr~_kHG{=lMPNeP8!=&3*m;n9pavs$qQG z>Ib6le^ns#Wq83(=VxaGFq0z-fl&J`mIayK{6mbuaP+KS_^zFYPLUs!9$`y!EUcdm z%E{S>e|qP*!wMD`zx>(7$cumBj{LKvndvFw@e1>5V*b>pmYkD%-ua>W9d11NDT!4+ zn%r6ka-x*2V;A{#Qj3Pn$u-o3z(6)hL?)x9nRFx3+RWUvtTOhd5N>xnxhNrq$Eqo2 za7L^(R=+SYBG=Nw{8=uYA08NCA@Vo`+wVaNpcLh&%GAdH`mkWBFfk7s?0KIceF-rY zd^wMLaX!nVp?)?oSKp#)vdtha+<E%5K+)FDhG{~zN#>B#nH2#}!}Z0fd(kF7t;b6; zDvJl7+^nD46EcxtX`4+p6%7G~%_O)GyX(2qCa>_hy`vXlgfAszKF^&Z|8nE9m%l+s zDA#tGvre0@J=AX#cD<E_sJJ+PZtQ(dejJIeS)(D6IcvMvN6TyL_kMJ}{e$DMlOb${ z(_FdvCa(8m8ErVkigm*C>tL(@(w_cfoDpkXlc<rUVwut6J`KOupOo>mkCQlYpCF4p z36)Hf=M)1MtLfn!O;~9vAS&+D?lkq}$k39y|Jj|k&J8IshKF1#W;C#l4Z7YcJnp>y zK>@${6O=6x?!CcnH+w{K`H5E$C}eo8HcUsm_F(JVYQm!)vgF1mf@*K<qu;1h*%`V4 zL1t}^ZN29nMd+WLX_S<jl!3*#&yb5%`Xxgz`M=#mI5KrBygstgL^W>T%|c#=(d*>K z6C8&m%lNl1Z^f71f#vPkCGL<hcQ}W@J0qsZTXyGDm?J!HIPpYAf>z#>1V!uG?p)GK zBW74<q`)u?JAa1SH0v<g<y5TmA-zBfRk0j(l*3PH7h;xwUAUWgZ2$D-mR+}F{2nIV zL1Xz?DzE!Q%zd#1Imu1WT1}GeR(J%9>A255Y4ATT(P{?ah11rXdJ@6kTN^r$y|I7i z`q0;oq`^@MJ~mWWg0>1S?F)AwWhplf&M{oNs=u0rCr;P5b9DQwx5?|5Zkrqw%f08V z(O7*C=LP<xn=d<jU|G2a{i0bBn@q^#Fnmg0RX$IiyZ1$6*{-&0@`7o6(|BOXf?xF4 zE3#xf8BgPb#rbu#9KUh5d+eGQC9Jc)PJh!UE0~u`BjUwxt?EkU6Z2{~V-cgpx<(Wo zG5mrpB$)HuJ~guFKFrd%RdhqB6>I~;h=<2iO|HFS&h)AmyIDZc_<9!E<rL4b%!=2% zVY;B<L#=WT_AAe=3Maahyavat=I1K9?v{G)6glQIq}V%EI>Z(q-_%lmP5E56ZXYbg zJFVdY)oUL*lpbAm%QouVah^^Z&)F}ef)?81do<l8^4W)E$qe6y|I+QTEBA}iP0`^C zI+rVyRc^NNa9KMnH)j=b<frEqkzYwcQ^!V5Ci*DRn!mi#A4p1}^I+{gazmB;mURi^ z0qt>8745xg5yGvJ?H+^WjS~Hyy8Ff5d#sjbdmFX8JZ`wwur(K_80z#P)N-#N(s9S~ z?fbpiy&QG^^p4Gyxa^Hw=n_r!f_+sE$TK>bjYm_{42-UiV>UIZX0nBZf}(AMqSM*b zTkO+Qg=2^su4q;1BfCrYjtfp0Pbg=n%*ajEHd<Xksy(pglKf?mO_Yj_X_g%*u6a55 zhG>8i5hXr-`*2d7Pb#X)uJg5^>vlatCU0y(i(zvV&-{7EBXg0<liSQ>0&Iw?Vp(}8 zSU$`!?}0T%gqkeh+|gV#0Q4P}Z=brk@XDj7GP(l2JGNuv;Ro+YJWh)X5>)Fk+e$0n zAkKk7m08An)>7H{*;&0;QXld;R!WD;ZSitRMc(8S^4^Zy<0ZSuXibf_qRlj0+2msx zzE6b^=Jd4vM&-H9QFNAxr`RRqJ+d_kRGQZQGjlfa=Tcb#F7lFl-Z4*~iV{ZGcJ6qG zAKLBiS3<PR6E;piyuqd~)m>*>j$^xLcJq*Usi|JRp@{#q{0&!b#r@eix#+#uFYczM zrxk=}8tW=PNS8U!dMBLTB+Sx{ndd)S_<BgOC#$`|ggvSh+DXedo5!z&h|KGGi86P; z=GJ?*lA+TBpP*;=oEvO<nC{*_Nr@v$^w6C~Q(9Rn`Furw`Bf5T=JkvnwswyqWKqAP zh_*b5v50FX4HE7#+QuGKBJ)mI-ha3i8_S|BTrHkl@szHJ7<F_kAG3U$JkT97SBGcW zf4p>s-QmNi!-?jIc89UWtUYJ_3j4}Wl%*K`UU+nyT@JB!WBS=l?JISrIFiK3_P*PS z!D3@t5AKF3sPU3E&wrL2NN);@&$b)C(1G`!sNWe!@2kDao;Gd};2g0|RxDNvbIA9& z2AejMbr4#zH^Z7=K6u@Y*Mxj<F2nOtd@qlS?;q94hKAC&ukj-{eyJ<PTg~_ewZtoy zyzJ*KA)nkbFgPaE{N<`9NsBV^_zo6r>}2{pS+PJXxVpVGd=tN)dZ3q|QDJ!j)v?&D z!2Q#R)vXV`{as&PbisZ3ZSRLC5qaAjN#Yl0`N~I1hnT~EO!2OWZymp3_%nQlu!d3j z3qAuOV$>-NTQ{03)5YyCWQ?8-9mLY8e7j^++-NpVx<=p|CmSjQP~etVVc3F17=VDl zz)?7~0;oU>K$08^iG&l73J5GjkD<^_00j&jPrxgn@gNVz#`QFXMs;8UI3%c|5NMDM zqXjZwXtpZO5J3qf%s{(Q{f4HI!(tWS7z_f32jtKw1vn0YL!bc^0)YUK2rx1pLqOv} zXbm(2B*0Km07Qs^s5gIOX^;@y<~uG8H1w|tYY78TK|t1xsttnzz5h9FLw7Rs8`efm zOC1^kl?|lMfKNs)np*0*Hm)Fv#}3S%#$<hy4Ot8@buDLm7YMyWq)=%f|Az$}RsnHP z6p$mO?*<~GXwFpN@ITW)(a_!1)rkU;rT_%Q=rM)hJR}?jN&*3(a5y*~4OYw&Kw<$B z8jXe{z{()MdqDtDcmRXJ!jTvhS^+>2K<3WcJT&--L!sbEERF!7cd$qVxFq=1fcLAq zC4fN!BrFySClF9bs5H=Lb*LqP#RFKvx*#}klNj(TSqr;%w;CK=Vx78f4`5=ePx#fG z*2b>gLEBi%8j85K`ub68nSe(_-Sk^6|2YrqC|~~%8H7d=)&qkqi7%b~5qxFKGG02o z{ChV_3aDxaOPn85%UIk%me0x{%MOWtUXHhn*DefbZT!d%D-W9(>Dc>$HTUsU&*jl_ z?29Ue{>05bfw!?bk`}aa(|}S@#g}P-^JqhLORSF_rGYiapBD8SdO)=ELZI}Xa>5q9 z+ad!N6WF&4&L42U{Hhdw*7*Du@65Tjo^Iz2VyRBAGx@rG`nNV&*N!^*NnhPk9Fcyx z!9&1;>iqNtJ~!mn=!2tMPkjv)x>K?+lf#Hjyu!xoy*sC(<>&DDAQOn*b@9+6&FDz@ zK}+qDYs?;g1A`R*!fwvv+3L)zNZsvjuB!J_N+jy6wTGW4ot}xZSMO3!x~c^1OGwvx z(YPfdhavEud8sc>R$9I5z0$$RCBcS^8w$$ajG*T0GT-+VBc!~9@kta!@6)0ASFP~u z;bpE2gRH`zod`O3|I(hT?FRK3=m`J2F*Te)HX77NtL+E=EB<dQva<nQ0c=)~JN3;6 zh~RNBaxr$MK{z!42_1!XR&l|NV$Tiw3W^)Fm%lFni@~5VfIYCPAwet_bOFw*8Ws(< z(hnLE0UFVF8WQX>Fx&4m1Oln>^LqGy(FkC~ALkMjevFI6WAPwi>$@08JOOlzA2fo( z`n@pSY(VdHgUEM=w2NS6KxZSmxPTT7RS2|a$i@Dt7K3Ty#{5<*B!PfOb4y8S=%4x% DS@I*& literal 0 HcmV?d00001 diff --git a/src/documents/tests/samples/documents/originals/0000006.pdf b/src/documents/tests/samples/documents/originals/0000006.pdf new file mode 100755 index 0000000000000000000000000000000000000000..c66896b4e7a26da0089179d4c44d781f6aa29cc3 GIT binary patch literal 21044 zcmaHSV~}NC(`DJVx@_C%E_T_r?OV2O+v>7yTV1wod+K?<cjk?m9}}_ToIDx1bKT6d zR>Y38_a&1P7NujNXN4h~KRelhVIpKCv^B7R;pJseG6z^06H+SM0RAzI2#stFove** z08}sxat^jePKL$~gp`Vw=K2iZDG05Z7?}yhY;8@y=Lp*xIua@v+ZY);7&}n$^TT|b z|0HGkZ*oI@LM9jnL1{t;8CwTyeXIWlvHdql)Z7a24Z<L5r4KL`Ha4_1GKOK0GPW@V zm=UruvGVg1IszPw^{ruCGcQ!vWY!sxyq;8_AuV|Kuw&@*B-$IU*QtGgz@fuJ=Dt$W ztrY6=JP09FRv}T$Inq&cT8*YSi3r~AU>^ijR&)hgw&+tYE51HGNM3f{-42E$hIw3^ zlioK7IJSf8N=jD*J{_7bhgl%v32Oz+>{lFR;MS(Hw8wl8b{MxdxYG+@3>ssLPTL_l zmKF5sNz0xuhjNBf&&#hawV{={Sm2|@em0^0lt8PT=ov&f4r5LDdk<!|35<b)xtm5+ zoTV+u`lr|#jvTnR58WKhf^i-%C<h21R*=aInLVvw7e*qe|4(JwI2nk9WpLZCu<bV7 za7;GPM+E#lX1zJi;Bh}grig<dWs>!df<P5eFn_Ybp@0|#psq3a?>b!#H>$&Aw2B63 z-CNEh&|$ASoe|1o=b5x<|FmD_1Myr^gLi?;=h4cQ&o_6HQg>$Ko#;;|`f8I8Ga*WN z+kAa_59Ij$P})s$Mf!TWEZT^AYo$(e{9IpOw6U@K+W<+HacB==dV<r)5MeXvmW$q^ zG8y1Ww52?s5_=cagYgrru}^7L3S5;G?B|hrP%Ihv$&q<JA{sNStEPvL2YdJ4b|t>k zYssgKl+Q)JdVM3ls`tp#_~|@~0rmXwu~?byg608F#x-d-ifqI5nkI}hh1QMAD4v@A zES%M$%oi-?Rl(dp6#EYu{zEqA|ME!5&CZyRK~CTFn?4H0j<!w?hQ^MB-xUAmv7w?d zfKc;a3Nt7fy8;Lq#I3&r1^;sw`p;cl8-_u|6(FVv_@?4NQ^i;a|Dm(OH*pz6ZEXPm z_(WL=S^vlPk5}5*$Xs90)|F6`@!QGH#7xM+#r&N{=sWsbMvjF4FkJzLK@s5KWC)Pc zclg)I_^qygO+xnnr2kJn|2+P0W&WRf9REq@^o{;4CP{N6M?%ei%2v?+ubepk-)Tbn z0DUW4(|=%0zq|1Npm6>-{C|YTM99L##l`+z<o`#EOq|S|O#hc0JKbEBL>>h^|6E>p zcwBuC8Hx?@5}sHDu=pA<Vsk=Z*7FQ#6zGieIxu8(vQj8w81B7Gs7so;KwscAqJqe1 zSWp)3snCMl{CpOuJ;DOBxvR3a4Qc<^x2da`C$}88oU6{V>B<Y01wN;#GDS&HBp^G& z&>2ft<p;)Bst+LFs)1$n{^97fnnQx84;WNaV5FyO=!9S_9}-((ACP&Es5CjPy15Sn zv^x)`b;ec;rHkeELm$wYPV}E22NNRmDWM^N4dB2MCa<jt^l_mWu+Li;ATMNJ)|+rL zM~qG<=?zezMRGV@E>rhClxu(B@#>!UvCN<)E&GbfbIP8cIG_MjM^ictw|m=%)Garh zp4=QBkJk#rDb-qD2e`YZtO(>s1tI?6+Nf9om)YAS7XgD#+;N-!mLOQn>CDfr6SPH< z8!t0$R<8q;4I9{C=w!q^ni7We3-jZst!m96du2%s4tiOPKE8A9<SwI?bFw%Wu?xtN zPmG>>+(^`)h-gZLqol9cbPNI2c_7~4%tJJCa0zkl(}p@fg2A^{>wJ@5P%*n05Kpn- zh0r;hKh_&zVon^ihYTZUP;EEvjpt2&njNx@V+fi})vdr1vbsD*8Y5|Ndc7neaqE&F zdm^gYo)~ACls}8+6dldRcq_<_WZOpnXn9+IeB^>Tp2T7`vOo)bFk)%asP_1&8a`-b zF1r(B2i|z*^p`X&QJc6#u*C9j>Z~DQ^n>ku=LS=B;#k0M$4q3(u*A?)9fL$+8^ecG z#cD<v3u|;vbaYX9J73({2o7L@O)!wysMHt^KadV+z;MP-I9re+SJdMW4nJzFFiwae z5*dGu0V-GB-;+6AeT-NT3Cg5YTBM8NjcpIEKBaGRI@Go&o@a=)Yj!-FU(E00Ev;wP z)Z!aFK9@~WwL0c+MYpN14V}IA368av%<UTx)3BRIp6x3a1URWl7vp(ctoN!iWKnZd zXeC^6;Zjxknb{}?vV}hh-amn#!Ic@|M0?ayq3-mUw7^ySRhEZdf$koBb$E5%QatDN ziD)H{B)xA1)>#r*zJ%Nb!%ahal#n=^G0fM;UJ|{)b(Wd^bzL`QxnFMDF(-6_-FOWD zXeGzwqoG`aywid5A|Upgw1BJh5gsFwxuQm*UsrnWrz*TZM#M2-iIt8@hhkD}LDE2l z!UQiEu^SbP%T5JRdm;#NfNYEy!A1@rk$TDunbPr>=z05fmpOZmZ{@y!yeqwvABWg0 zGG_TElpNl*JaHKtS%E$lhjJqx3Mr1s#%j<gc!yu4XWYV4s%|KF*DB)wkO*NrNSO&4 zL-BCHznYa_u20Zs560!9V4R$R<SOF0?Ey#`GezigX@N>IszROALG2ysZPFlPR|j$@ zVF-q$N8PCA`EU<8!)HxD!5z}};<)eq=);&eF#c+3%EQtK_70wB(y`Q+)j8@@^17=D zZcSZG{nHueGYK=GKBIU#5ZLf8us<w=>4gEY=i!m2YZWMd9GzeOlY{F=io1+#2-8<~ z4vj1a*Gl$Hcd*vT=1br>6|BIgk41z{U9y1Jjz{OGZ8zka3v`>N9Nf^ZBUT%ZRW)di z&`c#sb?+-c=YETn5B5xrx9tyrcg~2eOE>K5!0=tVtVy!1b6e<Wi4UBgDcl`9KBs`E zH~Yt3JcSy!#~i~=&|)I!`=hlHzE!}-H8WR~t+m)`W6xD@02@D8`F2VTLaQ^((0cd> z4}NPajJLQarRLx@l*0pw9nzf+42K>=YZ%81ctvny-`ew{M$J!rhcUJN^tI8EedSX9 z=x~laK#VZGhG2Sp<0wzO3mHKOg<j0H$2m5t#F$hEB6;`R2iptB{$-gR$2y|esCKY6 zrFKd_+$FMi(EEe097Ftm=02CzFM5l?080CUZ9?+`CR#6cPniy*Bt|qzH`=t{_&r*{ zrDFVEK#%eKMx2ui($diq_ybH8kQRC56$RMNdmAv_!6X9}JXxN+ZaAKDfhf&5CpVCD z<ba0ilTxDrQEDf#3r{BRCEIN_PN}~AW<c#!1<mZB(-QgCFTO?Gms<r_n63B7_l!;7 zCyO0rdo>5Bu`i951bJL<NCIR5DssaSqtz_>Vno<+IY|urvdka{Cz|z;BA?#|MjUMO zLVbq2j=N6^&cn5Z=pLjni1|P6G!1$g;NwIcNWKLo7&2#m|Le8(TJi?_M)nr)emX91 zxQ;O0+Z~p5Pq8;*Y(yWOeKwM{@9hwaM^169#~nwXTN2pXr?9iMi_}388nr9krU_^k zr{K2WK>)nh?rn|6@6$0Nyy(L>ecB`jV(cdfUE^<x?HJ~hkQ)s02s@0DI{et=h+P{k z*f+n0Gw;<vNQfE5+_$`if630DD@2*hZ)HWiV$>F`F77TwoE35<DE`Xbg2pG34Tbg! zgvpapi>%b3up076xsE%=L<|!zbPT)1-@w?IZ#x1ooXJR<yomB0Z@uo+KK4B#^5hzN z4fFk&{6RMw(-Y)%EJh7Bdx{&vZNPnclVrBV=jZv!&O~zYUKk5UOcKXDKjK-JSRpL2 zDTPlcd)?Ii^N}d&Q&2`fgO0UlZ9U;JPv{t{gQ2AUM4>HhQ$+K){XUZrmb{m|B~Vbm zMUG(tBN=uH>In*Zhi(US$8e|O8gx^9mJ(u+mx+34U}u;0hWbYT#_`5+Lun(UO_r>n z;dh&eMbanLQxfE;;eowFXNUMEU3Y=)&r45m=iZ2{2WT$x3gkaQ+IEn1=wA1T_lP6Y z^LojQ;lw3#C8O@{eCByCZAo)Kxnm=P=MB)zKd3hZr|10oC>4ardpuV)X`~&(r*{hk zJ;7zd->%m_eaWg5C-x!SC76X+cDOU&Wsb>)0y%a<?Gi_JNv^xhNbw!w`N<+h=${)o zf2+c__6c44*Cc8owwtk~V{V;s5EI0Zmrm;uQxR>!n8nS{j);5&%F2b%<@y9AP!6B% z=rBuWg1Y>qQU}lJPoPBKa8i{BijU}!ISRuq4QK#D&(Yt59;NV~g62qY-vK^B^FkDB z6Us;CN6Q{wB*<rgDj1k=yD_4d=y@=+rj@SpvjjBm=8WJWjTnW74$HMyqDTyAc~*&5 zGNU`K+9Y0fmO?_n7BCJ)WU`>V7@$~$LSA<vJ_Ls1u_7A3EBrO^@x?GFwhrRrrukJF zfb%&SePbre3;jfK)RQ#Yo(p*z;54eNwmW}KW#wNox*C0ECpGzN^d&a(FML4=pg*4P z7~&N_>*v+UYWMF8sGGhN*KS|GUuHSBNM9hRxy-FhFQ)sKHl_MkA=q}%c*E82FqT+E z4ZqBX&Duz~q}2SkJkW;7awH(akPpc*^CvqIvtykYwWIY3C`NLwJ*op%0G<x5jO~W_ zbNZ+XMA3iSU>>F`Z}Jkz5u#NQ+DZ+!eQ!TMUK5j&?=O|t>&4_NYCM|#%}50@Q*dDp zjUemZ`KyO79JtT_7}RS_kQe-7kmQ!n1q=Vv-;X00W+o&U87vlg+}pQvg2mLSC@e%A zDBs_9C?1I8+9bD>X+PmM2+p;qG3825Auot7H(Nld^aFtmK_y72(rBzj<9<sAy$Y60 z#^H<da%<uP<NoMy7dFr0YW<I#KWpG0)P9wT4Y>`upur19?2zD)DfUN7{~w~L?$XDS zu6>fuNYjLUe18@B^dL3bF|3sO2&(?bJohPAfI|~0@Oh~ioVTo={;61BZ^IXXW(JtJ zih}eBp)_Glg9y2?L7STi9xenP)>iwi3G#%mvRhdx>xl|Y@Y3*FzW!YeWbBMy$Q!EJ z{1bSzy0>}vi*}vA!CCw0FRi{%ql-=`IER%Qri9fG)io}*6n*U<$$nRJBQ?SB{WYgi zzX#Hxi7KM1D$Au~8`X?My`bNyFWyW-%GIU%-{ty{@KLhc^}RuzqkM!whIA9w&Yy;# zNMroExf}EitT{R4)6lCjbkLV~0^#?nS56{AJhc_w(JthaqH1_5ni7YtPR`S^#P|5K zvtBHQOerPRBKj~%gh&NhgqGu18NC&KAnM=xgVR2kaCMx(wj?I{@Y7Nl;jEW);q-3K zKLY9V1BGzAfcJf`M|}WMY1!d%#A6&i9g(uk6~QOwKExQ3Xc){GaUljd2Dp$nb~*SW zG#cid9m3E%preq6aZU4Q5NISXj*jY(TZ=d$*jT?=qskZhh*IMg;BI!+wEfv@5}N?w zmMD_u5+z1DwooJ#&30#NNi$+BKJ0@RrP(}$zt+D(_E$9ACj;#!Tc{fIPT}FHRu`qt zQRe2}Oy?B30u9Y7V?`AC)5)%tjK<2+CTQg>WkQkP6F3#8Es`Eal6ZpygUJ$uk#QEW z9UZ^=Q#2AvRy5!3KO2=;P(cl}`$5|S+gYbOe)T}?$*Hs0j|IaI(VLH0Xar%F;E&ue z*0OW3vH~Z_F_SzmrCXg%YiX+xN0Z`?F%y27%a`e;M5<Hy{LqQy@j!zY5^2`&udy>* z4i1K&*G!OR=_4ZR&`0!2>*~-KcM?js*GTZN9hZPxQwwQGmxRcblf$Ybky?ydL#8;R zkSg0K018}`t*|Z*M6kwEXeJ?;w|EK!+T~5IQ^ObqA;R#*@h4c3df@e0%;x-wDvRz0 zhB$3S*0Xni!U@8nS%y(kxJNk@rlFNNTpMwcnulu1<A{hk+J^7hvuBw^UhwJfL?aIb z&9Lo4Ei!F#jMA3)67P@}(McE<FFdO@v)4{2;U9?V2vk3My?1Ne;k#9amR6}eVl~L3 ztzAq{r=4u19;@!$8+hd(N|e1}!0g{77*C~puH;QU*z<Xxb_*{+uiI7QDNnOy!lW(N zB?HE%({puqkbx9gMmwbR;~Oa#^TA!E3w#UwNANW|(4fJm{R_muIH;N=thbm7y;TRe zaP9%WSZfaTUV>!~$}wOw#GKklwM%ZDzRX`-Pv9VQ_`6`^by%;h5C&iOZlzs;yA`RH zA!ru${G=G`56h4zj9Al16OhL-(MghNu$@G+CyOXCuhVJ$uo<?S6RBo`^`wn!b=11B zagCCtD!B3u`be=Y`&H$jG9O`Ge=!7r|I;3D$3IXO)DiK2NF3EGOv*)?G@K?Hnhh-P zO;*P0O<S{Y1aeA>@U8v@cWw$V^Cw9XkzR;vwPG)yBww?7ZjHy?0uNBO-CL>mx`Z7Q z^HaG7@h(wdEP<u5|3#i!CizA<SWM|I(mS2x6}c;#p|i6hq`nF33Jks)jd{(J<j=+T z430kn)}CDbC;ShNG7pWwcyx}b0-SR;AIJC;LE@Fk>ewio3U%rWMx`gurl?2B?Sj%v zoE{Lf!ze>Nvey5!C75<18$3<#Q1kf!z@;TqFg`ejxZAGRgsaW#q3?YRqEnyV8}Kil z^+@lEJ%W)x)+xY^mp*2A_eRe#^5vOcEz1Pa$WUV142#*JpCJSM-Swst$cLING;lz{ zkqC9)$%wvtYwt<(!&}80Z3{eOc=u>UvQ30x+js#6_}@1>krq>QC`3MTHlpR{%Yak^ z0rK2>X!A^8%5Mo&b1>5^=0eYZ#Ly1!@Nb7|wn1ncftY(Iny+anC}=2#lM|wHEKlO1 zj2cW=>f9cIJ0s|0(L+Fp{wKG3=p<F36yqJ;J4{fW5D^)g!NJpzOK)6dAdn`4(6}W1 zwsA8k@xRUB%zf-TKT(!o?{dC+mm!VE4C5q5e%I3E>Vm!G6$2~j0b)z~`2O8FurN3O zysH{`uRMx2DI|A*cS#MShT1VTt?-m8&5ic8h<4Bnq#`*S0RWf*l6MA`q04EJC20;Z z7epctg!vcc*}Keib`YP3yT_w2pD{u7m0<47JSv32*kAbt%xi}k#3I)l>(V);F%cl4 zT!C+hwhH-_<VRY%NopDq?GwD9E5VwQZZrtPv5GLZ?+G?QuY2I{GDUFUSbjy(zEVgK zPTnOxU-6$G^=}VigFD%wSAsU;xdL#*iF}Om$4xA!@c5e)fDpsu(wR=K<R9xKXizJY zpaC~3L>=>&)V1)JM1eDp)Q4DtT9Gz9Z66?OF6rd^H9vR;7LL<rti_rMHuM3dEy(H? zP#XpS&6yvDRDw-NW(eR(z2N?cTMv13rl`DjFxn_tK)(hI0ERQtLe0<{7yy*%VFQc; z%_tjzws~GMde`(T>cJ+Dblbg{tUJu)>umrXXJa;`i;hMKpIFp<wlb#W3WV8;dy4ri zUx?YXKk<cmOd@M-$*jU0`!Ze24avsx^*7J(fpCdR37cT(f9DpM!CElc_ja)eXw(^Z z6M`U@{?x+&ORxqpZz?4Vh+-9&&09pAt3DQ|3(8(MSC(vo>k9OSTbsQQqnL@g`3&_2 zD?ecpbsUiRF6u(e1!{u|fWjC2B;O%WNZ=pk4K#R6J^Nh?_=Y#2WM=dpR5<7}YI2^F z*@ui<;w!jx=IN$>Q><Z@<d{b=MsI%8=2BIsF2uuNkV=*@{?@fl0l&SyFzK`GrTub5 zUjE#CzceL~*JxUSsG4hzXPMeHgXR!i^Mry&sCIj?xAT}M_UEwFiA&9)3t^xQZ5sqY zaz^~v1JmnD5VdXcxG7&USBPFnX(s3x_jptAiT+*?Q;Y*6D;wWt$U@^J@9;QwTaV)d z)C+z=C>Fo4`)IoPxcvQv{NsmDSM)TVXV))X>nZ3yJ=9{*u7YjFUQ?#xvtwJA!?l3X zUh0jQ23TT@f^uOFhz(Xi#*8>XVA3)hy}^)(p%>RI9n74?vo}Y!ufRQY8gZyVC=OT% zE+3R$kf1MlCYdry?5dR@050EUJ%}G-HiIKS=GXly+p!^%b_<9XTz>swLCi0}80$S# zXmnaAf1t|ib;JvJueTva?2I06Cr%lFP2t3%aBhKcu6zZ4E3CpAksT9*co08yxD68` z<1xP2tI(X++&z(Xl3bc2wwSH3%%4?TCf%Tr>SwycZ^ca3PT^M)s`TF-MUpkVmt@km zvBlPfWpS(`;);Q+2MNVUCz!THt&^B3w_<EQ=Xeu=2sxPWf)|Dbt-oir_FuIALcbv+ z=1Jbl;jskWHcWKkJx;8ttCa<LAW*9Fx`KIu>w1E>@1S#r%M2j6gRdN;)9$0w_5`bi z+2FLXe-ndjRy>sl5w|O>0KOJWo2<?JSfzj`NM?7ED=4~eR|&QGE*QN8hc7tjn8vj} zDpV^ScUlERLJFJ63I<6N0XrdKBJZPT5{{?+kE&*v@l!Y5*5?{Xa4&>A<VIkVT&#@@ z9|xOH$`32DCpIx%7zF1y4<a$)Dv|>vGGx!k5K;U~P+&ff<X^u0A=B}PJw~3Bi+FS} zmt-oBi<jFjetW$PAeCsH6d(-XUnmyn;*QtTSa<7}+dO`n0o9nzr%Wcg4N2REwxOmQ zsK*5Bj}X&s5UBWO2%A0l?Ey=W!H}3>u6<T?JGY{6gVwz_vsAsvYC7L5UB=B&<4Xh; z2zo>nv)0!d7iUNheN=<=W+dD-z8)I*qiYa~2TL-?J&{{Jhe}@2OPZ7s5r-<g#QFo; zm9pkD^iE~lMO^#huzD80!IiRlHaA*)LsQU96ait9u=iY`CmOV8c~EapUlhI|Nx~f@ z3$w{UqC)anc2o<KKonDoK+Q1w^~6AW-ayiGHaQmi-}ycj#mX|#viA`Sr2Dlg3zvlZ z(cF>JGY^$u<cm%5q!Ah!gNtHMKt!jjYxT?ZYpZK#r#)vn@+XxIhzjE&${%2?g^bRh zx6U`F6qjXbav84d?ey|}yrbuB=>rVQAgB1ZY+TyfjUn#|e5V#qPyr)L3w!DvjHQ37 zs*01O4qpg`Kf_*P4L?WkPVDteUI+`PXK(p(4<feTQW<ji7zw7lNO*Mz^tNAw`))7H zCaSAe<8r3&Tm@%F?pWOgv+g>OdwJuaruS_8Ib5?j)}?7>4Unc$p!AY6fu;rDk+#)A z2Bzz!_;ZRllMWW8k~Q6=LAY`#at~_pB#&zG`gv==?$h~5F-UkI7bi2vFmiDF7V2l& zNNqHkmNLxJkzp=U)l)Q*qS+@>xl;H_re*#HnW~bR1eXi)K*)TA?U&KI>9truN>yg7 zwHsP^IxFAxJolVl-~VaL>K{&iI8#`vOlun(`V`hTRM$7IsM`7PCT=B=#Gg7n9sXzF z;1f)pflTcgTDlzT|K6A>TXm#h!;aI%t#ddFZb>2w;Jibac-V|>#H>sz=|wA-Ozjs! z!2r;f4R7NIsH2RbN!Hc<2v&-J3ifMN_ZXcoBLy#5xJC-4>;7{?eXTNGKKF@p(^q<+ z%H(f}W%=F;JO2mu=0rJa+<q~ZGE*+06py3GIfT~G3iPdTz!#7?s<e@AHBaneun&Ym z1(g;_Tjf894ObQ^aQRiPFr6m_lYT78BhDK_8#2UA6sO1%mrtFVsxh_^(S(MJk8^en ziYp$;T0H)njRymi4(>c--sVM_N;e#1Tv7Hy+OvpBI(}j>6n$LIiVI_e9vG~TK8p}3 z+@x6b2~iQ(vs|_gyv+zw^H8EG06Fq~Jpg(Z&O{hi4XF~(T2Dl&C%BaO)7PXl{1}KQ z9~Cc@e&DJXUPc(P1*tRis0R}N{;fCUllGbfg409@!{B>+Wh?JwoDpm#wAF0c8`2F) z5RSw<!f{q>0BWB|6!|NP<u9WF$B5WDg8YDBG!y0T>>%Rf;N<{ASxRBrU@QZMW4~qG z8{ABiM`79^g8}B_B;J7eU%_5^90mfEBIk(4qdq%Qkvl-g0i3ah;P)aOP_IM?{-2>q za@p@VyNp2gjBvtuAn2h&$Y0RPcE|>7aDsRcNu%?ejo~EGzP+KC{YV3noQpkj195Ue zoG`&;vb|=}hI*X4YFK`p2=p@E;Coy$zLH23g3`C7QvULx30yib1<02AQnv(hkcP-5 zgxP`PdU&rTeP9FbsiCf1!{&@sFD_=jqoMOV3Io`ox_wfmLYd%-NT&V9p{hN9_c0km z_OwdHG9gnaWP3c#etv;O!|HSI5~upzsP;(>4C1BqRO}zspqY@+2XKW(;idGi@0;48 zPY7uN-yv6vzN4x1fecvcA@4TYk?lI+srDKSoasaF!q>36;i))U`HK#))!^NTwos2g z-l-C9PT13FWxc0nJqT$*E)iCRSR&g7oy8OMLZ}6~;%db(;UWw8ukAn#@aVDalB)%@ zVBcV^Lvs*sf^!gkg4oF52kAO=;4Ttxf}SB=1wEv?6YR>j5ZH)#0<n_{1VZkx4}|EE z>{fH~!?_UJ_(_Lq>a*;Ugc9@=*iq~n+F|bQUBeDgY^RKN_a@l6+<LjfT>kRJxfJmX z-mAAG*mblM*uA?Z++~ku=n)EC+ffaLcEz%X+(kAErVHiKr!j!#P4`4}?lm0k?z4$z z=-UgeyawCFcSW&h7*5$XAMm=Cx@EYwbj7&gz<cU<47I-I-L=)n-5tLM*`=xBd!fhk z1>3#S6T6+hrXF6(#lCr}VR=F5K%fh??V%sw(C66Iye8iLWhU|tdj5-d;D+&B<elVP z=pFT)`-QzD>Y2h7(mUYUbUEgkzJcru%4g?U)fM}O&lUUz3h$?9&feCx%Xh8ip#*)F zqy2V?drYo;ZczOG97qDe9LNGYu6Ub*?`R0b-Vi=N-|-MAzJMq=y@7p%-%&mjd7*ql znvuVHZ%8`=p3yrpJYi*eb&+Hp-znbFZ!BFAZ*=XzZs3M(w{1r`c4$3)pKYI!ZZrot zws|<iT@j**yb%eAK6`3^@QZgL{IJ7gg3clStd{xm(JlG9>((my`Vd$=(S47U`PvoZ z{ur1(zMu9foELaQ1iaov%IGeNl=$4TaDSjy%?rH5$$X`r-N*2p+{d*3*Yqx&kFn44 zjy$_J{0id!==_QSyz+dN&wr_wd@Y^ae>wAfbbp(fS)bk9A3jd6vS;^OUtd2<P_d*m zPCVP7z$nAtl4r<3eu#+5OZ5HxXd_GQrJ!%!z{Rb^t5)R?*p;X7c=9hQ+?=IYVoP<V zsBCwxH9qNtI*a`T5#H6&02b9?f){aRtBY$vpKlJ2SwD)RGCez!6(qxuUoH9D__W;{ zaL(bM5T6tArwV>J+{z+C)5@gYZG<#q#R!L4+(J4#w4Ao$uCAtnal)XM{BYhu|5<9? zx)v@CEf#Ba0?s&S2Vo3haWLu=PyT44R*e_Jvvts<AR(3FvR-Yb#6NA&cg;$awVsnQ zde8t88Nt9qJ)++Ew*dVKTrz2GJileFTFX&+%d}CvS{zIS@Sv5+$S$);HbcD#%uC`= z%Ub{oe42N_?Ukshn5iUwL<~le6QI+)^TMfoiZG+2VU=mlDa_VvQFvHsNoni30{j+a zUTRoy2}D<Dk?r2XJm^GYjr)ZE1^>Y53i-9_zUss)LttKOQA1Sx-gBdGBskl4Peznf zwty%bm;TI{P)`mn(Fbe1R~$``3oavo`U-Pl3`L1ALJ3!Xb9I-<lMU?Lh-4brJsH#$ zVL9_|)w*Kqrr^ww0y(YOo9d}J^yg{HZciTq%ss_1H=U;t?V;Scm!#ynO}k{C0%tYh zsoZ)InU^vd&QwB?IPB(TTfW;%?2E0y?G&5KrJKpZAJgns{ROgzdu!tOi0quEdJ?z7 zf`Yvy>!;4&-V63uW%EY#X<rK+npng5B8zYMty559yUL=K2Y6BMuzm&dZ!pn<>-oua zNUHPF_uie)9lzlSPfGP>kXguVvAC!rBg20#w+1Zk*J6nL619-_##ZI>0O#~j=kn0c z8TN{Fo5SmC9kgA{14=wmQ&&+*jt&Ia|5$jD@(>4ChfOD>UpO9NfK!UJsP-L`kmZse z$L7o97i}0=ub~!q$m#NWOPagVgy`nG*^G%uiCBWyK=;&t#+|Q8LO%y0Qy>a)fAWot z@1@KY8`}P0U{Tk{$L|k<Q8%PWp^?Uc`(tp!jW<UMyN9iOkX^kCA@WN%S}~=cbEKbn zf4}B$rZ2jp!^F9zqsED(Jqw#VZ(eS`0uIcd$J<>O1ZG~S!AKE<Bsj!G#+!mPm`P`z z1N0$y_N3x7E)0&99{`2ugu&Xnj9Rk`P|Cdrp8>7|pFiy6aTWY3xYe|qF1a?j_whE} z_wn!PpAWvCwXIXUvu!=R<L;Fo8pD;3UXQXLIVM?;8BZBHfEik{Tq7E;@Oxa=J|i?; zK7RP+{!hGu{FFit5N}h$?Ip-}kUV#vpEdiGmG?JUhD!NOC|C54;63Rb33ByJbfrTL zxj1RL4%Q}C_Z?9a<AF&X!b`a?<*}dk^=;+xG6fMQ7SwZ{tOWi>^9c0L52iB21xl2r ztZwCI)up^EIzC#BEIPl`OfRtOb*k}tfE*ACjcWw{CcGL`iAT0L6nw-6ygpti1}jjE zf_tU?Zp$1|f2J4{xG%^aF+|LCfBihO@eDn;_k0^}o{n}sJrFB7v|3|tF)&$!hve`4 z-gd)Z-R8XCOj)zY*?4+>J?TsXlacWzZ;N{}C^T-~K9J~Q8}yr~uTOYof9bGablU_% zBFAN7f%yGYgDeKC89lqak%Wrm*aivMpwo|7IU~_Sq>@?{bVy7ITPYZndcmhP;aDE0 zp-D;@6F+}XsHU!79Zv$SMLASEa+z0OPqrAR!>HBhRML(ki*#X7I^;2Jt*+DB>lm!- zb+cSV#VDXBwJT;xqf?P5S7Xrk8k6zr7GAC<qANu7j+DH=EQ$$;nTo=#N#eFD9?ZTp z@Mw#;z}B|1&BV~a%O_$$jgw2roT4tNA4{unFib4Jp!6$6DS9q4)iJUa;dr`kivOJK zY97^@BLIRn89P3n6sg>=LUS3Aarpdwvd2>U8mVC;Ftxv1*q0`<hyIs#<VUI2$Q*aE z4&KMQ6uM(^?3;0i`KKNnF-xGG4!}Y3`VzdnS-{=v<af!&-(~mlcQ@QDy4LTHqPJ1t zsuOMYj>BOtJ{hDOZdbY~E%pl}Qz0i~XQrF3cawSA)syDgY!`XiT-{v-m3tY}SWAqS zM5<4u`>_PO2#`z5&e7ykf}SJHOj~Zr;U1~ez1HA7V!avoo1Ef}QWHnp#Q|9bqvNr6 zqy!-CxBK{n-+N_y5-2q|j#^c|SyZeE(rAt#7&O2u5r1+raMt@@Qp#|Kd?JT_Z$E;L zI7S|{t+h%t*jL=>CUg?L;SVcDt4>^{Z%xnP;^|oC=`!BWJuqL0JP;FZQ6UtJU)pu( zH*!@Xlq{J1I*i~^6WU#@RIzAW-KCGW_#43<*D;BOnk21dJgHbh6_K<sMlPcC35jv% zfN_U%O|5e(U7zaWIMNk!4~*N2`_kc4@3bUat5HK!?xf%3j#rmTzY8c;oz3IL*Dbli zp3f5msful(Czd=jtR=Aaa6aTW;u5Q(QT^EjnxZJmL&SZuRP~0rxm;(xSA^Tn=LqRl z{V~YIv9%(4KW-~<_vSoTXw`DjQ-H`CQwEs#;oqt?uozwu=yEo_V;a((w-*MSWrM)d zhG`<Ig@*blG2no~)?8kQgqbmF;(+@x_eJiwtLA!Vbj@D7U<nn+nJbkJ3>(zpL?Pv{ ziTKZsrM(uR7ffa1Rc0EKH2FI-&JQ10v=)2bu%t=T`4NupbUAx;pY&Bl{h+XXU44Y& z_&ig&S#OGRaarc+vi0)8eTnaQlv{OptewS$Ia%a0W6cf?QLk?8z^Rj=+r~Pibo@0s z8T!3Q9Em!&I&`$JrQF6^gtMWiZ^aH+t1O(nO}>M!VCEpmDU6J?yW18~M8c-XCtk}u zNM_z6u%Yru`<RbX=hsQP>lm9PTqwsFl-h8xTFiBdRIbs;VoXM=x}}3jM-05N!N;Xb z1NsrVkivM#rQY{@B-q|Wiw1IwtJL$lJ#uuW4Ed;tNoQm*Zl&S=$l^j{30xW7rHWFA zy+>f~2cqs_7prGb%}nQr0EK7e*K20f=b8h)oxtAK(bwFE`mxoBecYS=6MHjb?i+0w z2BSDa0jY<hkV2{E6xJClc@wY-nVSb~f(mzY5F2qS#*CiE&j51|+Ln~W0IDP_10$2s zVn7{qh+oU9av%pLGRB#oHu4k#vdxKTOBAlT(tNS$@2GO64LlDzx^5{md0)lb3>+$E z5Km^ZO1YSX{v6(peDQO_)sl*zg2;mu+l>0Et@;FHTCv(P<bNfbT2-ZU>^_#e3a=z1 zoWFkVt8!#@T(0`?zrG{C9-@w`vJ2FozKV^29jwxbReheJ)Vth*<bR#X=kw0ohz~FQ z$Z<LM)bEyi+`a@wv|jJZ5+B7!JJTGXoRT&^CO{11jx_>Jq885c|4lrlB>w}{nEj2! zonKN!+;}eR5ctaK{cL004^;(t13$9?#t9Pf^BPS?hw3eb1>n@ysaBU{QctwA)^PGD zBx%9<%5FVth97sL!cTbep!F(DpZ2O$?3kW;LKaM1Z||1sz(q>Sn<|+bCs~pqtL&OC zzKf3Q#)Sv3qQn0*zAjtAo*5@MBtkXatc62G(;N+*+dCmQT&s3cG%-8P#!7h>G&y$G zrdq^)&|olkb~<9jt&(ObLHWh}HGa!b{);sNW0pEK5+aK-pQ|v%XeH9S(<m7l=*<8( z=Pl5v9yOtqu!a*e0#z`7CCnDv0l@7QP5QeMAifUdeurr<LAfC*^)r;ph9g9;i8hje z1|KCRyw4;qv@&o&+HlhPR=&PwMQVb!VtHSPS(}byROvJ5Vx!xv^F%1bN9SC=Tb9cW zr6URbGa+f1CNbf;S!Rg^qo2uCTb9A+Rz`Jve2EGYK@Aa4tz<rXWSb3oJ}_N)>U+nK zE?;_P++%hkWWPD`>THCWUFPE*oxF&Yb{{5Mi%5fT6ol@Br1E3C^%0W5E$031Q{T-` zVPn&=f21p#nmcH{{^)eg*0AG^@pcJqp8?khRd*d9CO+@=r!#_rsIr4q?y#HmaE!@= z>7JVjdwEPS9O=k~iBPDt2)t<5<<0?9#W<{M%3Ht+%o1>T+zC*SB{<oDX>HzLv`5;d z%=Luyu58O4zSZ=17ucMhIs~>`aVxK>p0dpeu*R<ZAGO5j6#@dtzn0pUW-NETf@swl zPFAkAg-4GbJj#ri)1xp72wT@>n)~T~tNT-=ELTG5coC+wL|M=eEaRnoyc@umF(^Aq z^4i3#T{<Yxz>7IZD$FPOn{htr-)=Z6+LUT;a=xzeAXZ&0{~EjU%y)Sx^}vkYT)auP zsiyJRkBk<A%sxGKHE|zp>gp`-cD=3l!K~AT;*Cn~(J1T$#*fk^J#n~ym1d4JMiLhF znHfjSOS8%UYl{M}gvx27jDvjx|3&h#j3m{1?QrT;IO@tRElNT{vI>6^#xHY+O*ZRW zO5mhbkDq#2DThTA2UewZnT^5!yrY<IMo_-iUTN6V^hlGce8+h!kMA83mipuiuH3P< zLya1Q7hqq0Qxk{dl$d_M3~BB>SF$2Ly*%2}^_w8x7;me4SJywgdZj0ZpMN@jS*bME zD_nTl<@bX$hCv>=3?^zxMA-ZwnnY!E!(h~M;Fs^uS2REFn>0<5SS}+XqH#6J0OK$b zJhdZ{HRgKS_?>olI*76XB=zdL{En_v7J{&(KfgHu`UAtd#YZ~ct=e-J);{qvTpW>? zRs==jxy#Xs^}d)g!;U89u$c{_W%fG7T8C)TCagFW+cy??`mzbt;~h2}ISRsDWXgw2 zxGNN=FZsFIqxy)C#_m2Nve(mBjdp+3ITvU%Et0=9ZMdIEY;K(}##o(1X(ZWRBj@&+ z2NiLg?EVac(}d)!9UT5So*qHF@Lnnna#`?NxN#qLci89(ITL&AYTZ-W&?)zNycA(@ zYG@W<h>a>Q+1#&VygUnHT^|=4Mcm^L^U0c!kAGn#FM(*j;+(8m*cw#kA3Iqd9>-&P zdBZsD-M`wSzB@6Creyq;2*}S%V!wnlFX)R<2%RzTgF4<4QFsq_rY_0m7ip`We?8k{ zh4=YAUlD*9-Xrn%s;j%6y1y3;`^5FbR3b<rFD{~1{!kG5yx%C6o4alh{)amEc$4+f zXOI>^{5B8^3Gx@mu~<$tCN^!bV9ucK@`i$%n$5}CX$o8J^=_ZLq}Pt;ct>Bb4lZpo zz^CUU_X|6sJj29NG6Ck<o$ZeA#G`4=W=nDd;Tgf{E#WM{=9QXbRNu3(4zXr!8ga)f zRV`Y-E0^Lp3LQN;DdIo`GlC?X{Ors?_4sH|C3PuHm&3>Og}(TarXEF}YKq}5ai6<$ zzK!8hrX4c8GHFqIk#4b2xp}Z{!yRUFFEY;Hp!`t9M3rSuLmky&Wh^Ht<6b2!?R}Bb z(2XX?C)bI_RpX@IKB74keY<lF8)_uhoLdPKOA^Gt><wVdT^ObQTT`YYVi^bjm2}fM zZvB06U%+)^qTr;!Gwy*VIOZ;>+tZp((;&N>3F9Y$t*Uoh|DEQEvAyN5%*wpL{LcKf zf;I;wSvnP(EHrEBu8hab9S6J%?I}|dE;IR*=A`+`gThR@%3;i!e7^O_JK+wu!S!tV zLql_>l>OcJk2#_+h$4wF37M%)&u}_(liZ|o<*p|}w^j+Z`bSBvd@>r6(t)Gj3Rj;; zjd+@03$%`zF}dbbn5(kIA(2=qx636tbyO2KSm|fAd#moIhZ{v$CXX@}VUR8G{Uz%) ztbOPAW;x7F&%-ti>y0aqgku=4yf&DtXW4dWrWGoG(k@fQOH&(7KOepNamDV{?Tiqp zDs{SF)6WB+#`>G9e4Hx`uJ<osT}|-RcpHsoJ6dBz>uu9n&s!S{mLi=s=sw>=Z^rO3 z7w8`7J1fcgKjO1#WPQ3H^FQ|kY=Dc_N_UarQ=(drElkii{O8bwz4CLF@7>?I^I6tz zoxA`G+}g&B$c4Rx8j5~Ieq_Cqzs!9L`n3J(>*GG%y*i5)Rj#_$1$4V-n3tT3-Xwf9 zuleqfr;)dYqkUXIciu?f)EKevg8+j~2Br+!MRZlT=D6kUf-a<QxHp*wDq1S?`LXD+ zMg{=z3UXWb`~zv(*$ykcNV~%+0W0EgDjN$%wlv{M1Qz=+CVSY(=|wfMf+JQ_c|~`j z(E)ZuHQoBuXRyVm;sfC#&-tMG2n`r#dOYG3$f>)D7-l7EyJFM^=?JJI>p&}VO>zHB za)Vf<cqU;&sZpj@BB|m!>=4u`_rRFLfhn~ZyG4?7RBYS33Y$gVU1Mt!8I>P52XI$Q zD^fdFjTHuHxVCQV_WKi$RqJER$X|aQtXEpIw{dG&IU-5yx8_jrY|)^O(4l0eU&!$1 z_R5ltc}%Qyaju?Um)<aD>cm~DTtCCgRd{3iA2>3GtlSG~_mqa)yNRF9a{z0-9EjcS zu~9sR2^4_|rA{CFx*k0NhWhw9B=#^koU5GFIMQ6jDw*RI<<<ix#P(RQl6I$*tDxj7 zxJc3ir|}Pwddw856RJqdU8KaA6#-WrW2$h8pbumdwGVzf5G>FT!Q8>_<ecQLIC${c zkS76spvl8Y!yhJ{gQl6XN6>dps%a@|>9n%xF4)evE@_iCcXWrcrFxSYCYn~7)~Hs2 zCsSq&dQlcVCf31~c5pHUK^FD3KJUaELqP0&ld<eWv6-q?FDiUX<8JDn!n_HKe{=_z z>~zLB2K@uK0TBb0OnCNtkpaImr}5ryiMXe@h^JQc!AwB}O#LH3>8EVyr`+kQuC!i4 zj8GD3?8!}xt4Bp2(<j6z)YtM3S`RkWjUkx>DuxKNCR&Wke9(fbn;)zD{~DVvpZ3?? z<NVRksrXAUEHET48JBdb0LpyB_yKN#y(M@*GJ8h@CpZ{=uE>CQ^88fCV6*YqyzRVo zN_Cdw^?vx`65E)Ki5O>P;F&$cwni|jQFEQtyyf*G`j@LeHYGZLN?!ixJf@miVHTw} zQT-2X8~+r)pX7<~p6gLy4<5H9#~S1O3X&OYSHWBT9_Us{v}{%hug{a$m{SA~R^&^X z;GY|o3(}{;m*nhA;D(r@U=__^E(QcGi%hFD!xyF3b+72mTIvBZHR*78r)Y5%;H2mo zkrU51VpZ;<3W09#?+*;ZjYTW~V}Fn-Fk}&~3KWs3a(Ih`aQ86#s^Tmq9z|$sg6Ont z1+t+d>LnFwj%Rg&KPrnc)EUs%WbOCFAa?_}ErfK<XN|@H8(2r1nxk>gTKTo4t(f}z z0tW>QY@f(DaITPXM1rS%Jn1UVX*(goN5|}&gT$zdLi1&MN)Anyu^_SCK>i^%nL&H$ zStUjnodw!TG3ogbcq`62^GrXB5YFjxoV>4d(DE<Og?ASli<S~sQ;*}9Z?50mJJArd z9_&PI2{Z*k;SRxnbC_Ux%YCo88sF^<2sh5cPI&B>^q%0QE9WJ&V2=m|^h29_Kk2-c zzMoC4ev|l>fv9-6((vA18Us&HP0wfcW#(Ol?zuI=_Sp|CD}n<8JS@|kQ(S^n8{PdJ zd^M^{Kvt1yCrnG&<nB$R6Gux*3%E;9llsaZIT7S~5K-*MIn%VnLN*W0OqV2o5U*y? z1^*CuRsn91o=F_pb^k}?=D-yQdfTEPZ0E>Z43)&Z+!|UxM{XY^As&)h=10%Cv|qna z0QI%{)Vh%L3yJ0yB7S#%@eIRvu;X)HmExVnz=Bz?d_8a4^XR~vd!E_DubpR5iUfNs zJ9}6mymrp!CD0S2&J9`$lJV#lk~9jiu4UTxCM&d(<>25Fl0TisT0Kep_C;ImNwm7Y zk1Fu#0y2rGx<As?MiD6@CoN5FtONvy)81seoEBJ&>W*qLPzIR(O0_w8F5hIKtaiE3 zx4tFkIp%<U+WLZ8&vnA%&+%pNu_9$uFE5Q_KGEIqnR$=gMv7cD1L{dVt@&q%M{u4X z$Lk(2daYow!Xkz;5#l~Pq%<=J(g1ci+`IW99=w^U`1K|R;e<2oP&wjP=NsLT)1`)f zdMhS`U7QIzy6gUPurmB-Cqt%uZc^EKlx$ls+-#<R;=@SYTYdaxeGG3#;EQ+6R^`vs zrRJFPAT3VG$nB`XDQ65$_D24IdLnu!3PXysm4;IPE7p|yJt(2-FdlSe=8<^(3!Oo| zX%OW)<2bA^^eS~B1In0jJCMzi23d81Ci_tL^fGhRGMWl@+m+qxtp<brzZIWkd*ui} zQ1F*q0KZmhBrm#|5iC<{Z$fC~Zi4}ls9nON<9>p-?XCf%g^n0$#8Yv_79~a_kH(m3 z`BV9Jt!34BDD#X*My-piOMt28sPR=6EhR=u-cmiI-oyM#5r?hyt__-q;I!Za6_=b; zp4vBFH<QbWOL!4!5iuB<eQ$Jr<y`mm`0}Jnvl9%v5l>1LLC!{FP<zydUj59?rn$4d zaC)Q~?D9JhlY%v69IA_ss4pjXr{^_S;H~Kx*Uk_=;hO<I_-yhRwLon_3Uqtx^PSb@ zgxMkdswh62?4c&c7Iu?XQjEoh+K@?$)W5C`Y(Vt8N4t((N3_jxQ2XFqEdLpIPiqJ( z(W~+7OlIW`QNJXGcmf8U8l%QbC#PKplZP#u!PO>Lb&8_SOfnc$8hBI6j+T$_4B7xn z7W29F!H3l85m)L>psu`)A$A>g#7<~tWg&D2H?6{cO|m@=4JEQ=r~7xvVid|=gU*Vh zGY3o6Pa31)18*hO?|T<-RbCE{Z<;=L2OqLJ-KQtkOI4n2ivsit%$5?}1J;GR0dG(% zuDbJxcinsqw_JJGG1hNe?gtC1seh|Lk(Rq5E=XOjfH}ew#}$W~pI!!Nh#$XC(syFS ziM8@}F~{hzmCO7R>%o{Al}VV*#CM!Lxn!@;rZEDrioxB?bs39;nzJBr5ZG<lcM+~d z6(l%S_)Y35cd?FFx&`DMu+)f<Y|cVZoS8M{^c=RL=uRB$)VIG-Uz%~u18t1ICX=m~ zYyiSM%6WEV+C(^<ZmXPc>78z;TtpktIl(oZ(mzUh!OkfQMlholETxWi@vG<t?uqg4 zN>o!C+<@e&@F{bgBc0(1&MvH4=%R{Lx08pa0LH$5FXe;SAt@=GrDfH~%JFI?4rvW$ z3xa`~`r083&RG@9*xBsbwJp>Rv>96eI?-`7RJ!IBAN&C~w5{%O>sfMH5crgPV|^WI zJ0oAW_j;2o{jpg8l?M8z43x%;{v_XJO^n53ork4pDJxKjiR=BF0D6X(IEUzl59>k= zSS+ky0$JBaHe>GMWHS5l-bA*&sZruZSbCe%K9LJWT2GO!1Od+sU*`_U`#zU}<O{3c zq+dm-Z^nevg3~&-7m1aYi50u4Fh3eQ9>Q?O_pzN;p_dT4BE;ib!<LZngmjj26!}M} z=0K%^pcQINm_mlDMj>JFKtC3Wi1i;a^~thJOt+^9QI+lyNEjwQxzLj!=1mzALvZ_s zPeF1umEP%MebwOxFZ8Yq(bE*VsE_r*=GB_+rRIi)P#*!nu}2El$0t<6Tn5r>?Ivl# zZt|4ZO3_zCWB*j=LQzP=U18Q+fh2+1+6uRfy)%NXY4_(l@8(n;|7yLe?L`{q?9_>f zoboc@*Y|%-<g+*-b{b@$PLq$*0peMqb;gDM<Te$g^xvz-vnC+({xsYRT92*ll+JUR zy5X=KoT7&^BJNJ%G^t`tIz?@ug25{7o>yNwuv(pM9Oso7s;R=WVvMG*#JL~^G_k*o zAFha;3ae5l4f&OBe;X)xq`Q8uCL}#R&u5?C2b&RIj7oUCo5yf<y4#3*RG7!mUDy{6 z%aL8wmhf4u?)@$|_>XBQP9Qu}!dEK(g+pLmmnbr@w`<=omMtsPCU7<tTq;HYgWI7_ z6hIj02ofIw@68<7=bdA~i$|0}@_j^j_vX1WZjxGFgg@x^_5@WoVPBDwLck=J+c=Pa zj6%VLKW?`?&cc1PYaS5(ci6FGJ@wI{^5S6PG|Fm<SiQr)LJIu*O3R+4st&HMrD%GC z%`xO`CM24irks?d^E_d|1_0H-IUEdmVMIRc7v>a10M#FdWra#&gm|E!5!sUnT8oiz z@Ak{ekcom7D5M)<v8Ny)WKG^Tq<p?5sWdv6THn#G1hZ}o#Rbb+j6H1xH9zXVC@42o z^=d*h{V>zY=f@tDxhi|dGIVo)X5{%HU!p!q>>NSE=UI61nWM-)@=EWmGue;Gb~_t{ zo0~P9CMJ=c*}c2D4R6c)em-^m_m`yiiUN=2embzh{pIYu$=}P3uJ%sfPm7%fU>AW+ zZw70fR)=#?m!|HNI%<9)afgH-_8~H{c=zT-$}hst>-HL)XR*Rfd<h}6E>VJ)iU=Mt zZV5U}g)SOdHar^W!Va2|=Ue4cER}3@_MSz2BV?po<8;sr&D2us*^KrceTlUcQd&`| zx31BD!$6=NYrB|hJ29s4$PFzHZmcpHW>Z^64TzsjaW0H4%0pK$Hs^KP2HF=guAAIM zs((sq+e~rTObOXc@!3>eO*NHTSd=_dNW<)blLxJi79uIGR?^vY&j@2*?3l_ir<fRJ z?wE+C1g1Lw4zm4AIGo9AYuZA#p!XNoxPXvKUb)T$Ib$~40IMmh1I;?RD3eKHd_Akh zV530QYvy`HZE#tkMNfE7(cpgbVnI?gNo#BKw{5G#>~{O6#n$j5=%09s0g!Vy*yoYY z4SMg?`MfOB#8h@3<eW)Q{%pOJDE>P;^FZ%9rIH+y$@#PKMBqo@Oa4uZq9L8Vsz;dx zX|_n!(~F18n@y26k^j}lna4x9zJI)ud_zRXR>>nYCClt%EKP{)4kr83ScaJx8e149 zWmhTL3E7wE*jr>dw(PQRkz^@EXtDpE>3mPyIlu4y*E83BU)OzK*K=Q=KjwM8-a#fU z$2X3DmRRhox4Z2Y(;5)^B($-$jV*BK$xve;F&zT5h>MHcC)gytjRqhHKyVaj>wLX( zL!v{LIvw|<ZNNwWbi&(A())>$%hLn}u}k6mM|*fHrq8!{H}ADo;h6X><+1=y3;28{ zY&dMnxITup%Xw<v8g*$yF)4AS*3quVK+Z^lrpU7=N$!jFSq-|2Q?p;1KY!D^IP0{U zST22>{HvLZsTC=bd>MY!uJ}VynMLa*MeFN@n|HQ(_L%V<mMue5;!+bY#@$aO98~ue z+!^@&s0MDqR@e$NE5DWFz1cthOm}o(YpXn65b_!M@M)&k%&>cVuOjPv;};+FHfpQK z)u<s;1(@;m$;B}mQ~VXl;>P^vJmNHdp$qdsnA)G#@iO=%z*1O>PwaXgX7&JYF!_(G zsgM)poq+#~E~k>@*%c*@*Qs6>epl~riB8TGtld!g;AFla>dg(I@c9-9ta4`;S|Vl_ z>Nq!}6zS%<xRM+9a2Jm^bTqp><%k*>FnNfpi5ZM3ViHI&>^rdnZ)qPs&(fY>Ilru^ z9K>EZ8ZV+MWFl)_W58T@`bbP!^>wF0t>l9qfSvdLoKs~}98O&;m*-=M<JU?d37^h& zCvTQQl0Lo3RCr9%4e@<Pro_)+SN8Es!SGYM9f|iUT3muBrZ*viojlJZjM<M>5A@_` z&00iAh3ll@PYJ6o;<xa1_(^;Zeg)r3+oILcCTTsi6`H1IX=aV#!FK8Ai(?piSWyS^ zv~2#!^3w8V)}|G|5PZCEVJz*bj{=3(xM^HF`O-s`&gbr_X?E0$q${(~tm~scemWDU zs6mg4+SUq<#|t$sV5baLnYl{zR)f=|Ui2bHI(bhl(^P0C14eI;OeRi`yq9}(*Rd+q zxo9y*mmU0&o3l9Ze7Dp#4pQXWrW0c!d|8Qy8uvTEdf$=xa(0hJqY*bxzNxBOXYLSN z3CW{IEPS|1JmoYkCYh7Q>j_13Gbv~*;y%o5yykE=+3)j=)9TJL`FZ_l6aCT@TM@=r z_)|>8B4zzcf{<oI)wrfK6L#$*<&0jdbp16C<`z!ANF_svPc?MQrch}imWg|X)~s&) z+{4l2RG{D3wb5&T76(O^bDNrU<CQcA(;UuRK^X+C_^64TnbP{RI>c4;c9~@TV`!A~ zr0I*s5enOfvV&+h6_Z1bhE?2Y1z}5dSIR5X&&GW`S34kA7GzTG)*G)g49R-sIyAf5 z?<7$kRbcA@r|A^?-s0aNwdhw}Zk_);sUb&qFssPDXLfYpHM0WsPg#3C{Dt{2Wv&c) z&68~GFW*R{&H3M+tiM=@N@DgRgqw`Nj8l2S!+%3xtL<89WV>n&zuaKzZcIF@&87Ya z{yOD{6Cd}bM9eNLU%lp_s0)60a>gyN?1~rUD^IS|y|eT&v4uENFi>DR1X&I@S`<P& zqEFmARJil;Hxz-AR6(v9u}E@X+4g~S`g~khUc3{&hb^YP@X5*fn^ESK#MPxsPnc~) z3KJ&<aqhHg7hr_YCM{S=eitPfd!~~pxz_xUbpO5I((PBrpxIe$SvoWEvfcKhsEDXf z`~r!=>2~`X#SV4#ys5*M4q1!tdBmgKMvNNWU2AKw3`7{~%N-d`-iI?KMZ~G=_ZuC_ zJMu=1dbiSqcQ;FI0ab}|m$Nmpt$#Z1a7@{PMc%!V8MBZCyV&I=6_<AN?x2B3p`4}q z<fy(IEMC(0I4!$9n|S!zmOG9b>0}w2-%81SB`37NBYwDvOv+uBO<d0`R+S%q&tm3w zVI$Y^eqXcqZSn0pJP2Oim$a1*i>F76DA))`y?yO|Q5~adZvq7?oE>)>a*ltZn~nuM zS?Avv?|rWAQ`1?#&t;#MGKXjU&7HjV_Y&b)wW_fR^r7I90H(OG)$976!?)bC3%ETS zZ@HhZJVta`e~g-&@OaSF!6%P^$jQ@|mTe`BBM@b)@uplWOK%V0b{q(zn%-)O!B<o_ zOqzJ1lYR7I-PkV`>xZ^8tZa`wbbNNpGjk}(G^dq4W4_|Ha2=rzcHKdZGb5<&Y=UVz zVmTUXC?bSAFzSt3VusZ@SjC23A@|KS5%bVF%aR|$mU|<1{~ouMW?eQYf$!!xpO!10 zP*Rg-RB}}yFEH>@YO=Z&Svr5$MhRX;&n9g!b}g{w0=;Up2o{#xkYS0Xj0!TD9U}`A zIcTM*dK+zYjQDU0VF*3mrrTRwpCYvP%v#nTE1Sz&*xiL*@9r0{YHTAm6)a5-W+Zef zxeqJx;_d)$rf1gl<tDORwjk=cB3(1xC2Ow3iyX+04!V$8#Qx$a)Bk)i-N176dEEIz za8TFUBF+S_xTfmh_LOJSOY=HK9dMRVvbTb7Lc)l)S8l+ew_;U?hSTmG?v6C@o~T<r zJ{Bz3DRf|v$)jAfv%yd<xSp$|x{hvtf{c53(I-o|B&Mt1y3eq0_;o{DcB9u|4(r}F zhhtpL#J%Ya60j_Ien6P29xAJ!9eLn>u@#3PeoP^!vd-^JTVZeLy_GN-w#QxStPSr~ zy+gg@y@SR7SiED*b}Q59-K|Uvpxbnyb`&ml+oA?J{`O0F?Iv6ge&ncrOs)MuD4=oT zdUIaI=~oAnsAp5`T2wU^j`O{<>4(pXaCUK)8t$*ld?c@7WpkK(q|nm3x(z*6bv8LO z#im;IiJ@iTxX41;LOET;*Ljwx|5Op9>0g#uP-8hi&$%^kH0S(c95Q;zFHBxL1+73D zV}6?XtbaUwQDad+Cj{b{GSaCw!@m1&y{Y4Lj@oc7-08-YYj!WEUdau^L<g1&(sLrk zlGbJCcReV+C_EjKiCUvn3f;xC-8|^07Hu5TBP^gz?&UXtgiYQw=nH%&?tYz&znQix zz&*GhHluElvOd)$uxUe>l6hJN<KHQMt)rN&d^y^EU%Fnzydxf8&SO<#z~X@vle%R^ zC^b=jm{WX4G~dHV3nJ$(I~2Bcw8;1#Z}^3Xm4|V9i}eGF=ZgwniEdiaq8HM}vJwh- z$K>V6m}izTr^F&(Hg=>OzGu(FMrgX2C~++_TAl|J)X3j#JxLZpm3OOOuH%oEFf_`? z+X>%I6FEQ&)bAopTfBKNInOgH`{Aanfz_hQ+@77yDvwoq&|P~Xhr@HqLPh$fJ(qZs zd%AaHzeQ(6=gzFZ`Qwhfqqhq*m|fdC&9#rq+%Iq7h6m49y@8dUjqpc#J!1AAQaahx z^hH|zOYVBYxuLyLGQP`89PwK<dqt>_UQvxT|AW5EgB;k5hG7GimCt`%^GJ6JvP(Z9 zGb-`fS`4jBe`1t>%HYbh0w-Np``8GHJyiG=_*c}2$Q_@A{x@<@7p8s>;9#Z&r_0A| z!xG9PTk4%jzTSCpTn#Btsp`3PJryZTT>b%pd;ELdDoa1dYZR@<E10dDm-_geZ`JH{ z+X?4)qAxvK-}kI|s|v%}eYy&#WVEn8(Y3>bH8QOJC-n&Xo!|2p^@zbHI%nr<LnXPm zIaB{)73mP1Kpv9f*Kt~rN+LLF<G~q6g1sw%WR+HQwE<B?02Ydpf@2U!(8377FiFB; zFexky2?cpT25xpvh5!;JC4-egB4j`i5y3^xj%4rP24G;I6%Iv!P$G2@Hbk;fq%g2x zAlis=8l|sHBuO+HDTP8oF*1N80*;izKrv7R0Ea@M01OK5EQ7)#WI$RH!vjPQ*}(w@ znuvj0`Y#U&#-J+w1Vmyi{mbEd!T_TnAY@62;A+R1|7Y3;?$&N!c}mLa=NKy(WrKs+ zsGq|-pI1MpO>hAbP_|(9BsZ_GW&<x*Fm-hb(V4+~(zmlGf#4}G;G`nRII{!cXu4F8 zdq$$z11JA>1C0jmE-sFC415{@Wx%0~7*r@T42qEi6o6weQZfjzVio`l4VWPi2q`F7 z8Q4z~SO6{qpipQj7z&O+0&pw{d;0E&0R7Ntv=kN#hcR-70vI@43WmmD83ZUa3<_=l zzNjDV79d3JSEnDAS^#Jn0FC`&OAL5q6!?O^AL9Gdx1;>~><?!F)BW~K=3A!UBYl5j zWbwTgjGg~&mme~<058lrqpubI`<DCwwEJHKD+C<#BfrWb@+CO{dN6R&H_V(O&3m)j z;viwJ_>~GhXMyQa^P>a3{AoTDBbezyNo49$ds}moEq8x=?h7(;B2iF96EPPZ6O;9U z$Xvu`5zTR>ErWYSbz3^9WAFV#6|Kmgu310!mdK)|mv-4hQjVTclYz&sE%j*>Ygi4v zFQEulU~H;LfI`X19Ptymo^lGF)0sy?0xip(Gg|Y#hUD6<8k(#_8j`W2A$r}mvWn$B zMyxH*3&Nu9EAp<EZpO}V*~VJZ-1}o8h4Nvqb4){VARVKN3x6fdK=%|2PwH=OyQWeh zUFq3-1>tULsjaE4UH4B`4z*v{p8Mc;;@BFzW8&jp&%xLk=wrcD)un(}wJbgDSSps| zb}~U!^^c$wc13e#F6Z)#w$D1;=Rcc-CYDjOww=DLJ-Dlv@V>L@2Ju3{IH&DQZplB@ ziE;h@rDeahAfxv{mH7XgRfPgV02#gYttBPZ{+1_O0;m*V1A`E>uiBswUIx7L1qzA5 z4Fq6}i|~VdT%p<#SwXFVvx1WI-vOXeC<F>10^e*fkkQ5%0Ogwv12*2THW(BXr=Qlr zp(vSuS%>^*JS+li(4TyvP_T)AwZWi>U*o~BNa(M=Ff1AgX8Kb+I24Bc!RAIKfO<-0 vARY}!-e6@wwbOTY24$O3AyBdz%Jz4)T-^v%x39H=Losj}RxvRZUDf{sKHj;P literal 0 HcmV?d00001 diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py index af54255e0..fed621e01 100644 --- a/src/documents/tests/test_consumer.py +++ b/src/documents/tests/test_consumer.py @@ -1,3 +1,4 @@ +import datetime import os import re import shutil @@ -5,6 +6,8 @@ import tempfile from unittest import mock from unittest.mock import MagicMock +from dateutil import tz + try: import zoneinfo except ImportError: @@ -502,7 +505,7 @@ class TestConsumer(DirectoriesMixin, TestCase): self.assertRaisesMessage( ConsumerError, - "sample.pdf: The following error occured while consuming sample.pdf: NO.", + "sample.pdf: The following error occurred while consuming sample.pdf: NO.", self.consumer.try_consume_file, filename, ) @@ -654,6 +657,127 @@ class TestConsumer(DirectoriesMixin, TestCase): sanity_check() +@mock.patch("documents.consumer.magic.from_file", fake_magic_from_file) +class TestConsumerCreatedDate(DirectoriesMixin, TestCase): + def setUp(self): + super(TestConsumerCreatedDate, self).setUp() + + # this prevents websocket message reports during testing. + patcher = mock.patch("documents.consumer.Consumer._send_progress") + self._send_progress = patcher.start() + self.addCleanup(patcher.stop) + + self.consumer = Consumer() + + def test_consume_date_from_content(self): + """ + GIVEN: + - File content with date in DMY (default) format + + THEN: + - Should parse the date from the file content + """ + src = os.path.join( + os.path.dirname(__file__), + "samples", + "documents", + "originals", + "0000005.pdf", + ) + dst = os.path.join(self.dirs.scratch_dir, "sample.pdf") + shutil.copy(src, dst) + + document = self.consumer.try_consume_file(dst) + + self.assertEqual( + document.created, + datetime.datetime(1996, 2, 20, tzinfo=tz.gettz(settings.TIME_ZONE)), + ) + + @override_settings(FILENAME_DATE_ORDER="YMD") + def test_consume_date_from_filename(self): + """ + GIVEN: + - File content with date in DMY (default) format + - Filename with date in YMD format + + THEN: + - Should parse the date from the filename + """ + src = os.path.join( + os.path.dirname(__file__), + "samples", + "documents", + "originals", + "0000005.pdf", + ) + dst = os.path.join(self.dirs.scratch_dir, "Scan - 2022-02-01.pdf") + shutil.copy(src, dst) + + document = self.consumer.try_consume_file(dst) + + self.assertEqual( + document.created, + datetime.datetime(2022, 2, 1, tzinfo=tz.gettz(settings.TIME_ZONE)), + ) + + def test_consume_date_filename_date_use_content(self): + """ + GIVEN: + - File content with date in DMY (default) format + - Filename date parsing disabled + - Filename with date in YMD format + + THEN: + - Should parse the date from the content + """ + src = os.path.join( + os.path.dirname(__file__), + "samples", + "documents", + "originals", + "0000005.pdf", + ) + dst = os.path.join(self.dirs.scratch_dir, "Scan - 2022-02-01.pdf") + shutil.copy(src, dst) + + document = self.consumer.try_consume_file(dst) + + self.assertEqual( + document.created, + datetime.datetime(1996, 2, 20, tzinfo=tz.gettz(settings.TIME_ZONE)), + ) + + @override_settings( + IGNORE_DATES=(datetime.date(2010, 12, 13), datetime.date(2011, 11, 12)), + ) + def test_consume_date_use_content_with_ignore(self): + """ + GIVEN: + - File content with dates in DMY (default) format + - File content includes ignored dates + + THEN: + - Should parse the date from the filename + """ + src = os.path.join( + os.path.dirname(__file__), + "samples", + "documents", + "originals", + "0000006.pdf", + ) + dst = os.path.join(self.dirs.scratch_dir, "0000006.pdf") + shutil.copy(src, dst) + + document = self.consumer.try_consume_file(dst) + + self.assertEqual( + document.created, + datetime.datetime(1997, 2, 20, tzinfo=tz.gettz(settings.TIME_ZONE)), + ) + + class PreConsumeTestCase(TestCase): @mock.patch("documents.consumer.Popen") @override_settings(PRE_CONSUME_SCRIPT=None) diff --git a/src/documents/tests/test_date_parsing.py b/src/documents/tests/test_date_parsing.py index 06ad9876c..a79aecc94 100644 --- a/src/documents/tests/test_date_parsing.py +++ b/src/documents/tests/test_date_parsing.py @@ -8,6 +8,7 @@ from django.conf import settings from django.test import override_settings from django.test import TestCase from documents.parsers import parse_date +from paperless.settings import DATE_ORDER class TestDate(TestCase): @@ -160,19 +161,112 @@ class TestDate(TestCase): def test_crazy_date_with_spaces(self, *args): self.assertIsNone(parse_date("", "20 408000l 2475")) + @override_settings(FILENAME_DATE_ORDER="YMD") + def test_filename_date_parse_valid_ymd(self, *args): + """ + GIVEN: + - Date parsing from the filename is enabled + - Filename date format is with Year Month Day (YMD) + - Filename contains date matching the format + + THEN: + - Should parse the date from the filename + """ + self.assertEqual( + parse_date("/tmp/Scan-2022-04-01.pdf", "No date in here"), + datetime.datetime(2022, 4, 1, 0, 0, tzinfo=tz.gettz(settings.TIME_ZONE)), + ) + + @override_settings(FILENAME_DATE_ORDER="DMY") + def test_filename_date_parse_valid_dmy(self, *args): + """ + GIVEN: + - Date parsing from the filename is enabled + - Filename date format is with Day Month Year (DMY) + - Filename contains date matching the format + + THEN: + - Should parse the date from the filename + """ + self.assertEqual( + parse_date("/tmp/Scan-10.01.2021.pdf", "No date in here"), + datetime.datetime(2021, 1, 10, 0, 0, tzinfo=tz.gettz(settings.TIME_ZONE)), + ) + @override_settings(FILENAME_DATE_ORDER="YMD") def test_filename_date_parse_invalid(self, *args): + """ + GIVEN: + - Date parsing from the filename is enabled + - Filename includes no date + - File content includes no date + + THEN: + - No date is parsed + """ self.assertIsNone( parse_date("/tmp/20 408000l 2475 - test.pdf", "No date in here"), ) + @override_settings( + FILENAME_DATE_ORDER="YMD", + IGNORE_DATES=(datetime.date(2022, 4, 1),), + ) + def test_filename_date_ignored_use_content(self, *args): + """ + GIVEN: + - Date parsing from the filename is enabled + - Filename date format is with Day Month Year (YMD) + - Date order is Day Month Year (DMY, the default) + - Filename contains date matching the format + - Filename date is an ignored date + - File content includes a date + + THEN: + - Should parse the date from the content not filename + """ + self.assertEqual( + parse_date("/tmp/Scan-2022-04-01.pdf", "The matching date is 24.03.2022"), + datetime.datetime(2022, 3, 24, 0, 0, tzinfo=tz.gettz(settings.TIME_ZONE)), + ) + @override_settings( IGNORE_DATES=(datetime.date(2019, 11, 3), datetime.date(2020, 1, 17)), ) - def test_ignored_dates(self, *args): + def test_ignored_dates_default_order(self, *args): + """ + GIVEN: + - Ignore dates have been set + - File content includes ignored dates + - File content includes 1 non-ignored date + + THEN: + - Should parse the date non-ignored date from content + """ text = "lorem ipsum 110319, 20200117 and lorem 13.02.2018 lorem " "ipsum" - date = parse_date("", text) self.assertEqual( - date, + parse_date("", text), + datetime.datetime(2018, 2, 13, 0, 0, tzinfo=tz.gettz(settings.TIME_ZONE)), + ) + + @override_settings( + IGNORE_DATES=(datetime.date(2019, 11, 3), datetime.date(2020, 1, 17)), + DATE_ORDER="YMD", + ) + def test_ignored_dates_order_ymd(self, *args): + """ + GIVEN: + - Ignore dates have been set + - Date order is Year Month Date (YMD) + - File content includes ignored dates + - File content includes 1 non-ignored date + + THEN: + - Should parse the date non-ignored date from content + """ + text = "lorem ipsum 190311, 20200117 and lorem 13.02.2018 lorem " "ipsum" + + self.assertEqual( + parse_date("", text), datetime.datetime(2018, 2, 13, 0, 0, tzinfo=tz.gettz(settings.TIME_ZONE)), ) diff --git a/src/paperless/settings.py b/src/paperless/settings.py index 5274c356a..c58a45945 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -1,9 +1,11 @@ +import datetime import json import math import multiprocessing import os import re from typing import Final +from typing import Set from urllib.parse import urlparse from concurrent_log_handler.queue import setup_logging_queues @@ -604,15 +606,22 @@ if PAPERLESS_TIKA_ENABLED: INSTALLED_APPS.append("paperless_tika.apps.PaperlessTikaConfig") # List dates that should be ignored when trying to parse date from document text -IGNORE_DATES = set() +IGNORE_DATES: Set[datetime.date] = set() -if os.getenv("PAPERLESS_IGNORE_DATES", ""): + +def _parse_ignore_dates(env_ignore: str) -> Set[datetime.datetime]: import dateparser - for s in os.getenv("PAPERLESS_IGNORE_DATES", "").split(","): + ignored_dates = set() + for s in env_ignore.split(","): d = dateparser.parse(s) if d: - IGNORE_DATES.add(d.date()) + ignored_dates.add(d.date()) + return ignored_dates + + +if os.getenv("PAPERLESS_IGNORE_DATES") is not None: + IGNORE_DATES = _parse_ignore_dates(os.getenv("PAPERLESS_IGNORE_DATES")) ENABLE_UPDATE_CHECK = os.getenv("PAPERLESS_ENABLE_UPDATE_CHECK", "default") if ENABLE_UPDATE_CHECK != "default": diff --git a/src/paperless/tests/test_settings.py b/src/paperless/tests/test_settings.py new file mode 100644 index 000000000..cedcb0509 --- /dev/null +++ b/src/paperless/tests/test_settings.py @@ -0,0 +1,45 @@ +import datetime +from unittest import TestCase + +from paperless.settings import _parse_ignore_dates + + +class TestIgnoreDateParsing(TestCase): + """ + Tests the parsing of the PAPERLESS_IGNORE_DATES setting value + """ + + def test_no_ignore_dates_set(self): + """ + GIVEN: + - No ignore dates are set + THEN: + - No ignore dates are parsed + """ + self.assertSetEqual(_parse_ignore_dates(""), set()) + + def test_single_ignore_dates_set(self): + """ + GIVEN: + - Ignore dates are set per certain inputs + THEN: + - All ignore dates are parsed + """ + test_cases = [ + ("1985-05-01", [datetime.date(1985, 5, 1)]), + ( + "1985-05-01,1991-12-05", + [datetime.date(1985, 5, 1), datetime.date(1991, 12, 5)], + ), + ("2010-12-13", [datetime.date(2010, 12, 13)]), + ] + for env_str, expected_dates in test_cases: + expected_date_set = set() + + for expected_date in expected_dates: + expected_date_set.add(expected_date) + + self.assertSetEqual( + _parse_ignore_dates(env_str), + expected_date_set, + ) From 304d5b0d5a9843b677ba83e8ca3861a35dfc7c95 Mon Sep 17 00:00:00 2001 From: Trenton Holmes <trenton.holmes@psware.com> Date: Wed, 13 Apr 2022 08:04:15 -0700 Subject: [PATCH 009/291] Updates the ignore date parsing to utilize the settings defined date order, instead of guessing a bit --- src/documents/parsers.py | 10 -------- src/paperless/settings.py | 27 +++++++++++++++++--- src/paperless/tests/test_settings.py | 37 +++++++++++++++++++--------- 3 files changed, 48 insertions(+), 26 deletions(-) diff --git a/src/documents/parsers.py b/src/documents/parsers.py index 8335d433e..b910778bd 100644 --- a/src/documents/parsers.py +++ b/src/documents/parsers.py @@ -247,10 +247,8 @@ def parse_date(filename, text) -> Optional[datetime.datetime]: # if filename date parsing is enabled, search there first: if settings.FILENAME_DATE_ORDER: - logger.info("Attempting parsing from filename") for m in re.finditer(DATE_REGEX, filename): date_string = m.group(0) - logger.info(f"Found potential date: {date_string}") try: date = __parser(date_string, settings.FILENAME_DATE_ORDER) @@ -260,16 +258,11 @@ def parse_date(filename, text) -> Optional[datetime.datetime]: date = __filter(date) if date is not None: - logger.info(f"Found date: {date}") return date - else: - logger.info("Filtered date out") - logger.info("Attempting parsing from content") # Iterate through all regex matches in text and try to parse the date for m in re.finditer(DATE_REGEX, text): date_string = m.group(0) - logger.info(f"Found potential date: {date_string}") try: date = __parser(date_string, settings.DATE_ORDER) @@ -279,10 +272,7 @@ def parse_date(filename, text) -> Optional[datetime.datetime]: date = __filter(date) if date is not None: - logger.info(f"Found date: {date}") return date - else: - logger.info("Filtered date out") return date diff --git a/src/paperless/settings.py b/src/paperless/settings.py index c58a45945..b5be6c420 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -605,21 +605,40 @@ PAPERLESS_TIKA_GOTENBERG_ENDPOINT = os.getenv( if PAPERLESS_TIKA_ENABLED: INSTALLED_APPS.append("paperless_tika.apps.PaperlessTikaConfig") -# List dates that should be ignored when trying to parse date from document text -IGNORE_DATES: Set[datetime.date] = set() +def _parse_ignore_dates( + env_ignore: str, + date_order: str = DATE_ORDER, +) -> Set[datetime.datetime]: + """ + If the PAPERLESS_IGNORE_DATES environment variable is set, parse the + user provided string(s) into dates -def _parse_ignore_dates(env_ignore: str) -> Set[datetime.datetime]: + Args: + env_ignore (str): The value of the environment variable, comma seperated dates + date_order (str, optional): The format of the date strings. Defaults to DATE_ORDER. + + Returns: + Set[datetime.datetime]: The set of parsed date objects + """ import dateparser ignored_dates = set() for s in env_ignore.split(","): - d = dateparser.parse(s) + d = dateparser.parse( + s, + settings={ + "DATE_ORDER": date_order, + }, + ) if d: ignored_dates.add(d.date()) return ignored_dates +# List dates that should be ignored when trying to parse date from document text +IGNORE_DATES: Set[datetime.date] = set() + if os.getenv("PAPERLESS_IGNORE_DATES") is not None: IGNORE_DATES = _parse_ignore_dates(os.getenv("PAPERLESS_IGNORE_DATES")) diff --git a/src/paperless/tests/test_settings.py b/src/paperless/tests/test_settings.py index cedcb0509..57481df5b 100644 --- a/src/paperless/tests/test_settings.py +++ b/src/paperless/tests/test_settings.py @@ -9,6 +9,20 @@ class TestIgnoreDateParsing(TestCase): Tests the parsing of the PAPERLESS_IGNORE_DATES setting value """ + def _parse_checker(self, test_cases): + """ + Helper function to check ignore date parsing + + Args: + test_cases (_type_): _description_ + """ + for env_str, date_format, expected_date_set in test_cases: + + self.assertSetEqual( + _parse_ignore_dates(env_str, date_format), + expected_date_set, + ) + def test_no_ignore_dates_set(self): """ GIVEN: @@ -26,20 +40,19 @@ class TestIgnoreDateParsing(TestCase): - All ignore dates are parsed """ test_cases = [ - ("1985-05-01", [datetime.date(1985, 5, 1)]), + ("1985-05-01", "YMD", {datetime.date(1985, 5, 1)}), ( "1985-05-01,1991-12-05", - [datetime.date(1985, 5, 1), datetime.date(1991, 12, 5)], + "YMD", + {datetime.date(1985, 5, 1), datetime.date(1991, 12, 5)}, + ), + ("2010-12-13", "YMD", {datetime.date(2010, 12, 13)}), + ("11.01.10", "DMY", {datetime.date(2010, 1, 11)}), + ( + "11.01.2001,15-06-1996", + "DMY", + {datetime.date(2001, 1, 11), datetime.date(1996, 6, 15)}, ), - ("2010-12-13", [datetime.date(2010, 12, 13)]), ] - for env_str, expected_dates in test_cases: - expected_date_set = set() - for expected_date in expected_dates: - expected_date_set.add(expected_date) - - self.assertSetEqual( - _parse_ignore_dates(env_str), - expected_date_set, - ) + self._parse_checker(test_cases) From 5c547147a1b472f45174128ee57bedc623af4abb Mon Sep 17 00:00:00 2001 From: Trenton Holmes <trenton.holmes@psware.com> Date: Wed, 13 Apr 2022 08:18:08 -0700 Subject: [PATCH 010/291] Updates the documentation for ignore dates --- docs/configuration.rst | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/configuration.rst b/docs/configuration.rst index 92cba8d72..e1fff46ed 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -650,7 +650,6 @@ PAPERLESS_CONSUMER_BARCODE_STRING=PATCHT Defaults to "PATCHT" - PAPERLESS_CONVERT_MEMORY_LIMIT=<num> On smaller systems, or even in the case of Very Large Documents, the consumer may explode, complaining about how it's "unable to extend pixel cache". In @@ -713,10 +712,8 @@ PAPERLESS_IGNORE_DATES=<string> this process. This is useful for special dates (like date of birth) that appear in documents regularly but are very unlikely to be the documents creation date. - You may specify dates in a multitude of formats supported by dateparser (see - https://dateparser.readthedocs.io/en/latest/#popular-formats) but as the dates - need to be comma separated, the options are limited. - Example: "2020-12-02,22.04.1999" + You must specify dates in the same date ordering as PAPERLESS_DATE_ORDER is + set to or its default ordering. Defaults to an empty string to not ignore any dates. From 146b93e7eb16720d1d7f04f14997d71455981754 Mon Sep 17 00:00:00 2001 From: Trenton Holmes <trenton.holmes@psware.com> Date: Wed, 13 Apr 2022 10:00:47 -0700 Subject: [PATCH 011/291] Updates the documentation for ignoring dates --- docs/configuration.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/configuration.rst b/docs/configuration.rst index e1fff46ed..447bd1f46 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -712,8 +712,7 @@ PAPERLESS_IGNORE_DATES=<string> this process. This is useful for special dates (like date of birth) that appear in documents regularly but are very unlikely to be the documents creation date. - You must specify dates in the same date ordering as PAPERLESS_DATE_ORDER is - set to or its default ordering. + The date is parsed using the order specified in PAPERLESS_DATE_ORDER Defaults to an empty string to not ignore any dates. From ed136c5cae41a945c92cd8e1295db4b861cb4497 Mon Sep 17 00:00:00 2001 From: Trenton Holmes <trenton.holmes@psware.com> Date: Wed, 13 Apr 2022 10:58:23 -0700 Subject: [PATCH 012/291] Further updates documentation to note a date sep string is needed --- docs/configuration.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/configuration.rst b/docs/configuration.rst index 447bd1f46..3a4960f82 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -695,6 +695,9 @@ PAPERLESS_FILENAME_DATE_ORDER=<format> The filename will be checked first, and if nothing is found, the document text will be checked as normal. + A date in a filename must have some separators (`.`, `-`, `/`, etc) + for it to be parsed. + Defaults to none, which disables this feature. PAPERLESS_THUMBNAIL_FONT_NAME=<filename> From 2761a9e7cf89cdf24ff56cb46f9cf865965115e8 Mon Sep 17 00:00:00 2001 From: Trenton Holmes <holmes.trenton@gmail.com> Date: Sun, 8 May 2022 16:56:54 -0700 Subject: [PATCH 013/291] Fixes missing f on an f-string --- src/documents/consumer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/documents/consumer.py b/src/documents/consumer.py index 44fb1cb97..e9efbbdbd 100644 --- a/src/documents/consumer.py +++ b/src/documents/consumer.py @@ -405,7 +405,7 @@ class Consumer(LoggingMixin): create_date = timezone.make_aware( datetime.datetime.fromtimestamp(stats.st_mtime), ) - self.log("debug", "Creation date from st_mtime: {create_date}") + self.log("debug", f"Creation date from st_mtime: {create_date}") storage_type = Document.STORAGE_TYPE_UNENCRYPTED From a1eb14f8a9a694d95cc1232bee7ac5f718b66ceb Mon Sep 17 00:00:00 2001 From: Trenton Holmes <holmes.trenton@gmail.com> Date: Mon, 9 May 2022 09:38:17 -0700 Subject: [PATCH 014/291] Updates the superuser management command to better handle existing super users --- .../management/commands/manage_superuser.py | 58 ++++-- .../tests/test_management_superuser.py | 186 +++++++++++++++--- 2 files changed, 197 insertions(+), 47 deletions(-) diff --git a/src/documents/management/commands/manage_superuser.py b/src/documents/management/commands/manage_superuser.py index e892f7d22..2f506b54a 100644 --- a/src/documents/management/commands/manage_superuser.py +++ b/src/documents/management/commands/manage_superuser.py @@ -11,7 +11,14 @@ logger = logging.getLogger("paperless.management.superuser") class Command(BaseCommand): help = """ - Creates a Django superuser based on env variables. + Creates a Django superuser: + User named: admin + Email: root@localhost + with password based on env variable. + No superuser will be created, when: + - The username is taken already exists + - A superuser already exists + - PAPERLESS_ADMIN_PASSWORD is not set """.replace( " ", "", @@ -19,26 +26,41 @@ class Command(BaseCommand): def handle(self, *args, **options): - username = os.getenv("PAPERLESS_ADMIN_USER") - if not username: - return - + username = os.getenv("PAPERLESS_ADMIN_USER", "admin") mail = os.getenv("PAPERLESS_ADMIN_MAIL", "root@localhost") password = os.getenv("PAPERLESS_ADMIN_PASSWORD") - # Check if user exists already, leave as is if it does + # Check if there's already a user called admin if User.objects.filter(username=username).exists(): - user: User = User.objects.get_by_natural_key(username) - user.set_password(password) - user.save() - self.stdout.write(f"Changed password of user {username}.") - elif password: - # Create superuser based on env variables - User.objects.create_superuser(username, mail, password) - self.stdout.write(f'Created superuser "{username}" with provided password.') - else: - self.stdout.write(f'Did not create superuser "{username}".') self.stdout.write( - 'Make sure you specified "PAPERLESS_ADMIN_PASSWORD" in your ' - '"docker-compose.env" file.', + self.style.NOTICE( + f"Did not create superuser, a user {username} already exists", + ), + ) + return + + # Check if any superuseruser + # exists already, leave as is if it does + if User.objects.filter(is_superuser=True).count() > 0: + self.stdout.write( + self.style.NOTICE( + "Did not create superuser, the DB already contains superusers", + ), + ) + return + + if password is None: + self.stdout.write( + self.style.ERROR( + "Please check if PAPERLESS_ADMIN_PASSWORD has been" + " set in the environment", + ), + ) + else: + # Create superuser with password based on env variable + User.objects.create_superuser(username, mail, password) + self.stdout.write( + self.style.SUCCESS( + f'Created superuser "{username}" with provided password.', + ), ) diff --git a/src/documents/tests/test_management_superuser.py b/src/documents/tests/test_management_superuser.py index b4e91fd66..4a8bb7bb3 100644 --- a/src/documents/tests/test_management_superuser.py +++ b/src/documents/tests/test_management_superuser.py @@ -1,5 +1,6 @@ import os import shutil +from io import StringIO from unittest import mock from django.contrib.auth.models import User @@ -15,53 +16,180 @@ from documents.tests.utils import DirectoriesMixin class TestManageSuperUser(DirectoriesMixin, TestCase): def reset_environment(self): - if "PAPERLESS_ADMIN_USER" in os.environ: - del os.environ["PAPERLESS_ADMIN_USER"] if "PAPERLESS_ADMIN_PASSWORD" in os.environ: del os.environ["PAPERLESS_ADMIN_PASSWORD"] + if "PAPERLESS_ADMIN_USER" in os.environ: + del os.environ["PAPERLESS_ADMIN_USER"] + if "PAPERLESS_ADMIN_MAIL" in os.environ: + del os.environ["PAPERLESS_ADMIN_MAIL"] - def setUp(self) -> None: - super().setUp() - self.reset_environment() - - def tearDown(self) -> None: - super().tearDown() - self.reset_environment() + def call_command(self, environ, *args, **kwargs): + out = StringIO() + with mock.patch.dict(os.environ, environ): + call_command( + "manage_superuser", + "--no-color", + stdout=out, + stderr=StringIO(), + **kwargs, + ) + return out.getvalue() def test_no_user(self): - call_command("manage_superuser") + """ + GIVEN: + - Environment does not contain admin user info + THEN: + - No admin user is created + """ - # just the consumer user. + out = self.call_command(environ={}) + + # just the consumer user which is created + # during migration self.assertEqual(User.objects.count(), 1) self.assertTrue(User.objects.filter(username="consumer").exists()) + self.assertEqual(User.objects.filter(is_superuser=True).count(), 0) + self.assertEqual( + out, + "Please check if PAPERLESS_ADMIN_PASSWORD has been set in the environment\n", + ) def test_create(self): - os.environ["PAPERLESS_ADMIN_USER"] = "new_user" - os.environ["PAPERLESS_ADMIN_PASSWORD"] = "123456" + """ + GIVEN: + - Environment does contain admin user password + THEN: + - admin user is created + """ - call_command("manage_superuser") + out = self.call_command(environ={"PAPERLESS_ADMIN_PASSWORD": "123456"}) - user: User = User.objects.get_by_natural_key("new_user") - self.assertTrue(user.check_password("123456")) + # count is 2 as there's the consumer + # user already created during migration + user: User = User.objects.get_by_natural_key("admin") + self.assertEqual(User.objects.count(), 2) + self.assertTrue(user.is_superuser) + self.assertEqual(user.email, "root@localhost") + self.assertEqual(out, 'Created superuser "admin" with provided password.\n') - def test_update(self): - os.environ["PAPERLESS_ADMIN_USER"] = "new_user" - os.environ["PAPERLESS_ADMIN_PASSWORD"] = "123456" + def test_some_superuser_exists(self): + """ + GIVEN: + - A super user already exists + - Environment does contain admin user password + THEN: + - admin user is NOT created + """ + User.objects.create_superuser("someuser", "root@localhost", "password") - call_command("manage_superuser") + out = self.call_command(environ={"PAPERLESS_ADMIN_PASSWORD": "123456"}) - os.environ["PAPERLESS_ADMIN_USER"] = "new_user" - os.environ["PAPERLESS_ADMIN_PASSWORD"] = "more_secure_pwd_7645" + self.assertEqual(User.objects.count(), 2) + with self.assertRaises(User.DoesNotExist): + User.objects.get_by_natural_key("admin") + self.assertEqual( + out, + "Did not create superuser, the DB already contains superusers\n", + ) - call_command("manage_superuser") + def test_admin_superuser_exists(self): + """ + GIVEN: + - A super user already exists + - The existing superuser's username is admin + - Environment does contain admin user password + THEN: + - Password remains unchanged + """ + User.objects.create_superuser("admin", "root@localhost", "password") - user: User = User.objects.get_by_natural_key("new_user") - self.assertTrue(user.check_password("more_secure_pwd_7645")) + out = self.call_command(environ={"PAPERLESS_ADMIN_PASSWORD": "123456"}) + + self.assertEqual(User.objects.count(), 2) + user: User = User.objects.get_by_natural_key("admin") + self.assertTrue(user.check_password("password")) + self.assertEqual(out, "Did not create superuser, a user admin already exists\n") + + def test_admin_user_exists(self): + """ + GIVEN: + - A user already exists with the username admin + - Environment does contain admin user password + THEN: + - Password remains unchanged + - User is not upgraded to superuser + """ + + User.objects.create_user("admin", "root@localhost", "password") + + out = self.call_command(environ={"PAPERLESS_ADMIN_PASSWORD": "123456"}) + + self.assertEqual(User.objects.count(), 2) + user: User = User.objects.get_by_natural_key("admin") + self.assertTrue(user.check_password("password")) + self.assertFalse(user.is_superuser) + self.assertEqual(out, "Did not create superuser, a user admin already exists\n") def test_no_password(self): - os.environ["PAPERLESS_ADMIN_USER"] = "new_user" - - call_command("manage_superuser") + """ + GIVEN: + - No environment data is set + THEN: + - No user is created + """ + out = self.call_command(environ={}) with self.assertRaises(User.DoesNotExist): - User.objects.get_by_natural_key("new_user") + User.objects.get_by_natural_key("admin") + self.assertEqual( + out, + "Please check if PAPERLESS_ADMIN_PASSWORD has been set in the environment\n", + ) + + def test_user_email(self): + """ + GIVEN: + - Environment does contain admin user password + - Environment contains user email + THEN: + - admin user is created + """ + + out = self.call_command( + environ={ + "PAPERLESS_ADMIN_PASSWORD": "123456", + "PAPERLESS_ADMIN_MAIL": "hello@world.com", + }, + ) + + user: User = User.objects.get_by_natural_key("admin") + self.assertEqual(User.objects.count(), 2) + self.assertTrue(user.is_superuser) + self.assertEqual(user.email, "hello@world.com") + self.assertEqual(user.username, "admin") + self.assertEqual(out, 'Created superuser "admin" with provided password.\n') + + def test_user_username(self): + """ + GIVEN: + - Environment does contain admin user password + - Environment contains user username + THEN: + - admin user is created + """ + + out = self.call_command( + environ={ + "PAPERLESS_ADMIN_PASSWORD": "123456", + "PAPERLESS_ADMIN_MAIL": "hello@world.com", + "PAPERLESS_ADMIN_USER": "super", + }, + ) + + user: User = User.objects.get_by_natural_key("super") + self.assertEqual(User.objects.count(), 2) + self.assertTrue(user.is_superuser) + self.assertEqual(user.email, "hello@world.com") + self.assertEqual(user.username, "super") + self.assertEqual(out, 'Created superuser "super" with provided password.\n') From 92801dd3795ee9628f3080ce7dcd3c5f2858b35a Mon Sep 17 00:00:00 2001 From: Trenton Holmes <holmes.trenton@gmail.com> Date: Mon, 9 May 2022 09:49:11 -0700 Subject: [PATCH 015/291] Removes unused imports from test case --- .../tests/test_management_superuser.py | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/documents/tests/test_management_superuser.py b/src/documents/tests/test_management_superuser.py index 4a8bb7bb3..d5fa86ce3 100644 --- a/src/documents/tests/test_management_superuser.py +++ b/src/documents/tests/test_management_superuser.py @@ -1,29 +1,15 @@ import os -import shutil from io import StringIO from unittest import mock from django.contrib.auth.models import User from django.core.management import call_command from django.test import TestCase -from documents.management.commands.document_thumbnails import _process_document -from documents.models import Correspondent -from documents.models import Document -from documents.models import DocumentType -from documents.models import Tag from documents.tests.utils import DirectoriesMixin class TestManageSuperUser(DirectoriesMixin, TestCase): - def reset_environment(self): - if "PAPERLESS_ADMIN_PASSWORD" in os.environ: - del os.environ["PAPERLESS_ADMIN_PASSWORD"] - if "PAPERLESS_ADMIN_USER" in os.environ: - del os.environ["PAPERLESS_ADMIN_USER"] - if "PAPERLESS_ADMIN_MAIL" in os.environ: - del os.environ["PAPERLESS_ADMIN_MAIL"] - - def call_command(self, environ, *args, **kwargs): + def call_command(self, environ): out = StringIO() with mock.patch.dict(os.environ, environ): call_command( @@ -31,7 +17,6 @@ class TestManageSuperUser(DirectoriesMixin, TestCase): "--no-color", stdout=out, stderr=StringIO(), - **kwargs, ) return out.getvalue() From 74815a489fc205f65cebf9e0926dcf18d99af3e8 Mon Sep 17 00:00:00 2001 From: Trenton Holmes <holmes.trenton@gmail.com> Date: Mon, 9 May 2022 12:05:29 -0700 Subject: [PATCH 016/291] Minor improvements for quality of life --- docker/docker-prepare.sh | 2 +- .../management/commands/document_consumer.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/docker/docker-prepare.sh b/docker/docker-prepare.sh index 477233784..1756d88c4 100755 --- a/docker/docker-prepare.sh +++ b/docker/docker-prepare.sh @@ -52,7 +52,7 @@ search_index() { if [[ (! -f "$index_version_file") || $(<$index_version_file) != "$index_version" ]]; then echo "Search index out of date. Updating..." - python3 manage.py document_index reindex + python3 manage.py document_index reindex --no-progress-bar echo $index_version | tee $index_version_file >/dev/null fi } diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py index eb6f0a405..87e3af2c3 100644 --- a/src/documents/management/commands/document_consumer.py +++ b/src/documents/management/commands/document_consumer.py @@ -28,8 +28,11 @@ def _tags_from_path(filepath): """Walk up the directory tree from filepath to CONSUMPTION_DIR and get or create Tag IDs for every directory. """ + normalized_consumption_dir = os.path.abspath( + os.path.normpath(settings.CONSUMPTION_DIR), + ) tag_ids = set() - path_parts = Path(filepath).relative_to(settings.CONSUMPTION_DIR).parent.parts + path_parts = Path(filepath).relative_to(normalized_consumption_dir).parent.parts for part in path_parts: tag_ids.add( Tag.objects.get_or_create(name__iexact=part, defaults={"name": part})[0].pk, @@ -39,7 +42,10 @@ def _tags_from_path(filepath): def _is_ignored(filepath: str) -> bool: - filepath_relative = PurePath(filepath).relative_to(settings.CONSUMPTION_DIR) + normalized_consumption_dir = os.path.abspath( + os.path.normpath(settings.CONSUMPTION_DIR), + ) + filepath_relative = PurePath(filepath).relative_to(normalized_consumption_dir) return any(filepath_relative.match(p) for p in settings.CONSUMER_IGNORE_PATTERNS) @@ -160,6 +166,8 @@ class Command(BaseCommand): if not directory: raise CommandError("CONSUMPTION_DIR does not appear to be set.") + directory = os.path.abspath(directory) + if not os.path.isdir(directory): raise CommandError(f"Consumption directory {directory} does not exist") From 7544783d47d186e0c79e48bde4692d04150eebe4 Mon Sep 17 00:00:00 2001 From: Trenton Holmes <holmes.trenton@gmail.com> Date: Tue, 10 May 2022 11:20:00 -0700 Subject: [PATCH 017/291] Manually re-locks dependencies --- Pipfile | 2 +- Pipfile.lock | 86 +++++++++++++++++++++++++----------------------- requirements.txt | 10 +++--- 3 files changed, 50 insertions(+), 48 deletions(-) diff --git a/Pipfile b/Pipfile index c38d8323d..0ab6775e6 100644 --- a/Pipfile +++ b/Pipfile @@ -19,7 +19,7 @@ djangorestframework = "~=3.13" filelock = "*" fuzzywuzzy = {extras = ["speedup"], version = "*"} gunicorn = "*" -imap-tools = "~=0.54.0" +imap-tools = "*" langdetect = "*" pathvalidate = "*" pillow = "~=9.1" diff --git a/Pipfile.lock b/Pipfile.lock index 8516b77d0..f9c5a9bdd 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -68,10 +68,10 @@ }, "autobahn": { "hashes": [ - "sha256:58a887c7a196bb08d8b6624cb3695f493a9e5c9f00fd350d8d6f829b47ff9036" + "sha256:57b7acf228d50d83cf327372b889e2a168a869275b26e17917ed0b4cf4d823a6" ], "markers": "python_version >= '3.7'", - "version": "==22.3.2" + "version": "==22.4.2" }, "automat": { "hashes": [ @@ -238,31 +238,31 @@ }, "cryptography": { "hashes": [ - "sha256:06bfafa6e53ccbfb7a94be4687b211a025ce0625e3f3c60bb15cd048a18f3ed8", - "sha256:0db5cf21bd7d092baacb576482b0245102cea2d3cf09f09271ce9f69624ecb6f", - "sha256:125702572be12bcd318e3a14e9e70acd4be69a43664a75f0397e8650fe3c6cc3", - "sha256:1858eff6246bb8bbc080eee78f3dd1528739e3f416cba5f9914e8631b8df9871", - "sha256:315af6268de72bcfa0bb3401350ce7d921f216e6b60de12a363dad128d9d459f", - "sha256:451aaff8b8adf2dd0597cbb1fdcfc8a7d580f33f843b7cce75307a7f20112dd8", - "sha256:58021d6e9b1d88b1105269d0da5e60e778b37dfc0e824efc71343dd003726831", - "sha256:618391152147a1221c87b1b0b7f792cafcfd4b5a685c5c72eeea2ddd29aeceff", - "sha256:6d4daf890e674d191757d8d7d60dc3a29c58c72c7a76a05f1c0a326013f47e8b", - "sha256:74b55f67f4cf026cb84da7a1b04fc2a1d260193d4ad0ea5e9897c8b74c1e76ac", - "sha256:7ceae26f876aabe193b13a0c36d1bb8e3e7e608d17351861b437bd882f617e9f", - "sha256:930b829e8a2abaf43a19f38277ae3c5e1ffcf547b936a927d2587769ae52c296", - "sha256:a18ff4bfa9d64914a84d7b06c46eb86e0cc03113470b3c111255aceb6dcaf81d", - "sha256:ae1cd29fbe6b716855454e44f4bf743465152e15d2d317303fe3b58ee9e5af7a", - "sha256:b1ee5c82cf03b30f6ae4e32d2bcb1e167ef74d6071cbb77c2af30f101d0b360b", - "sha256:bf585476fcbcd37bed08072e8e2db3954ce1bfc68087a2dc9c19cfe0b90979ca", - "sha256:c4a58eeafbd7409054be41a377e726a7904a17c26f45abf18125d21b1215b08b", - "sha256:cce90609e01e1b192fae9e13665058ab46b2ea53a3c05a3ea74a3eb8c3af8857", - "sha256:d610d0ee14dd9109006215c7c0de15eee91230b70a9bce2263461cf7c3720b83", - "sha256:e69a0e36e62279120e648e787b76d79b41e0f9e86c1c636a4f38d415595c722e", - "sha256:f095988548ec5095e3750cdb30e6962273d239b1998ba1aac66c0d5bee7111c1", - "sha256:faf0f5456c059c7b1c29441bdd5e988f0ba75bdc3eea776520d8dcb1e30e1b5c" + "sha256:093cb351031656d3ee2f4fa1be579a8c69c754cf874206be1d4cf3b542042804", + "sha256:0cc20f655157d4cfc7bada909dc5cc228211b075ba8407c46467f63597c78178", + "sha256:1b9362d34363f2c71b7853f6251219298124aa4cc2075ae2932e64c91a3e2717", + "sha256:1f3bfbd611db5cb58ca82f3deb35e83af34bb8cf06043fa61500157d50a70982", + "sha256:2bd1096476aaac820426239ab534b636c77d71af66c547b9ddcd76eb9c79e004", + "sha256:31fe38d14d2e5f787e0aecef831457da6cec68e0bb09a35835b0b44ae8b988fe", + "sha256:3b8398b3d0efc420e777c40c16764d6870bcef2eb383df9c6dbb9ffe12c64452", + "sha256:3c81599befb4d4f3d7648ed3217e00d21a9341a9a688ecdd615ff72ffbed7336", + "sha256:419c57d7b63f5ec38b1199a9521d77d7d1754eb97827bbb773162073ccd8c8d4", + "sha256:46f4c544f6557a2fefa7ac8ac7d1b17bf9b647bd20b16decc8fbcab7117fbc15", + "sha256:471e0d70201c069f74c837983189949aa0d24bb2d751b57e26e3761f2f782b8d", + "sha256:59b281eab51e1b6b6afa525af2bd93c16d49358404f814fe2c2410058623928c", + "sha256:731c8abd27693323b348518ed0e0705713a36d79fdbd969ad968fbef0979a7e0", + "sha256:95e590dd70642eb2079d280420a888190aa040ad20f19ec8c6e097e38aa29e06", + "sha256:a68254dd88021f24a68b613d8c51d5c5e74d735878b9e32cc0adf19d1f10aaf9", + "sha256:a7d5137e556cc0ea418dca6186deabe9129cee318618eb1ffecbd35bee55ddc1", + "sha256:aeaba7b5e756ea52c8861c133c596afe93dd716cbcacae23b80bc238202dc023", + "sha256:dc26bb134452081859aa21d4990474ddb7e863aa39e60d1592800a8865a702de", + "sha256:e53258e69874a306fcecb88b7534d61820db8a98655662a3dd2ec7f1afd9132f", + "sha256:ef15c2df7656763b4ff20a9bc4381d8352e6640cfeb95c2972c38ef508e75181", + "sha256:f224ad253cc9cea7568f49077007d2263efa57396a2f2f78114066fd54b5c68e", + "sha256:f8ec91983e638a9bcd75b39f1396e5c0dc2330cbd9ce4accefe68717e6779e0a" ], "markers": "python_version >= '3.6'", - "version": "==37.0.1" + "version": "==37.0.2" }, "daphne": { "hashes": [ @@ -290,11 +290,11 @@ }, "django-cors-headers": { "hashes": [ - "sha256:a22be2befd4069c4fc174f11cf067351df5c061a3a5f94a01650b4e928b0372b", - "sha256:eb98389bf7a2afc5d374806af4a9149697e3a6955b5a2dc2bf049f7d33647456" + "sha256:39d1d5acb872c1860ecfd88b8572bfbb3a1f201b5685ede951d71fc57c7dfae5", + "sha256:5f07e2ff8a95c887698e748588a4a0b2ad0ad1b5a292e2d33132f1253e2a97cb" ], "index": "pypi", - "version": "==3.11.0" + "version": "==3.12.0" }, "django-extensions": { "hashes": [ @@ -482,11 +482,11 @@ }, "imap-tools": { "hashes": [ - "sha256:15d20ac8695fc4978a913c2186f482a802f5229c41c6e0c66c7bad8f1f590cf1", - "sha256:606b73a1b5ecc4c72eea5ad19231e07a88bf9ba9adbdd4acb8cf71a359dd43ec" + "sha256:81e0069d81483aecc3ca46e57f5c41ffc39f1ba0041e416591d829f99f682623", + "sha256:d32f3e165af9e56542c1a5beb2866537265ef4832c8bd2eb25982ee8ac70ea4f" ], "index": "pypi", - "version": "==0.54.0" + "version": "==0.55.0" }, "img2pdf": { "hashes": [ @@ -1195,11 +1195,11 @@ }, "setuptools": { "hashes": [ - "sha256:26ead7d1f93efc0f8c804d9fafafbe4a44b179580a7105754b245155f9af05a8", - "sha256:47c7b0c0f8fc10eec4cf1e71c6fdadf8decaa74ffa087e68cd1c20db7ad6a592" + "sha256:5534570b9980fc650d45c62877ff603c7aaaf24893371708736cc016bd221c3c", + "sha256:ca6ba73b7fd5f734ae70ece8c4c1f7062b07f3352f6428f6277e27c8f5c64237" ], "markers": "python_version >= '3.7'", - "version": "==62.1.0" + "version": "==62.2.0" }, "six": { "hashes": [ @@ -1597,7 +1597,9 @@ "version": "==8.1.3" }, "coverage": { - "extras": [], + "extras": [ + "toml" + ], "hashes": [ "sha256:03e2a7826086b91ef345ff18742ee9fc47a6839ccd517061ef8fa1976e652ce9", "sha256:07e6db90cd9686c767dcc593dff16c8c09f9814f5e9c51034066cad3373b914d", @@ -1691,11 +1693,11 @@ }, "faker": { "hashes": [ - "sha256:0301ace8365d98f3d0bf6e9a40200c8548e845d3812402ae1daf589effe3fb01", - "sha256:b1903db92175d78051858128ada397c7dc76f376f6967975419da232b3ebd429" + "sha256:7b25b2b980d3f0e61c586ec6365a39c797bae095f594890cc7bfb6f5ee8e66b4", + "sha256:f1b6dccdd57261918830b974a7cfa5b6a9044cf05d17d57bcbc757e0220db56f" ], "markers": "python_version >= '3.6'", - "version": "==13.7.0" + "version": "==13.11.0" }, "filelock": { "hashes": [ @@ -1845,11 +1847,11 @@ }, "pre-commit": { "hashes": [ - "sha256:02226e69564ebca1a070bd1f046af866aa1c318dbc430027c50ab832ed2b73f2", - "sha256:5d445ee1fa8738d506881c5d84f83c62bb5be6b2838e32207433647e8e5ebe10" + "sha256:10c62741aa5704faea2ad69cb550ca78082efe5697d6f04e5710c3c229afdd10", + "sha256:4233a1e38621c87d9dda9808c6606d7e7ba0e087cd56d3fe03202a01d2919615" ], "index": "pypi", - "version": "==2.18.1" + "version": "==2.19.0" }, "py": { "hashes": [ @@ -2096,7 +2098,7 @@ "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f" ], - "markers": "python_version >= '3.7'", + "markers": "python_version < '3.11'", "version": "==2.0.1" }, "tox": { diff --git a/requirements.txt b/requirements.txt index e851de66f..e6329b7a8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ arrow==1.2.2; python_version >= '3.6' asgiref==3.5.1; python_version >= '3.7' async-timeout==4.0.2; python_version >= '3.6' attrs==21.4.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' -autobahn==22.3.2; python_version >= '3.7' +autobahn==22.4.2; python_version >= '3.7' automat==20.2.0 backports.zoneinfo==0.2.1; python_version < '3.9' blessed==1.19.1; python_version >= '2.7' @@ -27,10 +27,10 @@ click==8.1.3; python_version >= '3.7' coloredlogs==15.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' concurrent-log-handler==0.9.20 constantly==15.1.0 -cryptography==37.0.1; python_version >= '3.6' +cryptography==37.0.2; python_version >= '3.6' daphne==3.0.2; python_version >= '3.6' dateparser==1.1.1 -django-cors-headers==3.11.0 +django-cors-headers==3.12.0 django-extensions==3.1.5 django-filter==21.1 django-picklefield==3.0.1; python_version >= '3' @@ -46,7 +46,7 @@ httptools==0.4.0 humanfriendly==10.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' hyperlink==21.0.0 idna==3.3; python_version >= '3' -imap-tools==0.54.0 +imap-tools==0.55.0 img2pdf==0.4.4 importlib-resources==5.7.1; python_version < '3.9' incremental==21.3.0 @@ -88,7 +88,7 @@ requests==2.27.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3 scikit-learn==1.0.2 scipy==1.8.0; python_version < '3.11' and python_version >= '3.8' service-identity==21.1.0 -setuptools==62.1.0; python_version >= '3.7' +setuptools==62.2.0; python_version >= '3.7' six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' sniffio==1.2.0; python_version >= '3.5' sqlparse==0.4.2; python_version >= '3.5' From 9770fa77ec9d77678c52aa338731a8f959680992 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 10 May 2022 16:48:59 -0700 Subject: [PATCH 018/291] Update environment.prod.ts --- src-ui/src/environments/environment.prod.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/environments/environment.prod.ts b/src-ui/src/environments/environment.prod.ts index 4120f0d29..4d64db657 100644 --- a/src-ui/src/environments/environment.prod.ts +++ b/src-ui/src/environments/environment.prod.ts @@ -5,7 +5,7 @@ export const environment = { apiBaseUrl: document.baseURI + 'api/', apiVersion: '2', appTitle: 'Paperless-ngx', - version: '1.7.1', + version: '1.7.1-dev', webSocketHost: window.location.host, webSocketProtocol: window.location.protocol == 'https:' ? 'wss:' : 'ws:', webSocketBaseUrl: base_url.pathname + 'ws/', From f96f107112686ebd2b6713c56e8a06d1dfb5bed1 Mon Sep 17 00:00:00 2001 From: Quinn Casey <quinn@quinncasey.com> Date: Tue, 10 May 2022 17:41:09 -0700 Subject: [PATCH 019/291] Use currently... importing... instead of "vs" --- src/documents/management/commands/document_importer.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py index 92742a487..1a1316059 100644 --- a/src/documents/management/commands/document_importer.py +++ b/src/documents/management/commands/document_importer.py @@ -84,9 +84,10 @@ class Command(BaseCommand): if self.version != version.__full_version_str__: self.stdout.write( self.style.WARNING( - "Version mismatch:" - f" {self.version} vs {version.__full_version_str__}." - " Continuing, but import may fail", + "Version mismatch: " + f"Currently {version.__full_version_str__}," + f" importing {self.version}." + " Continuing, but import may fail.", ), ) From 751e46c44f2548768104a7e2abfcc4a9041345e0 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 10 May 2022 21:21:57 -0700 Subject: [PATCH 020/291] ASN 'is null' from frontend --- .../filter-editor.component.html | 8 +++++++- .../filter-editor/filter-editor.component.ts | 20 ++++++++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html index 6280cff10..7a0f91899 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html @@ -8,7 +8,13 @@ <button *ngFor="let t of textFilterTargets" ngbDropdownItem [class.active]="textFilterTarget == t.id" (click)="changeTextFilterTarget(t.id)">{{t.name}}</button> </div> </div> - <input #textFilterInput class="form-control form-control-sm" type="text" [(ngModel)]="textFilter" (keyup.enter)="textFilterEnter()" [readonly]="textFilterTarget == 'fulltext-morelike'"> + <div *ngIf="textFilterTarget == 'asn'" class="input-group-text py-0"> + <div class="form-check form-switch m-0"> + <input class="form-check-input" type="checkbox" role="switch" [(ngModel)]="textFilterTargetIsNull" (change)="updateRules()"> + <label class="form-check-label" [class.text-muted]="!textFilterTargetIsNull" i18n>Is empty</label> + </div> + </div> + <input #textFilterInput class="form-control form-control-sm" type="text" [disabled]="textFilterTargetIsNull" [(ngModel)]="textFilter" (keyup.enter)="textFilterEnter()" [readonly]="textFilterTarget == 'fulltext-morelike'"> </div> </div> </div> diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts index b222597fb..acfe2236a 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts @@ -33,6 +33,7 @@ import { FILTER_DOES_NOT_HAVE_TAG, FILTER_TITLE, FILTER_TITLE_CONTENT, + FILTER_ASN_ISNULL, } from 'src/app/data/filter-rule-type' import { FilterableDropdownSelectionModel } from '../../common/filterable-dropdown/filterable-dropdown.component' import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component' @@ -135,6 +136,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy { } textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT + textFilterTargetIsNull: boolean = false get textFilterTargetName() { return this.textFilterTargets.find((t) => t.id == this.textFilterTarget) @@ -176,6 +178,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy { this.dateAddedAfter = null this.dateCreatedBefore = null this.dateCreatedAfter = null + this.textFilterTargetIsNull = false value.forEach((rule) => { switch (rule.rule_type) { @@ -254,6 +257,10 @@ export class FilterEditorComponent implements OnInit, OnDestroy { false ) break + case FILTER_ASN_ISNULL: + this.textFilterTarget = TEXT_FILTER_TARGET_ASN + this.textFilterTargetIsNull = rule.value == 'true' + break } }) this.checkIfRulesHaveChanged() @@ -273,8 +280,15 @@ export class FilterEditorComponent implements OnInit, OnDestroy { if (this._textFilter && this.textFilterTarget == TEXT_FILTER_TARGET_TITLE) { filterRules.push({ rule_type: FILTER_TITLE, value: this._textFilter }) } - if (this._textFilter && this.textFilterTarget == TEXT_FILTER_TARGET_ASN) { - filterRules.push({ rule_type: FILTER_ASN, value: this._textFilter }) + if (this.textFilterTarget == TEXT_FILTER_TARGET_ASN) { + if (this.textFilter?.length && !this.textFilterTargetIsNull) { + filterRules.push({ rule_type: FILTER_ASN, value: this._textFilter }) + } else if (!this.textFilter?.length) { + filterRules.push({ + rule_type: FILTER_ASN_ISNULL, + value: this.textFilterTargetIsNull.toString(), + }) + } } if ( this._textFilter && @@ -398,7 +412,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy { } get textFilter() { - return this._textFilter + return this.textFilterTargetIsNull ? '' : this._textFilter } set textFilter(value) { From 77e8cea173cb1ac460523e946bb759d45c7a2828 Mon Sep 17 00:00:00 2001 From: Oliver Lippert <oliver@allesit.de> Date: Wed, 11 May 2022 08:26:24 +0200 Subject: [PATCH 021/291] fix typo in update notification popup seems like appRemoteVersion.version brings it's own "v" --- src-ui/src/app/components/app-frame/app-frame.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index 8f480dea4..718e2a242 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -188,7 +188,7 @@ <div class="me-3">{{ versionString }}</div> <div *ngIf="appRemoteVersion" class="version-check"> <ng-template #updateAvailablePopContent> - <span class="small">Paperless-ngx v{{ appRemoteVersion.version }} <ng-container i18n>is available.</ng-container><br/><ng-container i18n>Click to view.</ng-container></span> + <span class="small">Paperless-ngx {{ appRemoteVersion.version }} <ng-container i18n>is available.</ng-container><br/><ng-container i18n>Click to view.</ng-container></span> </ng-template> <ng-template #updateCheckingNotEnabledPopContent> <span class="small"><ng-container i18n>Checking for updates is disabled.</ng-container><br/><ng-container i18n>Click for more information.</ng-container></span> From 978c26faefedc638c87c494c26528bef7b48f65b Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 11 May 2022 10:26:17 -0700 Subject: [PATCH 022/291] allow commas in non-multi rules query params --- src-ui/src/app/services/query-params.service.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src-ui/src/app/services/query-params.service.ts b/src-ui/src/app/services/query-params.service.ts index 1528dca57..da014a0a4 100644 --- a/src-ui/src/app/services/query-params.service.ts +++ b/src-ui/src/app/services/query-params.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core' import { ParamMap, Params, Router } from '@angular/router' import { FilterRule } from '../data/filter-rule' -import { FILTER_RULE_TYPES } from '../data/filter-rule-type' +import { FilterRuleType, FILTER_RULE_TYPES } from '../data/filter-rule-type' import { PaperlessSavedView } from '../data/paperless-saved-view' import { DocumentListViewService } from './document-list-view.service' @@ -135,17 +135,19 @@ export function filterRulesFromQueryParams(queryParams: ParamMap) { allFilterRuleQueryParams .filter((frqp) => queryParams.has(frqp)) .forEach((filterQueryParamName) => { - const filterQueryParamValues: string[] = queryParams - .get(filterQueryParamName) - .split(',') + const rule_type: FilterRuleType = FILTER_RULE_TYPES.find( + (rt) => rt.filtervar == filterQueryParamName + ) + const valueURIComponent: string = queryParams.get(filterQueryParamName) + const filterQueryParamValues: string[] = rule_type.multi + ? valueURIComponent.split(',') + : [valueURIComponent] filterRulesFromQueryParams = filterRulesFromQueryParams.concat( // map all values to filter rules filterQueryParamValues.map((val) => { return { - rule_type: FILTER_RULE_TYPES.find( - (rt) => rt.filtervar == filterQueryParamName - ).id, + rule_type: rule_type.id, value: val, } }) From 825f41a554ef5a56b8accf351ea0317f1e926ec3 Mon Sep 17 00:00:00 2001 From: Josef 'veloc1ty' Stautner <hello@veloc1ty.de> Date: Wed, 11 May 2022 21:00:00 +0200 Subject: [PATCH 023/291] gunicorn: Allow ipv6 sockets --- gunicorn.conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gunicorn.conf.py b/gunicorn.conf.py index 7bfaef43e..9c0e5be78 100644 --- a/gunicorn.conf.py +++ b/gunicorn.conf.py @@ -1,6 +1,6 @@ import os -bind = f'0.0.0.0:{os.getenv("PAPERLESS_PORT", 8000)}' +bind = f'[::]:{os.getenv("PAPERLESS_PORT", 8000)}' workers = int(os.getenv("PAPERLESS_WEBSERVER_WORKERS", 2)) worker_class = "paperless.workers.ConfigurableWorker" timeout = 120 From cd113ea5c9c2ffe95117b04cc01b77b2d8f10123 Mon Sep 17 00:00:00 2001 From: Trenton Holmes <holmes.trenton@gmail.com> Date: Wed, 11 May 2022 12:34:05 -0700 Subject: [PATCH 024/291] Adds unit testing for remote version getting --- src/documents/tests/test_api.py | 170 ++++++++++++++++++++++++++++++++ src/documents/views.py | 5 +- 2 files changed, 174 insertions(+), 1 deletion(-) diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index 21d53be9d..b492181d8 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -4,8 +4,10 @@ import json import os import shutil import tempfile +import urllib.request import zipfile from unittest import mock +from unittest.mock import MagicMock import pytest from django.conf import settings @@ -21,6 +23,7 @@ from documents.models import MatchingModel from documents.models import SavedView from documents.models import Tag from documents.tests.utils import DirectoriesMixin +from paperless import version from rest_framework.test import APITestCase from whoosh.writing import AsyncWriter @@ -2094,3 +2097,170 @@ class TestApiAuth(APITestCase): response = self.client.get("/api/") self.assertIn("X-Api-Version", response) self.assertIn("X-Version", response) + + +class TestRemoteVersion(APITestCase): + ENDPOINT = "/api/remote_version/" + + def setUp(self): + super().setUp() + + def test_remote_version_default(self): + response = self.client.get(self.ENDPOINT) + + self.assertEqual(response.status_code, 200) + self.assertDictEqual( + response.data, + { + "version": "0.0.0", + "update_available": False, + "feature_is_set": False, + }, + ) + + @override_settings( + ENABLE_UPDATE_CHECK=False, + ) + def test_remote_version_disabled(self): + response = self.client.get(self.ENDPOINT) + + self.assertEqual(response.status_code, 200) + self.assertDictEqual( + response.data, + { + "version": "0.0.0", + "update_available": False, + "feature_is_set": True, + }, + ) + + @override_settings( + ENABLE_UPDATE_CHECK=True, + ) + @mock.patch("urllib.request.urlopen") + def test_remote_version_enabled_no_update_prefix(self, urlopen_mock): + + cm = MagicMock() + cm.getcode.return_value = 200 + cm.read.return_value = json.dumps({"tag_name": "ngx-1.6.0"}).encode() + cm.__enter__.return_value = cm + urlopen_mock.return_value = cm + + response = self.client.get(self.ENDPOINT) + + self.assertEqual(response.status_code, 200) + self.assertDictEqual( + response.data, + { + "version": "1.6.0", + "update_available": False, + "feature_is_set": True, + }, + ) + + @override_settings( + ENABLE_UPDATE_CHECK=True, + ) + @mock.patch("urllib.request.urlopen") + def test_remote_version_enabled_no_update_no_prefix(self, urlopen_mock): + + cm = MagicMock() + cm.getcode.return_value = 200 + cm.read.return_value = json.dumps( + {"tag_name": version.__full_version_str__}, + ).encode() + cm.__enter__.return_value = cm + urlopen_mock.return_value = cm + + response = self.client.get(self.ENDPOINT) + + self.assertEqual(response.status_code, 200) + self.assertDictEqual( + response.data, + { + "version": version.__full_version_str__, + "update_available": False, + "feature_is_set": True, + }, + ) + + @override_settings( + ENABLE_UPDATE_CHECK=True, + ) + @mock.patch("urllib.request.urlopen") + def test_remote_version_enabled_update(self, urlopen_mock): + + new_version = ( + version.__version__[0], + version.__version__[1], + version.__version__[2] + 1, + ) + new_version_str = ".".join(map(str, new_version)) + + cm = MagicMock() + cm.getcode.return_value = 200 + cm.read.return_value = json.dumps( + {"tag_name": new_version_str}, + ).encode() + cm.__enter__.return_value = cm + urlopen_mock.return_value = cm + + response = self.client.get(self.ENDPOINT) + + self.assertEqual(response.status_code, 200) + self.assertDictEqual( + response.data, + { + "version": new_version_str, + "update_available": True, + "feature_is_set": True, + }, + ) + + @override_settings( + ENABLE_UPDATE_CHECK=True, + ) + @mock.patch("urllib.request.urlopen") + def test_remote_version_bad_json(self, urlopen_mock): + + cm = MagicMock() + cm.getcode.return_value = 200 + cm.read.return_value = b'{ "blah":' + cm.__enter__.return_value = cm + urlopen_mock.return_value = cm + + response = self.client.get(self.ENDPOINT) + + self.assertEqual(response.status_code, 200) + self.assertDictEqual( + response.data, + { + "version": "0.0.0", + "update_available": False, + "feature_is_set": True, + }, + ) + + @override_settings( + ENABLE_UPDATE_CHECK=True, + ) + @mock.patch("urllib.request.urlopen") + def test_remote_version_exception(self, urlopen_mock): + + cm = MagicMock() + cm.getcode.return_value = 200 + cm.read.side_effect = urllib.error.URLError("an error") + cm.__enter__.return_value = cm + urlopen_mock.return_value = cm + + response = self.client.get(self.ENDPOINT) + + self.assertEqual(response.status_code, 200) + self.assertDictEqual( + response.data, + { + "version": "0.0.0", + "update_available": False, + "feature_is_set": True, + }, + ) diff --git a/src/documents/views.py b/src/documents/views.py index f43581550..5d179da02 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -692,7 +692,10 @@ class RemoteVersionView(GenericAPIView): remote = response.read().decode("utf-8") try: remote_json = json.loads(remote) - remote_version = remote_json["tag_name"].removeprefix("ngx-") + remote_version = remote_json["tag_name"] + # Basically PEP 616 but that only went in 3.9 + if remote_version.startswith("ngx-"): + remote_version = remote_version[len("ngx-") :] except ValueError: logger.debug("An error occurred parsing remote version json") except urllib.error.URLError: From 336ce0e419d498da6c62c78150875c0689b56f07 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 11 May 2022 14:39:58 -0700 Subject: [PATCH 025/291] Handle all ASN filtering rules --- .../filter-editor.component.html | 11 +-- .../filter-editor/filter-editor.component.ts | 96 +++++++++++++++++-- src-ui/src/app/data/filter-rule-type.ts | 28 +++--- 3 files changed, 110 insertions(+), 25 deletions(-) diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html index 7a0f91899..5c25a2866 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html @@ -8,13 +8,10 @@ <button *ngFor="let t of textFilterTargets" ngbDropdownItem [class.active]="textFilterTarget == t.id" (click)="changeTextFilterTarget(t.id)">{{t.name}}</button> </div> </div> - <div *ngIf="textFilterTarget == 'asn'" class="input-group-text py-0"> - <div class="form-check form-switch m-0"> - <input class="form-check-input" type="checkbox" role="switch" [(ngModel)]="textFilterTargetIsNull" (change)="updateRules()"> - <label class="form-check-label" [class.text-muted]="!textFilterTargetIsNull" i18n>Is empty</label> - </div> - </div> - <input #textFilterInput class="form-control form-control-sm" type="text" [disabled]="textFilterTargetIsNull" [(ngModel)]="textFilter" (keyup.enter)="textFilterEnter()" [readonly]="textFilterTarget == 'fulltext-morelike'"> + <select *ngIf="textFilterTarget == 'asn'" class="form-select flex-grow-0 w-auto" [(ngModel)]="textFilterModifier" (change)="textFilterModifierChange()"> + <option *ngFor="let m of textFilterModifiers" ngbDropdownItem [value]="m.id">{{m.label}}</option> + </select> + <input #textFilterInput class="form-control form-control-sm" type="text" [disabled]="textFilterModifierIsNull" [(ngModel)]="textFilter" (keyup.enter)="textFilterEnter()" [readonly]="textFilterTarget == 'fulltext-morelike'"> </div> </div> </div> diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts index acfe2236a..a6c7247c5 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts @@ -34,6 +34,8 @@ import { FILTER_TITLE, FILTER_TITLE_CONTENT, FILTER_ASN_ISNULL, + FILTER_ASN_GT, + FILTER_ASN_LT, } from 'src/app/data/filter-rule-type' import { FilterableDropdownSelectionModel } from '../../common/filterable-dropdown/filterable-dropdown.component' import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component' @@ -46,6 +48,12 @@ const TEXT_FILTER_TARGET_ASN = 'asn' const TEXT_FILTER_TARGET_FULLTEXT_QUERY = 'fulltext-query' const TEXT_FILTER_TARGET_FULLTEXT_MORELIKE = 'fulltext-morelike' +const TEXT_FILTER_MODIFIER_EQUALS = 'equals' +const TEXT_FILTER_MODIFIER_NULL = 'is null' +const TEXT_FILTER_MODIFIER_NOTNULL = 'not null' +const TEXT_FILTER_MODIFIER_GT = 'greater' +const TEXT_FILTER_MODIFIER_LT = 'less' + @Component({ selector: 'app-filter-editor', templateUrl: './filter-editor.component.html', @@ -136,13 +144,45 @@ export class FilterEditorComponent implements OnInit, OnDestroy { } textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT - textFilterTargetIsNull: boolean = false get textFilterTargetName() { return this.textFilterTargets.find((t) => t.id == this.textFilterTarget) ?.name } + public textFilterModifier: string + + get textFilterModifiers() { + return [ + { + id: TEXT_FILTER_MODIFIER_EQUALS, + label: $localize`equals`, + }, + { + id: TEXT_FILTER_MODIFIER_NULL, + label: $localize`is empty`, + }, + { + id: TEXT_FILTER_MODIFIER_NOTNULL, + label: $localize`is not empty`, + }, + { + id: TEXT_FILTER_MODIFIER_GT, + label: $localize`greater than`, + }, + { + id: TEXT_FILTER_MODIFIER_LT, + label: $localize`less than`, + }, + ] + } + + get textFilterModifierIsNull(): boolean { + return [TEXT_FILTER_MODIFIER_NULL, TEXT_FILTER_MODIFIER_NOTNULL].includes( + this.textFilterModifier + ) + } + tagSelectionModel = new FilterableDropdownSelectionModel() correspondentSelectionModel = new FilterableDropdownSelectionModel() documentTypeSelectionModel = new FilterableDropdownSelectionModel() @@ -178,7 +218,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy { this.dateAddedAfter = null this.dateCreatedBefore = null this.dateCreatedAfter = null - this.textFilterTargetIsNull = false + this.textFilterModifier = TEXT_FILTER_MODIFIER_EQUALS value.forEach((rule) => { switch (rule.rule_type) { @@ -259,7 +299,17 @@ export class FilterEditorComponent implements OnInit, OnDestroy { break case FILTER_ASN_ISNULL: this.textFilterTarget = TEXT_FILTER_TARGET_ASN - this.textFilterTargetIsNull = rule.value == 'true' + this.textFilterModifier = TEXT_FILTER_MODIFIER_NULL + break + case FILTER_ASN_GT: + this.textFilterTarget = TEXT_FILTER_TARGET_ASN + this.textFilterModifier = TEXT_FILTER_MODIFIER_GT + this._textFilter = rule.value + break + case FILTER_ASN_LT: + this.textFilterTarget = TEXT_FILTER_TARGET_ASN + this.textFilterModifier = TEXT_FILTER_MODIFIER_LT + this._textFilter = rule.value break } }) @@ -281,12 +331,30 @@ export class FilterEditorComponent implements OnInit, OnDestroy { filterRules.push({ rule_type: FILTER_TITLE, value: this._textFilter }) } if (this.textFilterTarget == TEXT_FILTER_TARGET_ASN) { - if (this.textFilter?.length && !this.textFilterTargetIsNull) { + if ( + this.textFilterModifier == TEXT_FILTER_MODIFIER_EQUALS && + this._textFilter + ) { filterRules.push({ rule_type: FILTER_ASN, value: this._textFilter }) - } else if (!this.textFilter?.length) { + } else if (this.textFilterModifierIsNull) { filterRules.push({ rule_type: FILTER_ASN_ISNULL, - value: this.textFilterTargetIsNull.toString(), + value: ( + this.textFilterModifier == TEXT_FILTER_MODIFIER_NULL + ).toString(), + }) + } else if ( + [TEXT_FILTER_MODIFIER_GT, TEXT_FILTER_MODIFIER_LT].includes( + this.textFilterModifier + ) && + this._textFilter + ) { + filterRules.push({ + rule_type: + this.textFilterModifier == TEXT_FILTER_MODIFIER_GT + ? FILTER_ASN_GT + : FILTER_ASN_LT, + value: this._textFilter, }) } } @@ -412,7 +480,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy { } get textFilter() { - return this.textFilterTargetIsNull ? '' : this._textFilter + return this.textFilterModifierIsNull ? '' : this._textFilter } set textFilter(value) { @@ -512,4 +580,18 @@ export class FilterEditorComponent implements OnInit, OnDestroy { this.textFilterInput.nativeElement.focus() this.updateRules() } + + textFilterModifierChange() { + if ( + this.textFilterModifierIsNull || + ([ + TEXT_FILTER_MODIFIER_EQUALS, + TEXT_FILTER_MODIFIER_GT, + TEXT_FILTER_MODIFIER_LT, + ].includes(this.textFilterModifier) && + this._textFilter) + ) { + this.updateRules() + } + } } diff --git a/src-ui/src/app/data/filter-rule-type.ts b/src-ui/src/app/data/filter-rule-type.ts index 337fee545..d6960ec58 100644 --- a/src-ui/src/app/data/filter-rule-type.ts +++ b/src-ui/src/app/data/filter-rule-type.ts @@ -20,11 +20,13 @@ export const FILTER_MODIFIED_AFTER = 16 export const FILTER_DOES_NOT_HAVE_TAG = 17 export const FILTER_ASN_ISNULL = 18 +export const FILTER_ASN_GT = 19 +export const FILTER_ASN_LT = 20 -export const FILTER_TITLE_CONTENT = 19 +export const FILTER_TITLE_CONTENT = 21 -export const FILTER_FULLTEXT_QUERY = 20 -export const FILTER_FULLTEXT_MORELIKE = 21 +export const FILTER_FULLTEXT_QUERY = 22 +export const FILTER_FULLTEXT_MORELIKE = 23 export const FILTER_RULE_TYPES: FilterRuleType[] = [ { @@ -41,14 +43,12 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [ multi: false, default: '', }, - { id: FILTER_ASN, filtervar: 'archive_serial_number', datatype: 'number', multi: false, }, - { id: FILTER_CORRESPONDENT, filtervar: 'correspondent__id', @@ -63,7 +63,6 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [ datatype: 'document_type', multi: false, }, - { id: FILTER_IS_IN_INBOX, filtervar: 'is_in_inbox', @@ -96,7 +95,6 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [ multi: false, default: true, }, - { id: FILTER_CREATED_BEFORE, filtervar: 'created__date__lt', @@ -109,7 +107,6 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [ datatype: 'date', multi: false, }, - { id: FILTER_CREATED_YEAR, filtervar: 'created__year', @@ -141,7 +138,6 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [ datatype: 'date', multi: false, }, - { id: FILTER_MODIFIED_BEFORE, filtervar: 'modified__date__lt', @@ -160,14 +156,24 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [ datatype: 'boolean', multi: false, }, - + { + id: FILTER_ASN_GT, + filtervar: 'archive_serial_number__gt', + datatype: 'number', + multi: false, + }, + { + id: FILTER_ASN_LT, + filtervar: 'archive_serial_number__lt', + datatype: 'number', + multi: false, + }, { id: FILTER_TITLE_CONTENT, filtervar: 'title_content', datatype: 'string', multi: false, }, - { id: FILTER_FULLTEXT_QUERY, filtervar: 'query', From 72961ead0b95a0c6abdf2152cdff451caae7be19 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 11 May 2022 14:42:14 -0700 Subject: [PATCH 026/291] Fix disabled input bg color --- src-ui/src/styles.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss index 06fe95f94..739c37123 100644 --- a/src-ui/src/styles.scss +++ b/src-ui/src/styles.scss @@ -261,6 +261,11 @@ textarea, border-color: var(--bs-primary); } +.form-control:disabled, .form-control[readonly] { + background-color: var(--pngx-bg-alt); + cursor: not-allowed; +} + .page-link { color: var(--bs-secondary); background-color: var(--bs-body-bg); From c245a7c2dc71ea212d6888b941ee1bd6a30bb69a Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 11 May 2022 15:15:06 -0700 Subject: [PATCH 027/291] Fix unassigned query params ignored --- src-ui/src/app/services/query-params.service.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/services/query-params.service.ts b/src-ui/src/app/services/query-params.service.ts index da014a0a4..888440aae 100644 --- a/src-ui/src/app/services/query-params.service.ts +++ b/src-ui/src/app/services/query-params.service.ts @@ -129,6 +129,8 @@ export function filterRulesFromQueryParams(queryParams: ParamMap) { const allFilterRuleQueryParams: string[] = FILTER_RULE_TYPES.map( (rt) => rt.filtervar ) + .concat(FILTER_RULE_TYPES.map((rt) => rt.isnull_filtervar)) + .filter((rt) => rt !== undefined) // transform query params to filter rules let filterRulesFromQueryParams: FilterRule[] = [] @@ -136,8 +138,11 @@ export function filterRulesFromQueryParams(queryParams: ParamMap) { .filter((frqp) => queryParams.has(frqp)) .forEach((filterQueryParamName) => { const rule_type: FilterRuleType = FILTER_RULE_TYPES.find( - (rt) => rt.filtervar == filterQueryParamName + (rt) => + rt.filtervar == filterQueryParamName || + rt.isnull_filtervar == filterQueryParamName ) + const isNullRuleType = rule_type.isnull_filtervar == filterQueryParamName const valueURIComponent: string = queryParams.get(filterQueryParamName) const filterQueryParamValues: string[] = rule_type.multi ? valueURIComponent.split(',') @@ -148,7 +153,7 @@ export function filterRulesFromQueryParams(queryParams: ParamMap) { filterQueryParamValues.map((val) => { return { rule_type: rule_type.id, - value: val, + value: isNullRuleType ? null : val, } }) ) From a201eb373f0acfc1f34405e1060b81c9aa74ac27 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 11 May 2022 23:09:22 -0700 Subject: [PATCH 028/291] Improve mobile filter editor layout with long languages --- .../document-list/document-list.component.html | 9 +++++---- .../filter-editor/filter-editor.component.html | 14 +++++++------- .../filter-editor/filter-editor.component.scss | 4 ++-- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html index e00e54333..4a15fe976 100644 --- a/src-ui/src/app/components/document-list/document-list.component.html +++ b/src-ui/src/app/components/document-list/document-list.component.html @@ -1,10 +1,11 @@ <app-page-header [title]="getTitle()"> - <div ngbDropdown class="me-2 flex-fill d-flex"> - <button class="btn btn-sm btn-outline-primary flex-fill" id="dropdownSelect" ngbDropdownToggle> + <div ngbDropdown class="me-2 d-flex"> + <button class="btn btn-sm btn-outline-primary" id="dropdownSelect" ngbDropdownToggle> <svg class="toolbaricon" fill="currentColor"> <use xlink:href="assets/bootstrap-icons.svg#text-indent-left" /> - </svg> <ng-container i18n>Select</ng-container> + </svg> + <div class="d-none d-sm-inline"> <ng-container i18n>Select</ng-container></div> </button> <div ngbDropdownMenu aria-labelledby="dropdownSelect" class="shadow"> <button ngbDropdownItem (click)="list.selectNone()" i18n>Select none</button> @@ -75,7 +76,7 @@ </app-page-header> -<div class="row sticky-top pt-4 pb-2 pb-lg-4 bg-body"> +<div class="row sticky-top pt-3 pt-sm-4 pb-2 pb-lg-4 bg-body"> <app-filter-editor [hidden]="isBulkEditing" [(filterRules)]="list.filterRules" [unmodifiedFilterRules]="unmodifiedFilterRules" #filterEditor></app-filter-editor> <app-bulk-editor [hidden]="!isBulkEditing"></app-bulk-editor> </div> diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html index 6280cff10..9dac17fbf 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html @@ -13,9 +13,9 @@ </div> </div> <div class="w-100 d-xl-none"></div> - <div class="col col-xl-auto mb-2 mb-xl-0"> - <div class="d-flex"> - <app-filterable-dropdown class="me-2 flex-fill" title="Tags" icon="tag-fill" i18n-title + <div class="col col-xl-auto"> + <div class="d-flex flex-wrap"> + <app-filterable-dropdown class="flex-fill" title="Tags" icon="tag-fill" i18n-title filterPlaceholder="Filter tags" i18n-filterPlaceholder [items]="tags" [(selectionModel)]="tagSelectionModel" @@ -23,26 +23,26 @@ [multiple]="true" (open)="onTagsDropdownOpen()" [allowSelectNone]="true"></app-filterable-dropdown> - <app-filterable-dropdown class="me-2 flex-fill" title="Correspondent" icon="person-fill" i18n-title + <app-filterable-dropdown class="flex-fill" title="Correspondent" icon="person-fill" i18n-title filterPlaceholder="Filter correspondents" i18n-filterPlaceholder [items]="correspondents" [(selectionModel)]="correspondentSelectionModel" (selectionModelChange)="updateRules()" (open)="onCorrespondentDropdownOpen()" [allowSelectNone]="true"></app-filterable-dropdown> - <app-filterable-dropdown class="me-2 flex-fill" title="Document type" icon="file-earmark-fill" i18n-title + <app-filterable-dropdown class="flex-fill" title="Document type" icon="file-earmark-fill" i18n-title filterPlaceholder="Filter document types" i18n-filterPlaceholder [items]="documentTypes" [(selectionModel)]="documentTypeSelectionModel" (open)="onDocumentTypeDropdownOpen()" (selectionModelChange)="updateRules()" [allowSelectNone]="true"></app-filterable-dropdown> - <app-date-dropdown class="me-2" + <app-date-dropdown class="mb-2 mb-xl-0" title="Created" i18n-title (datesSet)="updateRules()" [(dateBefore)]="dateCreatedBefore" [(dateAfter)]="dateCreatedAfter"></app-date-dropdown> - <app-date-dropdown + <app-date-dropdown class="mb-2 mb-xl-0" [(dateBefore)]="dateAddedBefore" [(dateAfter)]="dateAddedAfter" title="Added" i18n-title diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.scss b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.scss index d34afd57c..6bfe1448d 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.scss +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.scss @@ -14,6 +14,6 @@ border-bottom-right-radius: 0; } -.me-2 { - margin-right: 0.7rem !important; // tweak to make room for badges +.d-flex.flex-wrap { + column-gap: 0.7rem; } From 8a99fd19bd4e0ffccefaed6163feaad22e80e880 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 11 May 2022 23:16:41 -0700 Subject: [PATCH 029/291] Visible bg & text color changes on ng-select --- src-ui/src/styles.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss index 06fe95f94..94b19aea8 100644 --- a/src-ui/src/styles.scss +++ b/src-ui/src/styles.scss @@ -208,6 +208,11 @@ a, a:hover, .btn-link, .btn-link:hover { } } + .ng-dropdown-panel .ng-dropdown-panel-items .ng-option.ng-option-marked { + background-color: var(--pngx-bg-darker) !important; + color: var(--pngx-body-color-accent) !important; + } + .ng-dropdown-panel .ng-dropdown-panel-items .ng-option.ng-option-selected, .ng-dropdown-panel .ng-dropdown-panel-items .ng-option.ng-option-selected.ng-option-marked { background: none; From 03d2e715872de76a0d332de5496cfca1dff5f118 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 12 May 2022 20:14:59 -0700 Subject: [PATCH 030/291] Hide text on large cards on tiny screens --- .../document-detail.component.html | 2 +- .../document-card-large.component.html | 26 +++++++++---------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html index 118f917ec..a4203473f 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.html +++ b/src-ui/src/app/components/document-detail/document-detail.component.html @@ -30,7 +30,7 @@ <button type="button" class="btn btn-sm btn-outline-primary me-2" (click)="moreLike()"> <svg class="buttonicon" fill="currentColor"> - <use xlink:href="assets/bootstrap-icons.svg#three-dots" /> + <use xlink:href="assets/bootstrap-icons.svg#diagram-3" /> </svg> <span class="d-none d-lg-inline" i18n>More like this</span> </button> diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html index 04eb3385b..a5b238504 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html @@ -33,31 +33,29 @@ <div class="d-flex flex-column flex-md-row align-items-md-center"> <div class="btn-group"> <a class="btn btn-sm btn-outline-secondary" (click)="clickMoreLike.emit()"> - <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-three-dots" viewBox="0 0 16 16"> - <path fill-rule="evenodd" d="M3 9.5a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3zm5 0a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3zm5 0a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3z"/> - </svg> <span class="d-block d-md-inline" i18n>More like this</span> + <svg class="sidebaricon" fill="currentColor" class="sidebaricon"> + <use xlink:href="assets/bootstrap-icons.svg#diagram-3"/> + </svg> <span class="d-none d-md-inline" i18n>More like this</span> </a> <a routerLink="/documents/{{document.id}}" class="btn btn-sm btn-outline-secondary"> - <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-pencil" fill="currentColor" xmlns="http://www.w3.org/2000/svg"> - <path fill-rule="evenodd" d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5L13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175l-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z"/> - </svg> <span class="d-block d-md-inline" i18n>Edit</span> + <svg class="sidebaricon" fill="currentColor" class="sidebaricon"> + <use xlink:href="assets/bootstrap-icons.svg#pencil"/> + </svg> <span class="d-none d-md-inline" i18n>Edit</span> </a> <a class="btn btn-sm btn-outline-secondary" target="_blank" [href]="previewUrl" [ngbPopover]="previewContent" [popoverTitle]="document.title | documentTitle" autoClose="true" popoverClass="shadow" (mouseenter)="mouseEnterPreview()" (mouseleave)="mouseLeavePreview()" #popover="ngbPopover"> - <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-eye" viewBox="0 0 16 16"> - <path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.133 13.133 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5c2.12 0 3.879 1.168 5.168 2.457A13.133 13.133 0 0 1 14.828 8c-.058.087-.122.183-.195.288-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5c-2.12 0-3.879-1.168-5.168-2.457A13.134 13.134 0 0 1 1.172 8z"/> - <path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/> - </svg> <span class="d-block d-md-inline" i18n>View</span> + <svg class="sidebaricon" fill="currentColor" class="sidebaricon"> + <use xlink:href="assets/bootstrap-icons.svg#eye"/> + </svg> <span class="d-none d-md-inline" i18n>View</span> </a> <ng-template #previewContent> <object [data]="previewUrl | safeUrl" class="preview" width="100%"></object> </ng-template> <a class="btn btn-sm btn-outline-secondary" [href]="getDownloadUrl()"> - <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-download" fill="currentColor" xmlns="http://www.w3.org/2000/svg"> - <path fill-rule="evenodd" d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/> - <path fill-rule="evenodd" d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/> - </svg> <span class="d-block d-md-inline" i18n>Download</span> + <svg class="sidebaricon" fill="currentColor" class="sidebaricon"> + <use xlink:href="assets/bootstrap-icons.svg#download"/> + </svg> <span class="d-none d-md-inline" i18n>Download</span> </a> </div> From 59742e2f0877536a57737fd92f50d6dd3508082e Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 12 May 2022 20:32:17 -0700 Subject: [PATCH 031/291] Update messages.xlf [ci skip] --- src-ui/messages.xlf | 157 ++++++++++++++++++++++++++++---------------- 1 file changed, 100 insertions(+), 57 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 962476fbe..a396a1519 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -335,7 +335,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -368,7 +368,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -398,35 +398,35 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> </trans-unit> <trans-unit id="5687256342387781369" datatype="html"> <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> </trans-unit> <trans-unit id="3897348120591552265" datatype="html"> <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> </trans-unit> <trans-unit id="7437910965833684826" datatype="html"> <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> </trans-unit> <trans-unit id="7886570921510760899" datatype="html"> <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -438,21 +438,21 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> </trans-unit> <trans-unit id="3079652255369035" datatype="html"> <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> </trans-unit> <trans-unit id="4804785061014590286" datatype="html"> <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -463,70 +463,70 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> </trans-unit> <trans-unit id="314315645942131479" datatype="html"> <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> </trans-unit> <trans-unit id="4895326106573044490" datatype="html"> <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> </trans-unit> <trans-unit id="1534029177398918729" datatype="html"> <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> </trans-unit> <trans-unit id="5612903193691847840" datatype="html"> <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> </trans-unit> <trans-unit id="4112664765954374539" datatype="html"> <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> </trans-unit> <trans-unit id="1175891574282637937" datatype="html"> <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> </trans-unit> <trans-unit id="5052123870893768885" datatype="html"> <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> </trans-unit> <trans-unit id="3601519436351639860" datatype="html"> <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> </trans-unit> <trans-unit id="509090351011426949" datatype="html"> <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> </trans-unit> <trans-unit id="5000042972069710005" datatype="html"> @@ -926,18 +926,33 @@ <context context-type="linenumber">20</context> </context-group> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">88</context> + </context-group> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> </trans-unit> <trans-unit id="795745990148149834" datatype="html"> <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> </trans-unit> <trans-unit id="2946624699882754313" datatype="html"> @@ -963,7 +978,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -986,7 +1001,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1296,7 +1311,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1319,7 +1334,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1443,7 +1458,7 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> @@ -1454,28 +1469,28 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> </trans-unit> <trans-unit id="6691075929777935948" datatype="html"> <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> </trans-unit> <trans-unit id="719892092227206532" datatype="html"> <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> </trans-unit> <trans-unit id="1844801255494293730" datatype="html"> <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> </trans-unit> <trans-unit id="6857598786757174736" datatype="html"> @@ -1507,7 +1522,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> </trans-unit> <trans-unit id="184185893993764098" datatype="html"> @@ -1518,7 +1533,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> </trans-unit> <trans-unit id="2947613869920454977" datatype="html"> @@ -1529,7 +1544,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> </trans-unit> <trans-unit id="6224229575087660549" datatype="html"> @@ -1836,13 +1851,6 @@ <context context-type="linenumber">72</context> </context-group> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> @@ -1879,7 +1887,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1894,7 +1902,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1905,98 +1913,133 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> </trans-unit> <trans-unit id="6837554170707123455" datatype="html"> <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> </trans-unit> <trans-unit id="6849725902312323996" datatype="html"> <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> </trans-unit> <trans-unit id="5195932016807797291" datatype="html"> <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> </trans-unit> <trans-unit id="8170755470576301659" datatype="html"> <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> </trans-unit> <trans-unit id="8705701325879965907" datatype="html"> <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> </trans-unit> <trans-unit id="4362173610367509215" datatype="html"> <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> </trans-unit> <trans-unit id="8180755793012580465" datatype="html"> <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> </trans-unit> <trans-unit id="6494566478302448576" datatype="html"> <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> </trans-unit> <trans-unit id="6523384805359286307" datatype="html"> <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> </trans-unit> <trans-unit id="1872523635812236432" datatype="html"> <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> </trans-unit> <trans-unit id="3100631071441658964" datatype="html"> <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> </trans-unit> <trans-unit id="1010505078885609376" datatype="html"> <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> </trans-unit> <trans-unit id="2649431021108393503" datatype="html"> <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> + </context-group> + </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> </context-group> </trans-unit> <trans-unit id="7210076240260527720" datatype="html"> From 88c3a2c6937ef6ef5979b1fef55456e8c520e055 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 12 May 2022 20:34:32 -0700 Subject: [PATCH 032/291] Use explicit plural strings on management pages --- .../manage/correspondent-list/correspondent-list.component.ts | 1 + .../manage/document-type-list/document-type-list.component.ts | 1 + .../manage/management-list/management-list.component.html | 4 ++-- .../manage/management-list/management-list.component.ts | 1 + .../src/app/components/manage/tag-list/tag-list.component.ts | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts index 6a963fbab..9eb05758c 100644 --- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts +++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts @@ -31,6 +31,7 @@ export class CorrespondentListComponent extends ManagementListComponent<Paperles queryParamsService, FILTER_CORRESPONDENT, $localize`correspondent`, + $localize`correspondents`, [ { key: 'last_correspondence', diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts index d9f4b274b..8f903e65b 100644 --- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts +++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts @@ -28,6 +28,7 @@ export class DocumentTypeListComponent extends ManagementListComponent<Paperless queryParamsService, FILTER_DOCUMENT_TYPE, $localize`document type`, + $localize`document types`, [] ) } diff --git a/src-ui/src/app/components/manage/management-list/management-list.component.html b/src-ui/src/app/components/manage/management-list/management-list.component.html index 761e340eb..f153ac4c6 100644 --- a/src-ui/src/app/components/manage/management-list/management-list.component.html +++ b/src-ui/src/app/components/manage/management-list/management-list.component.html @@ -1,4 +1,4 @@ -<app-page-header title="{{ typeName | titlecase }}s"> +<app-page-header title="{{ typeNamePlural | titlecase }}"> <button type="button" class="btn btn-sm btn-outline-primary" (click)="openCreateDialog()" i18n>Create</button> </app-page-header> @@ -71,6 +71,6 @@ </table> <div class="d-flex"> - <div i18n *ngIf="collectionSize > 0">{collectionSize, plural, =1 {One {{typeName}}} other {{{collectionSize || 0}} total {{typeName}}s}}</div> + <div i18n *ngIf="collectionSize > 0">{collectionSize, plural, =1 {One {{typeName}}} other {{{collectionSize || 0}} total {{typeNamePlural}}}}</div> <ngb-pagination *ngIf="collectionSize > 20" class="ms-auto" [pageSize]="25" [collectionSize]="collectionSize" [(page)]="page" (pageChange)="reloadData()" aria-label="Default pagination"></ngb-pagination> </div> diff --git a/src-ui/src/app/components/manage/management-list/management-list.component.ts b/src-ui/src/app/components/manage/management-list/management-list.component.ts index 0768d7c04..89218f80b 100644 --- a/src-ui/src/app/components/manage/management-list/management-list.component.ts +++ b/src-ui/src/app/components/manage/management-list/management-list.component.ts @@ -45,6 +45,7 @@ export abstract class ManagementListComponent<T extends ObjectWithId> private queryParamsService: QueryParamsService, protected filterRuleType: number, public typeName: string, + public typeNamePlural: string, public extraColumns: ManagementListColumn[] ) {} diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts index c1dd98e52..cbb47d48e 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts +++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts @@ -28,6 +28,7 @@ export class TagListComponent extends ManagementListComponent<PaperlessTag> { queryParamsService, FILTER_HAS_TAGS_ALL, $localize`tag`, + $localize`tags`, [ { key: 'color', From 9d4c73aba160d70e460646505dd30f661f1267cd Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 12 May 2022 20:39:04 -0700 Subject: [PATCH 033/291] Update messages.xlf --- src-ui/messages.xlf | 47 ++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index a396a1519..0a2181cba 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -818,7 +818,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> </trans-unit> <trans-unit id="1426037806946650347" datatype="html"> @@ -1209,7 +1209,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1462,7 +1462,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> </trans-unit> <trans-unit id="5382975254277698192" datatype="html"> @@ -2092,18 +2092,25 @@ <context context-type="linenumber">33</context> </context-group> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> </trans-unit> <trans-unit id="7427874343955308724" datatype="html"> <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> </trans-unit> <trans-unit id="8084492669582894778" datatype="html"> @@ -2113,11 +2120,18 @@ <context context-type="linenumber">30</context> </context-group> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> </trans-unit> <trans-unit id="5674286808255988565" datatype="html"> @@ -2214,8 +2228,8 @@ <context context-type="linenumber">44</context> </context-group> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2233,7 +2247,7 @@ <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2244,14 +2258,14 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> </trans-unit> <trans-unit id="8371896857609524947" datatype="html"> <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> </trans-unit> <trans-unit id="5467489005440577210" datatype="html"> @@ -2260,7 +2274,7 @@ )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> </trans-unit> <trans-unit id="6439365426343089851" datatype="html"> @@ -2531,11 +2545,18 @@ <context context-type="linenumber">30</context> </context-group> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + </trans-unit> <trans-unit id="93754014749412887" datatype="html"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> </trans-unit> <trans-unit id="181464970911903082" datatype="html"> From ced8b999b2d4a8d91573388d281e00c8865a005d Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 13 May 2022 08:30:41 -0700 Subject: [PATCH 034/291] Update messages.xlf [ci skip] --- src-ui/messages.xlf | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 0a2181cba..dd388c374 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -916,7 +916,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> </trans-unit> <trans-unit id="7103181924469214926" datatype="html"> @@ -938,7 +938,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> + <context context-type="linenumber">89</context> </context-group> </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> @@ -974,7 +974,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> @@ -997,7 +997,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> @@ -1228,7 +1228,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1307,7 +1307,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> @@ -1330,7 +1330,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> @@ -1771,14 +1771,14 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> </trans-unit> <trans-unit id="2332107018974972998" datatype="html"> <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> </trans-unit> <trans-unit id="3727324658595204357" datatype="html"> @@ -1806,84 +1806,84 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> </trans-unit> <trans-unit id="1512866475468373520" datatype="html"> <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> </trans-unit> <trans-unit id="1494518490116523821" datatype="html"> <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> </trans-unit> <trans-unit id="5146398958364876914" datatype="html"> <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> </trans-unit> <trans-unit id="2123659921722214537" datatype="html"> <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> </trans-unit> <trans-unit id="1233494216161906927" datatype="html"> <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> </trans-unit> <trans-unit id="2276119452079372898" datatype="html"> <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> </trans-unit> <trans-unit id="8786996283897742947" datatype="html"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> </trans-unit> <trans-unit id="6600548268163632449" datatype="html"> <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> </trans-unit> <trans-unit id="2243770355958919528" datatype="html"> <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> </trans-unit> <trans-unit id="1559883523769732271" datatype="html"> <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> </trans-unit> <trans-unit id="7517688192215738656" datatype="html"> <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> @@ -1898,7 +1898,7 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> From 5ed4597a4fe97d5798842be4f77b343179801e19 Mon Sep 17 00:00:00 2001 From: Trenton Holmes <holmes.trenton@gmail.com> Date: Fri, 13 May 2022 09:10:36 -0700 Subject: [PATCH 035/291] Fixes Document public filename so it will use the local date instead of UTC date --- src/documents/file_handling.py | 21 +++++++----- src/documents/models.py | 4 ++- src/documents/tests/test_document_model.py | 37 ++++++++++++++-------- 3 files changed, 39 insertions(+), 23 deletions(-) diff --git a/src/documents/file_handling.py b/src/documents/file_handling.py index cf165d31d..94d091cab 100644 --- a/src/documents/file_handling.py +++ b/src/documents/file_handling.py @@ -6,6 +6,7 @@ from collections import defaultdict import pathvalidate from django.conf import settings from django.template.defaultfilters import slugify +from django.utils import timezone logger = logging.getLogger("paperless.filehandling") @@ -158,18 +159,22 @@ def generate_filename(doc, counter=0, append_gpg=True, archive_filename=False): else: asn = "none" + # Convert UTC database date to localized date + local_added = timezone.localdate(doc.added) + local_created = timezone.localdate(doc.created) + path = settings.PAPERLESS_FILENAME_FORMAT.format( title=pathvalidate.sanitize_filename(doc.title, replacement_text="-"), correspondent=correspondent, document_type=document_type, - created=datetime.date.isoformat(doc.created), - created_year=doc.created.year if doc.created else "none", - created_month=f"{doc.created.month:02}" if doc.created else "none", - created_day=f"{doc.created.day:02}" if doc.created else "none", - added=datetime.date.isoformat(doc.added), - added_year=doc.added.year if doc.added else "none", - added_month=f"{doc.added.month:02}" if doc.added else "none", - added_day=f"{doc.added.day:02}" if doc.added else "none", + created=datetime.date.isoformat(local_created), + created_year=local_created.year, + created_month=f"{local_created.month:02}", + created_day=f"{local_created.day:02}", + added=datetime.date.isoformat(local_added), + added_year=local_added.year, + added_month=f"{local_added.month:02}", + added_day=f"{local_added.day:02}", asn=asn, tags=tags, tag_list=tag_list, diff --git a/src/documents/models.py b/src/documents/models.py index ecabe085c..206df4e8a 100644 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -208,7 +208,9 @@ class Document(models.Model): verbose_name_plural = _("documents") def __str__(self): - created = datetime.date.isoformat(self.created) + + # Convert UTC database time to local time + created = datetime.date.isoformat(timezone.localdate(self.created)) if self.correspondent and self.title: return f"{created} {self.correspondent} {self.title}" diff --git a/src/documents/tests/test_document_model.py b/src/documents/tests/test_document_model.py index 41e3d9337..c456a4bb7 100644 --- a/src/documents/tests/test_document_model.py +++ b/src/documents/tests/test_document_model.py @@ -56,26 +56,35 @@ class TestDocument(TestCase): doc = Document( mime_type="application/pdf", title="test", - created=timezone.datetime(2020, 12, 25), + created=timezone.datetime(2020, 12, 25, tzinfo=zoneinfo.ZoneInfo("UTC")), ) self.assertEqual(doc.get_public_filename(), "2020-12-25 test.pdf") + @override_settings( + TIME_ZONE="Europe/Berlin", + ) def test_file_name_with_timezone(self): + # See https://docs.djangoproject.com/en/4.0/ref/utils/#django.utils.timezone.now + # The default for created is an aware datetime in UTC + # This does that, just manually, with a fixed date + local_create_date = timezone.datetime( + 2020, + 12, + 25, + tzinfo=zoneinfo.ZoneInfo("Europe/Berlin"), + ) + + utc_create_date = local_create_date.astimezone(zoneinfo.ZoneInfo("UTC")) + + self.assertEqual(utc_create_date.date().day, 24) + doc = Document( mime_type="application/pdf", title="test", - created=timezone.datetime( - 2020, - 12, - 25, - 0, - 0, - 0, - 0, - zoneinfo.ZoneInfo("Europe/Berlin"), - ), + created=utc_create_date, ) + self.assertEqual(doc.get_public_filename(), "2020-12-25 test.pdf") def test_file_name_jpg(self): @@ -83,7 +92,7 @@ class TestDocument(TestCase): doc = Document( mime_type="image/jpeg", title="test", - created=timezone.datetime(2020, 12, 25), + created=timezone.datetime(2020, 12, 25, tzinfo=zoneinfo.ZoneInfo("UTC")), ) self.assertEqual(doc.get_public_filename(), "2020-12-25 test.jpg") @@ -92,7 +101,7 @@ class TestDocument(TestCase): doc = Document( mime_type="application/zip", title="test", - created=timezone.datetime(2020, 12, 25), + created=timezone.datetime(2020, 12, 25, tzinfo=zoneinfo.ZoneInfo("UTC")), ) self.assertEqual(doc.get_public_filename(), "2020-12-25 test.zip") @@ -101,6 +110,6 @@ class TestDocument(TestCase): doc = Document( mime_type="image/jpegasd", title="test", - created=timezone.datetime(2020, 12, 25), + created=timezone.datetime(2020, 12, 25, tzinfo=zoneinfo.ZoneInfo("UTC")), ) self.assertEqual(doc.get_public_filename(), "2020-12-25 test") From f5824f6056bf92560f12d2cad243929ce053ee71 Mon Sep 17 00:00:00 2001 From: Trenton Holmes <holmes.trenton@gmail.com> Date: Wed, 11 May 2022 10:50:05 -0700 Subject: [PATCH 036/291] Seperates out the library image building into a new, minimal workflow --- .github/workflows/ci.yml | 59 +--------- .github/workflows/installer-library.yml | 139 ++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 53 deletions(-) create mode 100644 .github/workflows/installer-library.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c17e2a210..ed2b264ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,6 +57,12 @@ jobs: name: Prepare Docker Pipeline Data if: github.event_name == 'push' && (startsWith(github.ref, 'refs/heads/feature-') || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/beta' || contains(github.ref, 'beta.rc') || startsWith(github.ref, 'refs/tags/v')) runs-on: ubuntu-20.04 + # If the push triggered the installer library workflow, wait for it to + # complete here. This ensures the required versions for the final + # image have been built, while not waiting at all if the versions haven't changed + concurrency: + group: build-installer-library + cancel-in-progress: false needs: - documentation - ci-backend @@ -117,55 +123,6 @@ jobs: jbig2enc-json: ${{ steps.jbig2enc-setup.outputs.jbig2enc-json}} - build-qpdf-debs: - name: qpdf - needs: - - prepare-docker-build - uses: ./.github/workflows/reusable-workflow-builder.yml - with: - dockerfile: ./docker-builders/Dockerfile.qpdf - build-json: ${{ needs.prepare-docker-build.outputs.qpdf-json }} - build-args: | - QPDF_VERSION=${{ fromJSON(needs.prepare-docker-build.outputs.qpdf-json).version }} - - build-jbig2enc: - name: jbig2enc - needs: - - prepare-docker-build - uses: ./.github/workflows/reusable-workflow-builder.yml - with: - dockerfile: ./docker-builders/Dockerfile.jbig2enc - build-json: ${{ needs.prepare-docker-build.outputs.jbig2enc-json }} - build-args: | - JBIG2ENC_VERSION=${{ fromJSON(needs.prepare-docker-build.outputs.jbig2enc-json).version }} - - build-psycopg2-wheel: - name: psycopg2 - needs: - - prepare-docker-build - uses: ./.github/workflows/reusable-workflow-builder.yml - with: - dockerfile: ./docker-builders/Dockerfile.psycopg2 - build-json: ${{ needs.prepare-docker-build.outputs.psycopg2-json }} - build-args: | - PSYCOPG2_GIT_TAG=${{ fromJSON(needs.prepare-docker-build.outputs.psycopg2-json).git_tag }} - PSYCOPG2_VERSION=${{ fromJSON(needs.prepare-docker-build.outputs.psycopg2-json).version }} - - build-pikepdf-wheel: - name: pikepdf - needs: - - prepare-docker-build - - build-qpdf-debs - uses: ./.github/workflows/reusable-workflow-builder.yml - with: - dockerfile: ./docker-builders/Dockerfile.pikepdf - build-json: ${{ needs.prepare-docker-build.outputs.pikepdf-json }} - build-args: | - REPO=${{ github.repository }} - QPDF_VERSION=${{ fromJSON(needs.prepare-docker-build.outputs.qpdf-json).version }} - PIKEPDF_GIT_TAG=${{ fromJSON(needs.prepare-docker-build.outputs.pikepdf-json).git_tag }} - PIKEPDF_VERSION=${{ fromJSON(needs.prepare-docker-build.outputs.pikepdf-json).version }} - # build and push image to docker hub. build-docker-image: runs-on: ubuntu-20.04 @@ -174,10 +131,6 @@ jobs: cancel-in-progress: true needs: - prepare-docker-build - - build-psycopg2-wheel - - build-jbig2enc - - build-qpdf-debs - - build-pikepdf-wheel steps: - name: Check pushing to Docker Hub diff --git a/.github/workflows/installer-library.yml b/.github/workflows/installer-library.yml new file mode 100644 index 000000000..31e08638e --- /dev/null +++ b/.github/workflows/installer-library.yml @@ -0,0 +1,139 @@ +# This workflow will run to update the installer library of +# Docker images. These are the images which provide updated wheels +# .deb installation packages or maybe just some compiled library + +name: Build Image Library + +on: + push: + # Must match one of these branches AND one of the paths + # to be triggered + branches: + - "main" + - "dev" + - "library-*" + - "feature-*" + paths: + # Trigger the workflow if a Dockerfile changed + - "docker-builders/**" + # Trigger if a package was updated + - ".build-config.json" + - "Pipfile.lock" + # Also trigger on workflow changes (such as this file) + - ".github/workflows/**" + +# Set a workflow level concurrency group so primary workflow +# can wait for this to complete if needed +# DO NOT CHANGE without updating main workflow group +concurrency: + group: build-installer-library + cancel-in-progress: false + +jobs: + prepare-docker-build: + name: Prepare Docker Image Version Data + runs-on: ubuntu-20.04 + steps: + - + name: Checkout + uses: actions/checkout@v3 + - + name: Set up Python + uses: actions/setup-python@v3 + with: + python-version: "3.9" + - + name: Setup qpdf image + id: qpdf-setup + run: | + build_json=$(python ${GITHUB_WORKSPACE}/.github/scripts/get-build-json.py qpdf) + + echo ${build_json} + + echo ::set-output name=qpdf-json::${build_json} + - + name: Setup psycopg2 image + id: psycopg2-setup + run: | + build_json=$(python ${GITHUB_WORKSPACE}/.github/scripts/get-build-json.py psycopg2) + + echo ${build_json} + + echo ::set-output name=psycopg2-json::${build_json} + - + name: Setup pikepdf image + id: pikepdf-setup + run: | + build_json=$(python ${GITHUB_WORKSPACE}/.github/scripts/get-build-json.py pikepdf) + + echo ${build_json} + + echo ::set-output name=pikepdf-json::${build_json} + - + name: Setup jbig2enc image + id: jbig2enc-setup + run: | + build_json=$(python ${GITHUB_WORKSPACE}/.github/scripts/get-build-json.py jbig2enc) + + echo ${build_json} + + echo ::set-output name=jbig2enc-json::${build_json} + + outputs: + + qpdf-json: ${{ steps.qpdf-setup.outputs.qpdf-json }} + + pikepdf-json: ${{ steps.pikepdf-setup.outputs.pikepdf-json }} + + psycopg2-json: ${{ steps.psycopg2-setup.outputs.psycopg2-json }} + + jbig2enc-json: ${{ steps.jbig2enc-setup.outputs.jbig2enc-json}} + + build-qpdf-debs: + name: qpdf + needs: + - prepare-docker-build + uses: ./.github/workflows/reusable-workflow-builder.yml + with: + dockerfile: ./docker-builders/Dockerfile.qpdf + build-json: ${{ needs.prepare-docker-build.outputs.qpdf-json }} + build-args: | + QPDF_VERSION=${{ fromJSON(needs.prepare-docker-build.outputs.qpdf-json).version }} + + build-jbig2enc: + name: jbig2enc + needs: + - prepare-docker-build + uses: ./.github/workflows/reusable-workflow-builder.yml + with: + dockerfile: ./docker-builders/Dockerfile.jbig2enc + build-json: ${{ needs.prepare-docker-build.outputs.jbig2enc-json }} + build-args: | + JBIG2ENC_VERSION=${{ fromJSON(needs.prepare-docker-build.outputs.jbig2enc-json).version }} + + build-psycopg2-wheel: + name: psycopg2 + needs: + - prepare-docker-build + uses: ./.github/workflows/reusable-workflow-builder.yml + with: + dockerfile: ./docker-builders/Dockerfile.psycopg2 + build-json: ${{ needs.prepare-docker-build.outputs.psycopg2-json }} + build-args: | + PSYCOPG2_GIT_TAG=${{ fromJSON(needs.prepare-docker-build.outputs.psycopg2-json).git_tag }} + PSYCOPG2_VERSION=${{ fromJSON(needs.prepare-docker-build.outputs.psycopg2-json).version }} + + build-pikepdf-wheel: + name: pikepdf + needs: + - prepare-docker-build + - build-qpdf-debs + uses: ./.github/workflows/reusable-workflow-builder.yml + with: + dockerfile: ./docker-builders/Dockerfile.pikepdf + build-json: ${{ needs.prepare-docker-build.outputs.pikepdf-json }} + build-args: | + REPO=${{ github.repository }} + QPDF_VERSION=${{ fromJSON(needs.prepare-docker-build.outputs.qpdf-json).version }} + PIKEPDF_GIT_TAG=${{ fromJSON(needs.prepare-docker-build.outputs.pikepdf-json).git_tag }} + PIKEPDF_VERSION=${{ fromJSON(needs.prepare-docker-build.outputs.pikepdf-json).version }} From 70b9a9bbd3bbf41132cf8d5789e69e2e87ce535b Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 13 May 2022 11:52:05 -0700 Subject: [PATCH 037/291] Update date.ts [ci skip] --- src-ui/src/app/utils/date.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/utils/date.ts b/src-ui/src/app/utils/date.ts index de5a89542..b62ffc939 100644 --- a/src-ui/src/app/utils/date.ts +++ b/src-ui/src/app/utils/date.ts @@ -1,5 +1,5 @@ // see https://github.com/dateutil/dateutil/issues/878 , JS Date does not // seem to accept these strings as valid dates so we must normalize offset export function normalizeDateStr(dateStr: string): string { - return dateStr.replace(/-(\d\d):\d\d:\d\d/gm, `-$1:00`) + return dateStr.replace(/[\+-](\d\d):\d\d:\d\d/gm, `-$1:00`) } From 0ddb073e9bf6f4f2b24485bfb29cde4d7e3edc66 Mon Sep 17 00:00:00 2001 From: "Paperless-ngx Translation Bot [bot]" <99855517+paperless-l10n@users.noreply.github.com> Date: Fri, 13 May 2022 20:34:51 -0700 Subject: [PATCH 038/291] New Crowdin updates (#911) * New translations messages.xlf (French) [ci skip] * New translations messages.xlf (Slovenian) [ci skip] * New translations messages.xlf (Polish) [ci skip] * New translations messages.xlf (Italian) [ci skip] * New translations messages.xlf (Luxembourgish) [ci skip] * New translations messages.xlf (Portuguese, Brazilian) [ci skip] * New translations messages.xlf (Chinese Simplified) [ci skip] * New translations messages.xlf (Turkish) [ci skip] * New translations messages.xlf (Swedish) [ci skip] * New translations messages.xlf (Slovenian) [ci skip] * New translations messages.xlf (Slovak) [ci skip] * New translations messages.xlf (Portuguese) [ci skip] * New translations messages.xlf (Dutch) [ci skip] * New translations messages.xlf (Hebrew) [ci skip] * New translations messages.xlf (Danish) [ci skip] * New translations messages.xlf (Finnish) [ci skip] * New translations messages.xlf (Greek) [ci skip] * New translations messages.xlf (German) [ci skip] * New translations messages.xlf (Czech) [ci skip] * New translations messages.xlf (Belarusian) [ci skip] * New translations messages.xlf (Spanish) [ci skip] * New translations messages.xlf (Romanian) [ci skip] * New translations messages.xlf (Russian) [ci skip] * New translations messages.xlf (French) [ci skip] * New translations messages.xlf (Serbian (Latin)) [ci skip] * New translations messages.xlf (Arabic, Saudi Arabia) [ci skip] * New translations django.po (Polish) [ci skip] * New translations django.po (Serbian (Latin)) [ci skip] * New translations messages.xlf (Polish) [ci skip] * New translations messages.xlf (Italian) [ci skip] * New translations messages.xlf (Luxembourgish) [ci skip] * New translations messages.xlf (Portuguese, Brazilian) [ci skip] * New translations messages.xlf (Chinese Simplified) [ci skip] * New translations messages.xlf (Turkish) [ci skip] * New translations messages.xlf (Swedish) [ci skip] * New translations messages.xlf (Slovenian) [ci skip] * New translations messages.xlf (Slovak) [ci skip] * New translations messages.xlf (Portuguese) [ci skip] * New translations messages.xlf (Dutch) [ci skip] * New translations messages.xlf (Hebrew) [ci skip] * New translations messages.xlf (Danish) [ci skip] * New translations messages.xlf (Finnish) [ci skip] * New translations messages.xlf (Greek) [ci skip] * New translations messages.xlf (German) [ci skip] * New translations messages.xlf (Czech) [ci skip] * New translations messages.xlf (Belarusian) [ci skip] * New translations messages.xlf (Spanish) [ci skip] * New translations messages.xlf (Romanian) [ci skip] * New translations messages.xlf (Russian) [ci skip] * New translations messages.xlf (French) [ci skip] * New translations messages.xlf (Serbian (Latin)) [ci skip] * New translations messages.xlf (Arabic, Saudi Arabia) [ci skip] * New translations messages.xlf (Polish) [ci skip] * New translations messages.xlf (Italian) [ci skip] * New translations messages.xlf (Luxembourgish) [ci skip] * New translations messages.xlf (Portuguese, Brazilian) [ci skip] * New translations messages.xlf (Chinese Simplified) [ci skip] * New translations messages.xlf (Turkish) [ci skip] * New translations messages.xlf (Swedish) [ci skip] * New translations messages.xlf (Slovenian) [ci skip] * New translations messages.xlf (Slovak) [ci skip] * New translations messages.xlf (Portuguese) [ci skip] * New translations messages.xlf (Dutch) [ci skip] * New translations messages.xlf (Hebrew) [ci skip] * New translations messages.xlf (Danish) [ci skip] * New translations messages.xlf (Finnish) [ci skip] * New translations messages.xlf (Greek) [ci skip] * New translations messages.xlf (German) [ci skip] * New translations messages.xlf (Czech) [ci skip] * New translations messages.xlf (Belarusian) [ci skip] * New translations messages.xlf (Spanish) [ci skip] * New translations messages.xlf (Romanian) [ci skip] * New translations messages.xlf (Russian) [ci skip] * New translations messages.xlf (French) [ci skip] * New translations messages.xlf (Serbian (Latin)) [ci skip] * New translations messages.xlf (Arabic, Saudi Arabia) [ci skip] Co-authored-by: Michael Shamoon <4887959+shamoon@users.noreply.github.com> --- src-ui/src/locale/messages.ar_SA.xlf | 258 +++++++++++------- src-ui/src/locale/messages.be_BY.xlf | 258 +++++++++++------- src-ui/src/locale/messages.cs_CZ.xlf | 258 +++++++++++------- src-ui/src/locale/messages.da_DK.xlf | 258 +++++++++++------- src-ui/src/locale/messages.de_DE.xlf | 258 +++++++++++------- src-ui/src/locale/messages.el_GR.xlf | 258 +++++++++++------- src-ui/src/locale/messages.es_ES.xlf | 258 +++++++++++------- src-ui/src/locale/messages.fi_FI.xlf | 258 +++++++++++------- src-ui/src/locale/messages.fr_FR.xlf | 284 ++++++++++++-------- src-ui/src/locale/messages.he_IL.xlf | 258 +++++++++++------- src-ui/src/locale/messages.it_IT.xlf | 258 +++++++++++------- src-ui/src/locale/messages.lb_LU.xlf | 258 +++++++++++------- src-ui/src/locale/messages.nl_NL.xlf | 258 +++++++++++------- src-ui/src/locale/messages.pl_PL.xlf | 258 +++++++++++------- src-ui/src/locale/messages.pt_BR.xlf | 258 +++++++++++------- src-ui/src/locale/messages.pt_PT.xlf | 258 +++++++++++------- src-ui/src/locale/messages.ro_RO.xlf | 258 +++++++++++------- src-ui/src/locale/messages.ru_RU.xlf | 258 +++++++++++------- src-ui/src/locale/messages.sk_SK.xlf | 258 +++++++++++------- src-ui/src/locale/messages.sl_SI.xlf | 358 +++++++++++++++---------- src-ui/src/locale/messages.sr_CS.xlf | 258 +++++++++++------- src-ui/src/locale/messages.sv_SE.xlf | 258 +++++++++++------- src-ui/src/locale/messages.tr_TR.xlf | 258 +++++++++++------- src-ui/src/locale/messages.zh_CN.xlf | 258 +++++++++++------- src/locale/pl_PL/LC_MESSAGES/django.po | 4 +- src/locale/sr_CS/LC_MESSAGES/django.po | 2 +- 26 files changed, 4026 insertions(+), 2298 deletions(-) diff --git a/src-ui/src/locale/messages.ar_SA.xlf b/src-ui/src/locale/messages.ar_SA.xlf index 636805b95..d98d84797 100644 --- a/src-ui/src/locale/messages.ar_SA.xlf +++ b/src-ui/src/locale/messages.ar_SA.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="final">فتح مستندات</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="final">إغلاق الكل</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="final">إدارة</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="needs-translation">Correspondents</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="final">علامات</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">أنواع المستندات</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">المسئول</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="final">معلومات</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="final">الوثائق</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="needs-translation">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="final">اقترح فكرة</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">is available.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">Click to view.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Checking for updates is disabled.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Click for more information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="needs-translation">Update available</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="final">لون</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="final">تحديد</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="final">الرجاء تحديد كائن</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="needs-translation">Loading...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="needs-translation">Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="needs-translation">Welcome to Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="final">تأكيد الحذف</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="final">هل تريد حقاً حذف المستند "<x id="PH" equiv-text="this.document.title"/>"؟</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="final">ستحذف ملفات هذا المستند بشكل دائم. لا يمكن التراجع عن هذه العملية.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="final">حذف مستند</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="final">حدث خطأ أثناء حذف الوثيقة: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="needs-translation">Filter tags</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="needs-translation">Filter correspondents</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="needs-translation">Filter document types</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="needs-translation">View</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="needs-translation">Score:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="final">بدون تحديد</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="final">تحديد صفحة</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="final">تحديد الكل</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="final">ترتيب</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="final">طرق عرض</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="needs-translation">Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">حفظ باسم...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="needs-translation">Loading...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="needs-translation">{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="needs-translation">{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">(مصفاة)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="needs-translation">Error while loading documents</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="needs-translation">View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="needs-translation">View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="needs-translation">Reset filters</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="needs-translation">Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">بدون مراسل</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="final">بدون نوع المستند</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="final">بدون أي علامة</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="needs-translation">Title: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="needs-translation">ASN: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="needs-translation">Title & content</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="needs-translation">Advanced search</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">More like</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="needs-translation">correspondent</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="needs-translation">Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="needs-translation">document type</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html" approved="yes"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">هل ترغب حقاً في حذف نوع المستند "<x id="PH" equiv-text="object.name"/>"؟</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="needs-translation">Associated documents will not be deleted.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html" approved="yes"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="final">هل ترغب حقاً في حذف العلامة "<x id="PH" equiv-text="object.name"/>"؟</target> </trans-unit> diff --git a/src-ui/src/locale/messages.be_BY.xlf b/src-ui/src/locale/messages.be_BY.xlf index 797c94873..573fb3585 100644 --- a/src-ui/src/locale/messages.be_BY.xlf +++ b/src-ui/src/locale/messages.be_BY.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="translated">Адкрыць дакументы</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="translated">Закрыць усё</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="translated">Кіраванне</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="translated">Карэспандэнты</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="translated">Тэгі</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="translated">Тыпы дакументаў</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="translated">Кіраўнік</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="translated">Інфармацыя</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="translated">Дакументацыя</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="translated">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="translated">Прапанаваць ідэю</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">is available.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">Click to view.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Checking for updates is disabled.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Click for more information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="needs-translation">Update available</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="translated">Колер</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="translated">Выбраць</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="translated">Калі ласка, абярыце аб'ект</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="translated">Загрузка...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="translated">Прывітанне, <x id="PH" equiv-text="this.displayName"/>, запрашаем у Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="translated">Вітаем у Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="translated">Пацвердзіце выдаленне</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="translated">Вы сапраўды хочаце выдаліць дакумент "<x id="PH" equiv-text="this.document.title"/>"?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="translated">Файлы для гэтага дакумента будуць выдалены назаўсёды. Гэтую аперацыю нельга адмяніць.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="translated">Выдаліць дакумент</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="translated">Памылка выдалення дакумента: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="translated">Фільтраваць тэгі</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="translated">Фільтр карэспандэнтаў</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="translated">Фільтр тыпаў дакументаў</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="translated">Прагляд</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="translated">Адзнака:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="translated">Нічога не выбіраць</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="translated">Выбраць старонку</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="translated">Выбраць усё</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="translated">Сартаваць</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="translated">Прагляды</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="translated">Захаваць "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="translated">Захаваць як...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="translated">Загрузка...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="translated">{VAR_PLURAL, plural, =1 {Выдзелена дакументаў: <x id="INTERPOLATION"/> з 1} other {Выдзелена дакументаў: <x id="INTERPOLATION"/> з <x id="INTERPOLATION_1"/>}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="translated">{VAR_PLURAL, plural, =1 {Адзін дакумент} other {<x id="INTERPOLATION"/> дакумента(аў)}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="translated">(адфільтравана)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="needs-translation">Error while loading documents</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="translated">Прагляд "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" паспяхова захаваны.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="translated">Прагляд "<x id="PH" equiv-text="savedView.name"/>" створаны паспяхова.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="translated">Скінуць фільтры</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="needs-translation">Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="translated">Без карэспандэнта</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="translated">Без тыпу дакумента</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="translated">Без усялякага тэга</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="translated">Назва: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="translated">ASN: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="translated">Назва & змест</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="translated">Пашыраны пошук</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="translated">Больш падобных</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="needs-translation">correspondent</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="translated">Вы сапраўды хочаце выдаліць карэспандэнта "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="needs-translation">document type</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="translated">Вы сапраўды хочаце выдаліць тып дакумента "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="translated">Звязаныя дакументы не будуць выдалены.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="translated">Вы сапраўды хочаце выдаліць тэг "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.cs_CZ.xlf b/src-ui/src/locale/messages.cs_CZ.xlf index 986aef48a..41ee8882f 100644 --- a/src-ui/src/locale/messages.cs_CZ.xlf +++ b/src-ui/src/locale/messages.cs_CZ.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="final">Otevřené dokumenty</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="final">Zavřít vše</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="final">Spravovat</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="final">Korespondenti</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="final">Štítky</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Typy dokumentu</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="needs-translation">Admin</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="final">Informace</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="final">Dokumentace</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="needs-translation">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="final">Navrhnout úpravu</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">is available.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">Click to view.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Checking for updates is disabled.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Click for more information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="needs-translation">Update available</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="final">Barva</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="final">Vybrat</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="final">Vyberte prosím objekt</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="needs-translation">Loading...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="needs-translation">Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="needs-translation">Welcome to Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="final">Potvrdit smazání</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="final">Opravdu chcete smazat dokument "<x id="PH" equiv-text="this.document.title"/>"?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="final">Soubory tohoto dokumentu budou trvale smazány. Tuto operaci nelze vrátit zpět.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="final">Smazat dokument</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="final">Chyba při mazání dokumentu: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="final">Filtrovat štítky</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="final">Filtrovat korespondenty</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Filtrovat typy dokumentů</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="final">Zobrazení</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="final">Shoda:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="final">Zrušit výběr</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="final">Vybrat stránku</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="final">Vybrat vše</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="final">Řazení</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="final">Pohledy</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="final">Uložit "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Uložit jako...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="needs-translation">Loading...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html" approved="yes"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="final">{VAR_PLURAL, plural, one {} few {Vybráno <x id="INTERPOLATION"/> z <x id="INTERPOLATION_1"/> dokumentů} many {Vybráno <x id="INTERPOLATION"/> z <x id="INTERPOLATION_1"/> dokumentů} =1 {Vybráno <x id="INTERPOLATION"/> z <x id="INTERPOLATION_1"/> dokumentu} other {Vybráno <x id="INTERPOLATION"/> z <x id="INTERPOLATION_1"/> dokumentů}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">{VAR_PLURAL, plural, one {} few {<x id="INTERPOLATION"/> dokumenty} many {<x id="INTERPOLATION"/> dokument} =1 {dokument} other {<x id="INTERPOLATION"/> dokumentů}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">(filtrováno)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="needs-translation">Error while loading documents</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="final">Zobrazení "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" bylo úspěšně uloženo.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="final">Zobrazení "<x id="PH" equiv-text="savedView.name"/>" bylo úspěšně vytvořeno.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="final">Zrušit filtry</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="needs-translation">Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Bez korespondenta</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="final">Bez typu dokumentu</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="final">Bez štítku</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="final">Název: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="needs-translation">ASN: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="final">Název & Obsah</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Pokročilé vyhledávání</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="final">Podobné</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html" approved="yes"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="needs-translation">correspondent</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="final">Opravdu chcete smazat korespondenta "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="needs-translation">document type</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html" approved="yes"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Opravdu chcete smazat typ dokumentu"<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html" approved="yes"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Přidružené dokumenty nebudou smazány.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html" approved="yes"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="final">Opravdu chcete odstranit štítek "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.da_DK.xlf b/src-ui/src/locale/messages.da_DK.xlf index 434ab9d1e..f64aad72d 100644 --- a/src-ui/src/locale/messages.da_DK.xlf +++ b/src-ui/src/locale/messages.da_DK.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="translated">Åbn dokumenter</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="translated">Luk alle</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="translated">Administrér</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="translated">Korrespondenter</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="translated">Etiketter</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="translated">Dokumenttyper</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="translated">Admin</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="translated">Info</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="translated">Dokumentation</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="translated">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="translated">Foreslå en idé</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="translated">er tilgængelig.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="translated">Klik for at se.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="translated">Kontrol af opdateringer, er deaktiveret.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="translated">Klik for mere information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="translated">Opdatering tilgængelig</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="translated">Farve</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="final">Vælg</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="final">Vælg venligst et objekt</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="translated">Indlæser...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="translated">Hej <x id="PH" equiv-text="this.displayName"/>, og velkommen til Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="translated">Velkommen til Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="final">Bekræft sletning</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="final">Er du sikker på, at du vil slette dokument "<x id="PH" equiv-text="this.document.title"/>"?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="final">Filerne for dette dokument vil blive slettet permanent. Denne handling kan ikke fortrydes.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="final">Slet dokument</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="final">Fejl ved sletning af dokument: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="translated">Filtrer etiketter</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="translated">Filtrer korrespondenter</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="translated">Filtrer dokumenttyper</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="translated">Vis</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="translated">Score:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="translated">Vælg ingen</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="translated">Vælg side</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="translated">Vælg alle</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="translated">Sortér</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="translated">Visninger</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="translated">Gem "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="translated">Gem som...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="translated">Indlæser...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="translated">{VAR_PLURAL, plural, =1 {Valgte <x id="INTERPOLATION"/> af et dokument} other {Valgte <x id="INTERPOLATION"/> af <x id="INTERPOLATION_1"/> dokumenter}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="translated">{VAR_PLURAL, plural, =1 {Et dokument} other {<x id="INTERPOLATION"/> dokumenter}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="translated">(filtreret)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="translated">Fejl ved indlæsning af dokumenter</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="final">Visning "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" er gemt.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="final">Visning "<x id="PH" equiv-text="savedView.name"/>" er oprettet.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="translated">Nulstil filtre</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="translated">Korrespondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Uden korrespondent</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="final">Uden dokumenttype</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="final">Uden nogen etiket</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="final">Titel: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="final">ASN: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="final">Titel & indhold</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Avanceret søgning</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="final">Mere som</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="translated">korrespondent</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="final">Er du sikker på, at du vil slette korrespondenten "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="translated">dokumenttype</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html" approved="yes"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Er du sikker på, at du vil slette dokumenttypen "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html" approved="yes"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="translated">Er du sikker på, at du vil slette etiketten "<x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Tilknyttede dokumenter vil ikke blive slettet.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html" approved="yes"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="final">Er du sikker på, at du vil slette etiketten "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.de_DE.xlf b/src-ui/src/locale/messages.de_DE.xlf index 69d60de5e..ca445e681 100644 --- a/src-ui/src/locale/messages.de_DE.xlf +++ b/src-ui/src/locale/messages.de_DE.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="final">Geöffnete Dokumente</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="final">Alle schließen</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="final">Verwalten</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="final">Korrespondenten</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="final">Tags</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Dokumenttypen</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Administration</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="translated">Info</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="final">Dokumentation</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="translated">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="final">Eine Idee vorschlagen</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="translated">ist verfügbar.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="translated">Zum Anzeigen klicken.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="translated">Nach Updates suchen deaktiviert.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="translated">Klick für mehr Information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="translated">Aktualisierung verfügbar</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="final">Farbe</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="final">Auswählen</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="final">Bitte wählen Sie ein Element aus</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="translated">Lädt...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="translated">Hallo <x id="PH" equiv-text="this.displayName"/>, Willkommen bei Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="translated">Willkommen bei Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="final">Löschen bestätigen</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="final">Möchten Sie das Dokument "<x id="PH" equiv-text="this.document.title"/>" wirklich löschen?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="final">Die Dateien dieses Dokuments werden permanent gelöscht. Diese Aktion kann nicht rückgängig gemacht werden.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="final">Dokument löschen</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="final">Fehler beim Löschen des Dokuments: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="final">Tags filtern</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="final">Korrespondenten filtern</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Dokumenttypen filtern</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="final">Anzeigen</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="final">Relevanz:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="final">Nichts auswählen</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="final">Seite auswählen</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="final">Alles auswählen</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="final">Sortieren</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="final">Ansicht</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="final">"<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>" speichern</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Speichern als...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="translated">Lädt...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html" approved="yes"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="final">{VAR_PLURAL, plural, =1 { <x id="INTERPOLATION"/> von 1 Dokumente ausgewählt} other {<x id="INTERPOLATION"/> von <x id="INTERPOLATION_1"/> Dokumente ausgewählt}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">{VAR_PLURAL, plural, =1 {Ein Dokument} other {<x id="INTERPOLATION"/> Dokumente}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">(gefiltert)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="translated">Fehler beim Laden des Dokuments</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="final">Ansicht "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" erfolgreich gespeichert.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="final">Ansicht "<x id="PH" equiv-text="savedView.name"/>" erfolgreich erstellt.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="final">Filter zurücksetzen</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="translated">Korrespondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Ohne Korrespondent</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="translated">Typ: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="final">Ohne Dokumenttyp</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="translated">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="final">Ohne Tag</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="final">Titel: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="translated">ASN: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="final">Titel & Inhalt</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Erweiterte Suche</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="final">Ähnlich zu</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html" approved="yes"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="translated">korrespondenten</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="translated">Zuletzt benutzt</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="final">Möchten Sie den Korrespondenten "<x id="PH" equiv-text="object.name"/>" wirklich löschen?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="translated">dokumenttypen</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html" approved="yes"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Möchten Sie den Dokumenttyp "<x id="PH" equiv-text="object.name"/>" wirklich löschen?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="translated">Dokumente filtern</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="translated">{VAR_PLURAL, plural, one {} =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> gesamt <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html" approved="yes"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="translated">Möchten Sie das Dokument "<x id="PH" equiv-text="this.typeName"/>" wirklich löschen?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Assoziierte Dokumente werden nicht gelöscht.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="translated">Fehler beim Löschen des Elements: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="translated">Tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html" approved="yes"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="final">Möchten Sie das Tag "<x id="PH" equiv-text="object.name"/>" wirklich löschen?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.el_GR.xlf b/src-ui/src/locale/messages.el_GR.xlf index c2cfaabba..c16e1d76c 100644 --- a/src-ui/src/locale/messages.el_GR.xlf +++ b/src-ui/src/locale/messages.el_GR.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="needs-translation">Open documents</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="needs-translation">Close all</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="needs-translation">Manage</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="needs-translation">Correspondents</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="needs-translation">Tags</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="needs-translation">Document types</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="needs-translation">Admin</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="needs-translation">Info</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="needs-translation">Documentation</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="needs-translation">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="needs-translation">Suggest an idea</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">is available.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">Click to view.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Checking for updates is disabled.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Click for more information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="needs-translation">Update available</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="needs-translation">Color</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="needs-translation">Select</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="needs-translation">Please select an object</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="needs-translation">Loading...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="needs-translation">Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="needs-translation">Welcome to Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="needs-translation">Confirm delete</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="needs-translation">Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="needs-translation">The files for this document will be deleted permanently. This operation cannot be undone.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="needs-translation">Delete document</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="needs-translation">Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="needs-translation">Filter tags</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="needs-translation">Filter correspondents</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="needs-translation">Filter document types</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="needs-translation">View</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="needs-translation">Score:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="needs-translation">Select none</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="needs-translation">Select page</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="needs-translation">Select all</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="needs-translation">Sort</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="needs-translation">Views</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="needs-translation">Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="needs-translation">Save as...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="needs-translation">Loading...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="needs-translation">{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="needs-translation">{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="needs-translation">(filtered)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="needs-translation">Error while loading documents</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="needs-translation">View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="needs-translation">View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="needs-translation">Reset filters</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="needs-translation">Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="needs-translation">Without correspondent</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="needs-translation">Without document type</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="needs-translation">Without any tag</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="needs-translation">Title: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="needs-translation">ASN: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="needs-translation">Title & content</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="needs-translation">Advanced search</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">More like</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="needs-translation">correspondent</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="needs-translation">Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="needs-translation">document type</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="needs-translation">Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html" approved="yes"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="needs-translation">Associated documents will not be deleted.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="needs-translation">Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.es_ES.xlf b/src-ui/src/locale/messages.es_ES.xlf index 83ab3f845..8ecd1a92b 100644 --- a/src-ui/src/locale/messages.es_ES.xlf +++ b/src-ui/src/locale/messages.es_ES.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="final">Abrir documentos</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="final">Cerrar todos</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="final">Organizar</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="final">Interlocutores</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="final">Etiquetas</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Tipos de documento</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Administrar</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="final">Información</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="final">Documentación</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="translated">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="final">Sugerir una idea</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">is available.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">Click to view.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Checking for updates is disabled.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Click for more information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="needs-translation">Update available</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="translated">Color</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="final">Seleccionar</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="final">Por favor, selecciona un objeto</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="translated">Cargando...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="translated">Hola <x id="PH" equiv-text="this.displayName"/>, bienvenido a Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="translated">¡Bienvenido a Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="final">Confirmar borrado</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="final">¿Estás seguro de querer borrar el documento "<x id="PH" equiv-text="this.document.title"/>"?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="final">Los archivos para este documento serán borrados permanentemente. Esta operación no se puede deshacer.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="final">Borrar documento</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="final">Error borrando el documento: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="final">Filtrar etiquetas</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="final">Filtrar tipos de documento</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Filtrar tipos de documento</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="final">Vista</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="final">Puntuación:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="final">Seleccionar ninguno</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="final">Seleccionar página</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="final">Seleccionar todo</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="final">Ordenar</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="final">Vistas</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="final">Guardar "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Guardar como...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="translated">Cargando...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html" approved="yes"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="final">{VAR_PLURAL, plural, =1 {Seleccionado <x id="INTERPOLATION"/> de un documento} other {Seleccionados <x id="INTERPOLATION"/> de <x id="INTERPOLATION_1"/> documentos}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">{VAR_PLURAL, plural, =1 {Un documento} other {<x id="INTERPOLATION"/> documentos}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">(filtrado)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="needs-translation">Error while loading documents</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="final">Ver "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" guardado satisfactoriamente.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="final">Ver "<x id="PH" equiv-text="savedView.name"/>" creado satisfactoriamente.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="final">Quitar filtros</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="translated">Interlocutor: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Sin tipo de documento</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="final">Sin tipo de documento</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="final">Sin ninguna etiqueta</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="final">Título: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="final">NSA: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="final">Titulo y contenido</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Búsqueda avanzada</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="final">Más parecido</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html" approved="yes"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="translated">interlocutor</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="translated">Usado por última vez</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="final">¿Estás seguro de querer borrar el tipo de documento "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="needs-translation">document type</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html" approved="yes"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">¿Estás seguro de querer borrar el tipo de documento "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html" approved="yes"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Los documentos asociados no serán borrados.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html" approved="yes"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="final">¿Estás seguro de querer borrar la etiqueta "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.fi_FI.xlf b/src-ui/src/locale/messages.fi_FI.xlf index c5d430007..50bfb24f9 100644 --- a/src-ui/src/locale/messages.fi_FI.xlf +++ b/src-ui/src/locale/messages.fi_FI.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="needs-translation">Open documents</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="needs-translation">Close all</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="needs-translation">Manage</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="needs-translation">Correspondents</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="needs-translation">Tags</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="needs-translation">Document types</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="needs-translation">Admin</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="needs-translation">Info</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="needs-translation">Documentation</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="needs-translation">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="needs-translation">Suggest an idea</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">is available.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">Click to view.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Checking for updates is disabled.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Click for more information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="needs-translation">Update available</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="needs-translation">Color</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="needs-translation">Select</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="needs-translation">Please select an object</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="needs-translation">Loading...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="needs-translation">Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="needs-translation">Welcome to Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="needs-translation">Confirm delete</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="needs-translation">Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="needs-translation">The files for this document will be deleted permanently. This operation cannot be undone.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="needs-translation">Delete document</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="needs-translation">Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="needs-translation">Filter tags</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="needs-translation">Filter correspondents</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="needs-translation">Filter document types</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="needs-translation">View</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="needs-translation">Score:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="needs-translation">Select none</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="needs-translation">Select page</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="needs-translation">Select all</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="needs-translation">Sort</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="needs-translation">Views</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="needs-translation">Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="needs-translation">Save as...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="needs-translation">Loading...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="needs-translation">{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="needs-translation">{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="needs-translation">(filtered)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="needs-translation">Error while loading documents</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="needs-translation">View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="needs-translation">View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="needs-translation">Reset filters</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="needs-translation">Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="needs-translation">Without correspondent</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="needs-translation">Without document type</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="needs-translation">Without any tag</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="needs-translation">Title: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="needs-translation">ASN: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="needs-translation">Title & content</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="needs-translation">Advanced search</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">More like</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="needs-translation">correspondent</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="needs-translation">Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="needs-translation">document type</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="needs-translation">Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="needs-translation">Associated documents will not be deleted.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="needs-translation">Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.fr_FR.xlf b/src-ui/src/locale/messages.fr_FR.xlf index c3298fee5..688c2d4fa 100644 --- a/src-ui/src/locale/messages.fr_FR.xlf +++ b/src-ui/src/locale/messages.fr_FR.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="final">Documents ouverts</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="final">Fermer tout</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="final">Gestion</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="final">Correspondants</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="final">Étiquettes</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Types de document</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Administration</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="final">Information</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="translated">Documentation</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="translated">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="final">Suggérer une idée</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="translated">est disponible.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="translated">Cliquez pour voir.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="translated">La vérification des mises à jour est désactivée.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="translated">Cliquez pour plus d'informations.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="translated">Mise à jour disponible</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="final">Couleur</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="final">Sélectionner</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="final">Veuillez sélectionner un objet</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="translated">Chargement…</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="translated">Bonjour <x id="PH" equiv-text="this.displayName"/>, bienvenue dans Paperless-ngx !</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="translated">Bienvenue dans Paperless-ngx !</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="final">Confirmer la suppression</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="final">Voulez-vous vraiment supprimer le document "<x id="PH" equiv-text="this.document.title"/>" ?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="final">Les fichiers liés à ce document seront supprimés définitivement. Cette action est irréversible.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="final">Supprimer le document</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="final">Une erreur s'est produite lors de la suppression du document : <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="final">Filtrer les étiquettes</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="final">Filtrer les correspondants</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Filtrer les types de documents</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="final">Vue</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="final">Score :</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="final">Sélectionner aucun</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="final">Sélectionner la page</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="final">Sélectionner tout</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="final">Trier</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="final">Vues</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="final">Enregistrer "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Enregistrer sous...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="translated">Chargement…</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html" approved="yes"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="final">{VAR_PLURAL, plural, =1 {<x id="INTERPOLATION"/> document sélectionné sur 1} other {<x id="INTERPOLATION"/> documents sélectionnés sur <x id="INTERPOLATION_1"/>}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">{VAR_PLURAL, plural, =1 {Un document} other {<x id="INTERPOLATION"/> documents}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">(filtré)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="translated">Erreur lors du téléchargement du document</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="final">Vue "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" enregistrée avec succès.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="final">Vue "<x id="PH" equiv-text="savedView.name"/>" créée avec succès.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="final">Réinitialiser les filtres</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="translated">Correspondant : <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Sans correspondant</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="translated">Type : <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="final">Sans type de document</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="translated">Étiquette : <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="final">Sans étiquette</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="final">Titre : <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="final">NSA : <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="final">Titre & contenu</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Recherche avancée</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="final">Plus comme</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html" approved="yes"> <source>Save current view</source> <context-group purpose="location"> @@ -2253,7 +2301,7 @@ <context context-type="sourcefile">src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html</context> <context context-type="linenumber">12</context> </context-group> - <target state="needs-translation">Filter rules error occurred while saving this view</target> + <target state="translated">Une erreur de filtre est survenue lors de l'enregistrement de cette vue</target> </trans-unit> <trans-unit id="6438839705789707938" datatype="html"> <source>The error returned was</source> @@ -2271,11 +2319,19 @@ </context-group> <target state="translated">correspondant</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="translated">Dernière utilisation</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="final">Voulez-vous vraiment supprimer le correspondant "<x id="PH" equiv-text="object.name"/>" ?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="translated">Type de document</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html" approved="yes"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Voulez-vous vraiment supprimer le type de document "<x id="PH" equiv-text="object.name"/>" ?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="translated">Filtrer les documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html" approved="yes"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,15 +2499,15 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> - <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> + <target state="translated">Voulez-vous vraiment supprimer l'étiquette "<x id="PH" equiv-text="this.typeName"/>" ?</target> </trans-unit> <trans-unit id="8371896857609524947" datatype="html" approved="yes"> <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Les documents associés ne seront pas supprimés.</target> </trans-unit> @@ -2451,9 +2515,9 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> - <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> + <target state="translated">Une erreur s'est produite lors de la suppression de l'élément : <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> <trans-unit id="6439365426343089851" datatype="html"> <source>General</source> @@ -2461,7 +2525,7 @@ <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> <context context-type="linenumber">10</context> </context-group> - <target state="needs-translation">General</target> + <target state="translated">Général</target> </trans-unit> <trans-unit id="8671234314555525900" datatype="html" approved="yes"> <source>Appearance</source> @@ -2597,7 +2661,7 @@ <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> <context context-type="linenumber">105</context> </context-group> - <target state="needs-translation">Theme Color</target> + <target state="translated">Couleur du thème</target> </trans-unit> <trans-unit id="7808756054397155068" datatype="html"> <source>Reset</source> @@ -2605,7 +2669,7 @@ <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> <context context-type="linenumber">114</context> </context-group> - <target state="needs-translation">Reset</target> + <target state="translated">Réinitialiser</target> </trans-unit> <trans-unit id="8508424367627989968" datatype="html" approved="yes"> <source>Bulk editing</source> @@ -2749,7 +2813,7 @@ <context context-type="sourcefile">src/app/components/manage/settings/settings.component.ts</context> <context context-type="linenumber">264,266</context> </context-group> - <target state="needs-translation">Error while storing settings on server: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> + <target state="translated">Une erreur s'est produite lors de l'enregistrement des paramètres sur le serveur : <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> <trans-unit id="6402703264596649214" datatype="html"> <source>tag</source> @@ -2757,13 +2821,21 @@ <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> <context context-type="linenumber">30</context> </context-group> - <target state="needs-translation">tag</target> + <target state="translated">étiquette</target> + </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> </trans-unit> <trans-unit id="93754014749412887" datatype="html" approved="yes"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="final">Voulez-vous vraiment supprimer l'étiquette "<x id="PH" equiv-text="object.name"/>" ?</target> </trans-unit> @@ -3106,7 +3178,7 @@ <context context-type="sourcefile">src/app/services/settings.service.ts</context> <context context-type="linenumber">190</context> </context-group> - <target state="needs-translation">Belarusian</target> + <target state="translated">Biélorusse</target> </trans-unit> <trans-unit id="2719780722934172508" datatype="html"> <source>Czech</source> @@ -3226,7 +3298,7 @@ <context context-type="sourcefile">src/app/services/settings.service.ts</context> <context context-type="linenumber">280</context> </context-group> - <target state="needs-translation">Slovenian</target> + <target state="translated">Slovène</target> </trans-unit> <trans-unit id="8608389829607915090" datatype="html"> <source>Serbian</source> @@ -3234,7 +3306,7 @@ <context context-type="sourcefile">src/app/services/settings.service.ts</context> <context context-type="linenumber">286</context> </context-group> - <target state="needs-translation">Serbian</target> + <target state="translated">Serbe</target> </trans-unit> <trans-unit id="499386805970351976" datatype="html" approved="yes"> <source>Swedish</source> @@ -3250,7 +3322,7 @@ <context context-type="sourcefile">src/app/services/settings.service.ts</context> <context context-type="linenumber">298</context> </context-group> - <target state="needs-translation">Turkish</target> + <target state="translated">Turc</target> </trans-unit> <trans-unit id="4689443708886954687" datatype="html"> <source>Chinese Simplified</source> @@ -3258,7 +3330,7 @@ <context context-type="sourcefile">src/app/services/settings.service.ts</context> <context context-type="linenumber">304</context> </context-group> - <target state="needs-translation">Chinese Simplified</target> + <target state="translated">Chinois simplifié</target> </trans-unit> <trans-unit id="4912706592792948707" datatype="html" approved="yes"> <source>ISO 8601</source> diff --git a/src-ui/src/locale/messages.he_IL.xlf b/src-ui/src/locale/messages.he_IL.xlf index fdf554be7..329d1726f 100644 --- a/src-ui/src/locale/messages.he_IL.xlf +++ b/src-ui/src/locale/messages.he_IL.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="needs-translation">Open documents</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="final">סגור הכל</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="needs-translation">Manage</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="needs-translation">Correspondents</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="final">תגיות</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="needs-translation">Document types</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">מנהל</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="final">מידע</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="needs-translation">Documentation</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="needs-translation">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="needs-translation">Suggest an idea</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">is available.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">Click to view.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Checking for updates is disabled.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Click for more information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="needs-translation">Update available</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="needs-translation">Color</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="final">בחר</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="needs-translation">Please select an object</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="needs-translation">Loading...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="needs-translation">Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="needs-translation">Welcome to Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="needs-translation">Confirm delete</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="needs-translation">Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="needs-translation">The files for this document will be deleted permanently. This operation cannot be undone.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="needs-translation">Delete document</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="needs-translation">Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="needs-translation">Filter tags</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="needs-translation">Filter correspondents</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="needs-translation">Filter document types</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="needs-translation">View</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="needs-translation">Score:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="needs-translation">Select none</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="needs-translation">Select page</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="needs-translation">Select all</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="final">מיין</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="needs-translation">Views</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="needs-translation">Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">שמור כ...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="needs-translation">Loading...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="needs-translation">{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="needs-translation">{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="needs-translation">(filtered)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="needs-translation">Error while loading documents</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="needs-translation">View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="needs-translation">View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="needs-translation">Reset filters</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="needs-translation">Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="needs-translation">Without correspondent</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="needs-translation">Without document type</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="needs-translation">Without any tag</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="needs-translation">Title: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="needs-translation">ASN: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="needs-translation">Title & content</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="needs-translation">Advanced search</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">More like</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="needs-translation">correspondent</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="needs-translation">Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="needs-translation">document type</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="needs-translation">Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="needs-translation">Associated documents will not be deleted.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="needs-translation">Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.it_IT.xlf b/src-ui/src/locale/messages.it_IT.xlf index 42ddc7535..1101416f4 100644 --- a/src-ui/src/locale/messages.it_IT.xlf +++ b/src-ui/src/locale/messages.it_IT.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="final">Apri documenti</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="final">Chiudi tutti</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="final">Gestisci</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="final">Corrispondenti</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="final">Etichette</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Tipi di documento</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Amministratore</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="final">Informazioni</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="final">Documentazione</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="translated">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="final">Suggerisci un'idea</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="translated">è disponibile.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="translated">Clicca per visualizzare.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="translated">Il controllo degli aggiornamenti è disabilitato.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="translated">Clicca qui per maggiori informazioni.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="translated">Aggiornamento disponibile</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="final">Colore</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="final">Seleziona</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="final">Seleziona un elemento</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="translated">Caricamento in corso...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="translated">Ciao <x id="PH" equiv-text="this.displayName"/>, benvenuto su Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="translated">Benvenuto su Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="final">Conferma eliminazione</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="final">Vuoi eliminare il documento "<x id="PH" equiv-text="this.document.title"/>"?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="final">I file di questo documento saranno eliminati permanentemente. Questa operazione è irreversibile.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="final">Elimina documento</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="final">Errore nell'eliminazione del documento: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="final">Filtra tag</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="final">Filtra corrispondenti</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Filtra tipi di documento</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="final">Mostra</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="final">Rilevanza:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="final">Seleziona nessuno</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="final">Seleziona pagina</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="final">Seleziona tutti</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="final">Ordina</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="final">Viste</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="final">Salva "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Salva come...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="translated">Caricamento in corso...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html" approved="yes"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="final">{VAR_PLURAL, plural, =1 {Selezionato <x id="INTERPOLATION"/> di un documento} other {Selezionati <x id="INTERPOLATION"/> di <x id="INTERPOLATION_1"/> documenti}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">{VAR_PLURAL, plural, =1 {Un documento} other {<x id="INTERPOLATION"/> documenti}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">(filtrato)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="translated">Errore durante il caricamento dei documenti</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="final">La vista "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" è stata salvata.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="final">La vista "<x id="PH" equiv-text="savedView.name"/>" è stata creata.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="final">Ripristina filtri</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="needs-translation">Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Senza corrispondente</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="final">Senza tipo di documento</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="final">Senza alcun tag</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="final">Titolo: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="translated">ASN: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="final">Titolo & contenuto</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Ricerca avanzata</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="final">Più come</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html" approved="yes"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="translated">corrispondente</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="final">Vuoi eliminare il corrispondente "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="translated">tipo di documento</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html" approved="yes"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Vuoi eliminare il tipo di documento "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html" approved="yes"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">I documenti associati non verranno eliminati.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="translated">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html" approved="yes"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="final">Vuoi eliminare il tag "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.lb_LU.xlf b/src-ui/src/locale/messages.lb_LU.xlf index 9bd323cd2..b93e777ec 100644 --- a/src-ui/src/locale/messages.lb_LU.xlf +++ b/src-ui/src/locale/messages.lb_LU.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="final">Oppen Dokumenter</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="final">All zoumaachen</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="final">Verwalten</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="final">Korrespondenten</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="final">Etiketten</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Dokumententypen</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Administratioun</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="final">Informatiounen</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="final">Dokumentatioun</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="translated">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="final">Eng Iddi virschloen</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">is available.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">Click to view.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Checking for updates is disabled.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Click for more information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="needs-translation">Update available</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="final">Faarf</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="final">Auswielen</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="final">W. e. g. en Objet auswielen</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="translated">Lueden...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="translated">Moien <x id="PH" equiv-text="this.displayName"/>, Wëllkomm bei Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="translated">Wëllkomm bei Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="final">Läsche bestätegen</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="final">Wëllt Dir d'Dokument "<x id="PH" equiv-text="this.document.title"/>" wierklech läschen?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="final">D'Fichiere fir dëst Dokument gi permanent geläscht. Dës Operatioun kann net réckgängeg gemaach ginn.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="final">Dokument läschen</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="final">Feeler beim Läsche vum Dokument: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="final">Etikette filteren</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="final">Korrespondente filteren</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Dokumententype filteren</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="final">Usiicht</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="final">Relevanz:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="final">Näischt auswielen</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="final">Säit auswielen</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="final">Alles auswielen</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="final">Zortéieren</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="final">Usiichten</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="final">"<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>" späicheren</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Späicheren als...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="translated">Lueden...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html" approved="yes"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="final">{VAR_PLURAL, plural, =1 { <x id="INTERPOLATION"/> vun 1 Dokument ausgewählt} other {<x id="INTERPOLATION"/> vu(n) <x id="INTERPOLATION_1"/> Dokumenter ausgewielt}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">{VAR_PLURAL, plural, =1 {Een Dokument} other {<x id="INTERPOLATION"/> Dokumenter}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">(gefiltert)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="needs-translation">Error while loading documents</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="final">Usiicht "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" gouf erfollegräich gespäichert.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="final">Vue "<x id="PH" equiv-text="savedView.name"/>" gouf erfollegräich erstallt.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="final">Filteren zrécksetzen</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="needs-translation">Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Ouni Korrespondent</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="final">Ouni Dokumententyp</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="final">Ouni Etikett</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="final">Titel: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="final">ASN: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="final">Titel an Inhalt</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Erweidert Sich</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="final">Méi ähnleches</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html" approved="yes"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="needs-translation">correspondent</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="final">Soll de Korrespondent "<x id="PH" equiv-text="object.name"/>" wierklech geläscht ginn?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="needs-translation">document type</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html" approved="yes"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Soll den Dokumententyp "<x id="PH" equiv-text="object.name"/>" wierklech geläscht ginn?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html" approved="yes"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Assoziéiert Dokumenter ginn net geläscht.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html" approved="yes"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="final">Soll d'Etikett "<x id="PH" equiv-text="object.name"/>" wierklech geläscht ginn?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.nl_NL.xlf b/src-ui/src/locale/messages.nl_NL.xlf index 674b854bd..580f00514 100644 --- a/src-ui/src/locale/messages.nl_NL.xlf +++ b/src-ui/src/locale/messages.nl_NL.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="final">Open documenten</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="final">Alles sluiten</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="final">Beheren</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="final">Correspondenten</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="final">Labels</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Documenttypen</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Beheer</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="final">Informatie</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="final">Handleiding</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="translated">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="final">Ideeënbus</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">is available.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">Click to view.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Checking for updates is disabled.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Click for more information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="needs-translation">Update available</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="final">Kleur</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="final">Selecteer</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="final">Selecteer een object</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="translated">Laden...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="translated">Hallo <x id="PH" equiv-text="this.displayName"/>, welkom bij Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="translated">Welkom bij Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="final">Bevestig het verwijderen</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="final">Wilt u het document echt verwijderen "<x id="PH" equiv-text="this.document.title"/>"?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="final">De bestanden voor dit document worden definitief verwijderd. Deze bewerking kan niet ongedaan worden gemaakt.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="final">Verwijder document</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="final">Fout bij het verwijderen van het document: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="final">Labels filteren</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="final">Correspondenten filteren</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Documenttypes filteren</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="final">Bekijken</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="translated">Score:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="final">Niets selecteren</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="final">Selecteer pagina</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="final">Alles selecteren</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="final">Sorteren</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="final">Weergaven</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="final">Opslaan "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Opslaan als...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="translated">Laden...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html" approved="yes"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="final">{VAR_PLURAL, plural, =1 {<x id="INTERPOLATION"/> van één document geselecteerd} other {<x id="INTERPOLATION"/> van <x id="INTERPOLATION_1"/> documenten geselecteerd}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">{VAR_PLURAL, plural, =1 {Eén document} other {<x id="INTERPOLATION"/> documenten}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">(gefilterd)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="needs-translation">Error while loading documents</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="final">View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" met succes opgeslagen.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="final">View "<x id="PH" equiv-text="savedView.name"/>" met succes gemaakt.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="final">Filters terug zetten</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="needs-translation">Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Zonder correspondent</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="final">Zonder documenttype</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="final">Zonder label</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="final">Titel: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="final">ASN: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="final">Titel en inhoud</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Geavanceerd zoeken</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="final">Meer zoals</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html" approved="yes"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="needs-translation">correspondent</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="final">Bent u zeker dat u correspondent "<x id="PH" equiv-text="object.name"/>" wilt verwijderen?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="needs-translation">document type</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html" approved="yes"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Wilt u het documenttype echt verwijderen "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html" approved="yes"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Gekoppelde documenten zullen niet worden verwijderd.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html" approved="yes"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="final">Wil je dit label echt verwijderen "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.pl_PL.xlf b/src-ui/src/locale/messages.pl_PL.xlf index c433d0da6..c46136957 100644 --- a/src-ui/src/locale/messages.pl_PL.xlf +++ b/src-ui/src/locale/messages.pl_PL.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="final">Otwarte dokumenty</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="final">Zamknij wszystkie</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="final">Zarządzaj</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="final">Nadawcy</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="final">Tagi</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Typy dokumentów</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="translated">Administracja</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="translated">Informacje</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="final">Dokumentacja</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="translated">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="final">Zaproponuj pomysł</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">is available.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">Click to view.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Checking for updates is disabled.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Click for more information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="needs-translation">Update available</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="final">Kolor</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="final">Wybierz</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="final">Wybierz obiekt</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="translated">Wczytywanie...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="translated">Cześć <x id="PH" equiv-text="this.displayName"/>, witaj w Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="translated">Witaj w Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="final">Potwierdź usunięcie</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="final">Czy na pewno chcesz usunąć dokument"<x id="PH" equiv-text="this.document.title"/>"?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="final">Pliki tego dokumentu zostaną trwale usunięte. Tej operacji nie można cofnąć.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="final">Usuń dokument</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="final">Błąd podczas usuwania dokumentu: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="final">Filtruj tagi</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="final">Filtruj nadawców</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Filtruj typy dokumentów</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="final">Pokaż</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="final">Wynik:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="final">Odznacz wszystko</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="final">Zaznacz wszystko na tej stronie</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="final">Zaznacz wszystko</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="final">Sortowanie</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="final">Widoki</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="final">Zapisz "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Zapisz jako...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="translated">Wczytywanie...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html" approved="yes"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="final">{VAR_PLURAL, plural, one {} few {Wybrano <x id="INTERPOLATION"/> z <x id="INTERPOLATION_1"/> dokumentów} many {Wybrano <x id="INTERPOLATION"/> z <x id="INTERPOLATION_1"/> dokumentów} =1 {Wybrano <x id="INTERPOLATION"/> z jednego dokumentu} other {Wybrano <x id="INTERPOLATION"/> z <x id="INTERPOLATION_1"/> dokumentów}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">{VAR_PLURAL, plural, one {} few {<x id="INTERPOLATION"/> dokumenty} many {<x id="INTERPOLATION"/> dokumentów} =1 {Jeden dokument} other {<x id="INTERPOLATION"/> dokumenty}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">Filtrowane</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="needs-translation">Error while loading documents</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="final">Widok "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" został zapisany.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="final">Widok "<x id="PH" equiv-text="savedView.name"/>" został utworzony pomyślnie.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="final">Zresetuj filtry</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="needs-translation">Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Bez nadawcy</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="final">Bez typu dokumentu</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="final">Bez żadnego tagu</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="final">Tytuł: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="final">Numer archiwum: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="final">Tytuł & treść</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Wyszukiwanie zaawansowane</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="final">Podobne do</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html" approved="yes"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="needs-translation">correspondent</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="final">Czy na pewno chcesz usunąć nadawcę <x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="needs-translation">document type</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html" approved="yes"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Czy na pewno chcesz usunąć typ dokumentu "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html" approved="yes"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Powiązane dokumenty nie będą usunięte.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html" approved="yes"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="final">Czy na pewno chcesz usunąć tag <x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.pt_BR.xlf b/src-ui/src/locale/messages.pt_BR.xlf index 92d8bdabc..c1efb8aab 100644 --- a/src-ui/src/locale/messages.pt_BR.xlf +++ b/src-ui/src/locale/messages.pt_BR.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="final">Abrir documentos</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="final">Fechar todos</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="final">Gerenciar</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="final">Correspondentes</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="final">Etiquetas</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Tipos de documento</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="translated">Admin</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="final">Informação</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="final">Documentação</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="translated">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="final">Sugerir uma idéia</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">is available.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">Click to view.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Checking for updates is disabled.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Click for more information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="needs-translation">Update available</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="final">Cor</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="final">Selecione</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="final">Por favor selecione um objeto</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="translated">Carregando...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="translated">Olá <x id="PH" equiv-text="this.displayName"/>, bem-vindo ao Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="translated">Bem-vindo ao Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="final">Confirmar exclusão</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="final">Você realmente deseja excluir o documento "<x id="PH" equiv-text="this.document.title"/>"?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="final">Os arquivos desse documento serão excluídos permanentemente. Essa operação não pode ser revertida.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="final">Excluir documento</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="final">Erro ao excluir documento: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="final">Filtrar etiquetas</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="final">Filtrar correspondentes</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Filtrar tipos de documento</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="final">Ver</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="final">Nota:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="final">Selecionar nenhum</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="final">Selecionar página</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="final">Selecionar todos</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="final">Ordenar</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="final">Visualizações</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="final">Salvar "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Salvar como...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="translated">Carregando...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html" approved="yes"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="final">{VAR_PLURAL, plural, =1 {Selecionado <x id="INTERPOLATION"/> de um documento} other {Selecionado <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documentos}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">{VAR_PLURAL, plural, =1 {Um documento} other {<x id="INTERPOLATION"/> documentos}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">(filtrado)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="needs-translation">Error while loading documents</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="final">Visualização "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" salva com sucesso.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="final">Visualização "<x id="PH" equiv-text="savedView.name"/>" criada com sucesso.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="final">Limpar filtros</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="needs-translation">Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Sem correspondente</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="final">Sem tipo de documento</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="final">Sem etiquetas</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="final">Título: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="translated">NSA: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="final">Título & conteúdo</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Pesquisa avançada</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="translated">Mais parecido</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html" approved="yes"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="needs-translation">correspondent</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="final">Você realmente deseja excluir o correspondente "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="needs-translation">document type</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html" approved="yes"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Você realmente deseja excluir o tipo de documento "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html" approved="yes"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Documentos associados não serão excluidos.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html" approved="yes"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="final">Você realmente deseja excluir a etiqueta "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.pt_PT.xlf b/src-ui/src/locale/messages.pt_PT.xlf index 1e5a2ba86..7f3b4a600 100644 --- a/src-ui/src/locale/messages.pt_PT.xlf +++ b/src-ui/src/locale/messages.pt_PT.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="final">Abrir documentos</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="final">Fechar todos</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="final">Gerir</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="final">Correspondentes</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="final">Etiquetas</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Tipos de documento</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Administrador</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="final">Informação</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="final">Documentação</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="final">Github</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="final">Sugerir uma ideia</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">is available.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">Click to view.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Checking for updates is disabled.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Click for more information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="needs-translation">Update available</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="final">Cor</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="final">Selecione</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="final">Por favor selecione um objeto</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="translated">A carregar...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="translated">Olá <x id="PH" equiv-text="this.displayName"/>, bem-vindo ao Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="translated">Bem-vindo ao Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="final">Confirmar eliminação</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="final">Tem a certeza que quer apagar o documento "<x id="PH" equiv-text="this.document.title"/>"?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="final">Os ficheiros deste documento serão excluídos permanentemente. Esta operação não pode ser revertida.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="final">Apagar documento</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="final">Erro ao apagar documento: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="final">Filtrar etiquetas</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="final">Filtrar correspondentes</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Filtrar tipos de documentos</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="final">Ver</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="final">Pontuação:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="final">Selecionar nenhum</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="final">Selecionar página</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="final">Selecionar todos</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="final">Ordenar</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="final">Visualizações</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="final">Guardar "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Guardar como...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="translated">A carregar...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html" approved="yes"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="final">{VAR_PLURAL, plural, one {} =1 {Selecionado <x id="INTERPOLATION"/> de um documento} other {Selecionados <x id="INTERPOLATION"/> de <x id="INTERPOLATION_1"/> documentos}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">{VAR_PLURAL, plural, one {} =1 {Um documento} other {<x id="INTERPOLATION"/> documentos}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">(filtrado)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="needs-translation">Error while loading documents</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="final">Visualização "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" guardado com sucesso.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="final">Visualização "<x id="PH" equiv-text="savedView.name"/>" criada com sucesso.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="final">Limpar filtros</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="needs-translation">Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Sem correspondente</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="final">Sem tipo de documento</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="final">Sem etiquetas</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="final">Título: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="final">NSA: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="final">Título & conteúdo</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Pesquisa avançada</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="final">Semelhantes a</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html" approved="yes"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="needs-translation">correspondent</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="final">Tem a certeza que quer eliminar a correspondência "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="needs-translation">document type</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html" approved="yes"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Tem a certeza que quer apagar o tipo de documento "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html" approved="yes"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Documentos associados não serão apagados.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html" approved="yes"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="final">Tem a certeza que quer apagar a etiqueta "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.ro_RO.xlf b/src-ui/src/locale/messages.ro_RO.xlf index 0fce2da5c..21552415f 100644 --- a/src-ui/src/locale/messages.ro_RO.xlf +++ b/src-ui/src/locale/messages.ro_RO.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="final">Deschide documente</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="final">Închide tot</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="final">Administrează</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="final">Corespondenți</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="final">Etichete</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Tipuri de documente</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Administrator</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="final">Informații</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="final">Documentație</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="translated">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="final">Sugestii</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">is available.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">Click to view.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Checking for updates is disabled.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Click for more information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="needs-translation">Update available</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="final">Culoare</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="final">Selectează</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="final">Selectați un obiect</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="translated">Se încarcă...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="translated">Salut, <x id="PH" equiv-text="this.displayName"/>, bun venit la Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="translated">Bun venit la Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="final">Confirmă ștergerea</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="final">Sunteţi sigur că doriţi să ştergeţi documentul "<x id="PH" equiv-text="this.document.title"/>"?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="final">Fișierele pentru acest document vor fi șterse permanent. Operațiunea este ireversibila.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="final">Șterge document</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="final">Eroare la ștergerea documentului: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="final">Filtrează etichete</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="final">Filtrează corespondenți</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Filtrează tipuri de documente</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="final">Vizualizare</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="final">Scor:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="final">Deselectează tot</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="final">Selectează pagina</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="final">Selectează tot</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="final">Sortează</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="final">Vizualizări</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="final">Salvează "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Salvează ca...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="translated">Se încarcă...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html" approved="yes"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="final">{VAR_PLURAL, plural, =1 {Am selectat<x id="INTERPOLATION"/> din 1 document} other {Am selectat <x id="INTERPOLATION"/> din <x id="INTERPOLATION_1"/> documente}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">{VAR_PLURAL, plural, =1 {Un document} other {<x id="INTERPOLATION"/> documente}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">(filtrat)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="needs-translation">Error while loading documents</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="final">Vizualizarea "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" a fost salvată.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="final">Vizualizarea "<x id="PH" equiv-text="savedView.name"/>" a fost creată.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="final">Resetare filtre</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="needs-translation">Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Fără corespondent</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="final">Fară tip</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="final">Fară etichete</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="final">Titlu: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="final">Aviz prealabil de expediție: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="final">Titlu si conținut</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Căutare avansată</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="final">Asemănătoare</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html" approved="yes"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="needs-translation">correspondent</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="final">Sunteți sigur că doriți să ștergeți corespondentul "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="needs-translation">document type</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html" approved="yes"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Sunteți sigur că doriți să ștergeți tipul de document "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html" approved="yes"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Documentele asociate nu vor fi șterse.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html" approved="yes"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="final">Sunteți sigur că doriți să ștergeți documentul "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.ru_RU.xlf b/src-ui/src/locale/messages.ru_RU.xlf index eb4e23500..ee996978f 100644 --- a/src-ui/src/locale/messages.ru_RU.xlf +++ b/src-ui/src/locale/messages.ru_RU.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="final">Открыть документы</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="final">Закрыть всё</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="final">Управлять</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="final">Корреспонденты</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="final">Теги</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Типы документов</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Администрирование</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="final">Информация</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="final">Документация</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="translated">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="final">Предложить идею</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">is available.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">Click to view.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Checking for updates is disabled.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Click for more information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="needs-translation">Update available</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="final">Цвет</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="final">Выбрать</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="final">Пожалуйста, выберите объект</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="translated">Загрузка...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html" approved="yes"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="final">Привет, <x id="PH" equiv-text="this.displayName"/>, добро пожаловать в Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="translated">Добро пожаловать в Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="final">Подтвердите удаление</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="final">Вы действительно хотите удалить документ "<x id="PH" equiv-text="this.document.title"/>"?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="final">Файлы из этого документа будут удалены незамедлительно. Это операцию нельзя отменить.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="final">Удалить документ</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="final">Ошибка удаления документа: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="final">Фильтр тегов</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="final">Фильтр корреспондентов</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Фильтр типа документов</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="final">Представление</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="final">Оценка:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="final">Ничего</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="final">Выбрать страницу</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="final">Выбрать всё</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="final">Сортировка</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="final">Представления</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="final">Сохранить "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Сохранить как...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="translated">Загрузка...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html" approved="yes"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="final">{VAR_PLURAL, plural, =1 {Выделено документов: <x id="INTERPOLATION"/> из 1} other {Выделено документов: <x id="INTERPOLATION"/> из <x id="INTERPOLATION_1"/>}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">{VAR_PLURAL, plural, =1 {Один документ} other {<x id="INTERPOLATION"/> документа(ов)}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">(отфильтровано)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="needs-translation">Error while loading documents</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="final">Представление "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" успешно сохранено.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="final">Представление "<x id="PH" equiv-text="savedView.name"/>" успешно создано.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="final">Сбросить фильтры</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="needs-translation">Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Без корреспондента</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="final">Без типа документа</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="final">Без тегов</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="final">Название: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="final">Архивный номер: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="final">Название и содержимое</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Расширенный поиск</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="final">Больше похожих</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html" approved="yes"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="needs-translation">correspondent</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="final">Вы действительно хотите удалить этого корреспондента "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="needs-translation">document type</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html" approved="yes"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Вы действительно хотите удалить этот тип документа: "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html" approved="yes"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Связанные документы не будут удалены.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html" approved="yes"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="final">Вы действительно хотите удалить тег "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.sk_SK.xlf b/src-ui/src/locale/messages.sk_SK.xlf index daad50ea9..74595ac53 100644 --- a/src-ui/src/locale/messages.sk_SK.xlf +++ b/src-ui/src/locale/messages.sk_SK.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="needs-translation">Open documents</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="needs-translation">Close all</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="needs-translation">Manage</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="needs-translation">Correspondents</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="needs-translation">Tags</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="needs-translation">Document types</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="needs-translation">Admin</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="needs-translation">Info</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="needs-translation">Documentation</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="needs-translation">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="needs-translation">Suggest an idea</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">is available.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">Click to view.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Checking for updates is disabled.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Click for more information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="needs-translation">Update available</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="needs-translation">Color</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="needs-translation">Select</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="needs-translation">Please select an object</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="needs-translation">Loading...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="needs-translation">Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="needs-translation">Welcome to Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="needs-translation">Confirm delete</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="needs-translation">Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="needs-translation">The files for this document will be deleted permanently. This operation cannot be undone.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="needs-translation">Delete document</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="needs-translation">Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="needs-translation">Filter tags</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="needs-translation">Filter correspondents</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="needs-translation">Filter document types</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="needs-translation">View</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="needs-translation">Score:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="needs-translation">Select none</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="needs-translation">Select page</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="needs-translation">Select all</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="needs-translation">Sort</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="needs-translation">Views</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="needs-translation">Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="needs-translation">Save as...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="needs-translation">Loading...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="needs-translation">{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="needs-translation">{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="needs-translation">(filtered)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="needs-translation">Error while loading documents</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="needs-translation">View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="needs-translation">View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="needs-translation">Reset filters</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="needs-translation">Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="needs-translation">Without correspondent</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="needs-translation">Without document type</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="needs-translation">Without any tag</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="needs-translation">Title: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="needs-translation">ASN: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="needs-translation">Title & content</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="needs-translation">Advanced search</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">More like</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="needs-translation">correspondent</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="needs-translation">Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="needs-translation">document type</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="needs-translation">Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="needs-translation">Associated documents will not be deleted.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="needs-translation">Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.sl_SI.xlf b/src-ui/src/locale/messages.sl_SI.xlf index 5d458bdf8..0333ca6ef 100644 --- a/src-ui/src/locale/messages.sl_SI.xlf +++ b/src-ui/src/locale/messages.sl_SI.xlf @@ -8,7 +8,7 @@ <context context-type="sourcefile">node_modules/src/alert/alert.ts</context> <context context-type="linenumber">79,80</context> </context-group> - <target state="needs-translation">Close</target> + <target state="translated">Zapri</target> </trans-unit> <trans-unit id="ngb.carousel.slide-number" datatype="html"> <source> Slide <x id="INTERPOLATION" equiv-text="keyboard 'arrow"/> of <x id="INTERPOLATION_1" equiv-text="t'. */ @In"/> </source> @@ -17,7 +17,7 @@ <context context-type="linenumber">154,159</context> </context-group> <note priority="1" from="description">Currently selected slide number read by screen reader</note> - <target state="needs-translation"> Slide <x id="INTERPOLATION" equiv-text="keyboard 'arrow"/> of <x id="INTERPOLATION_1" equiv-text="t'. */ @In"/> </target> + <target state="translated"> Stran <x id="INTERPOLATION" equiv-text="keyboard 'arrow"/> od <x id="INTERPOLATION_1" equiv-text="t'. */ @In"/> </target> </trans-unit> <trans-unit id="ngb.carousel.previous" datatype="html"> <source>Previous</source> @@ -25,7 +25,7 @@ <context context-type="sourcefile">node_modules/src/carousel/carousel.ts</context> <context context-type="linenumber">184</context> </context-group> - <target state="needs-translation">Previous</target> + <target state="translated">Prejšnji</target> </trans-unit> <trans-unit id="ngb.carousel.next" datatype="html"> <source>Next</source> @@ -33,7 +33,7 @@ <context context-type="sourcefile">node_modules/src/carousel/carousel.ts</context> <context context-type="linenumber">205,206</context> </context-group> - <target state="needs-translation">Next</target> + <target state="translated">Naslednji</target> </trans-unit> <trans-unit id="ngb.datepicker.select-month" datatype="html"> <source>Select month</source> @@ -45,7 +45,7 @@ <context context-type="sourcefile">node_modules/src/datepicker/datepicker-navigation-select.ts</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">Select month</target> + <target state="translated">Izberi mesec</target> </trans-unit> <trans-unit id="ngb.datepicker.select-year" datatype="html"> <source>Select year</source> @@ -57,7 +57,7 @@ <context context-type="sourcefile">node_modules/src/datepicker/datepicker-navigation-select.ts</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">Select year</target> + <target state="translated">Izberi leto</target> </trans-unit> <trans-unit id="ngb.datepicker.previous-month" datatype="html"> <source>Previous month</source> @@ -69,7 +69,7 @@ <context context-type="sourcefile">node_modules/src/datepicker/datepicker-navigation.ts</context> <context context-type="linenumber">69</context> </context-group> - <target state="needs-translation">Previous month</target> + <target state="translated">Prejšnji mesec</target> </trans-unit> <trans-unit id="ngb.datepicker.next-month" datatype="html"> <source>Next month</source> @@ -81,7 +81,7 @@ <context context-type="sourcefile">node_modules/src/datepicker/datepicker-navigation.ts</context> <context context-type="linenumber">69</context> </context-group> - <target state="needs-translation">Next month</target> + <target state="translated">Naslednji mesec</target> </trans-unit> <trans-unit id="ngb.pagination.first" datatype="html"> <source>««</source> @@ -121,7 +121,7 @@ <context context-type="sourcefile">node_modules/src/pagination/pagination.ts</context> <context context-type="linenumber">332,333</context> </context-group> - <target state="needs-translation">First</target> + <target state="translated">Prvi</target> </trans-unit> <trans-unit id="ngb.pagination.previous-aria" datatype="html"> <source>Previous</source> @@ -129,7 +129,7 @@ <context context-type="sourcefile">node_modules/src/pagination/pagination.ts</context> <context context-type="linenumber">347,348</context> </context-group> - <target state="needs-translation">Previous</target> + <target state="translated">Prejšnji</target> </trans-unit> <trans-unit id="ngb.pagination.next-aria" datatype="html"> <source>Next</source> @@ -137,7 +137,7 @@ <context context-type="sourcefile">node_modules/src/pagination/pagination.ts</context> <context context-type="linenumber">363</context> </context-group> - <target state="needs-translation">Next</target> + <target state="translated">Naslednja</target> </trans-unit> <trans-unit id="ngb.pagination.last-aria" datatype="html"> <source>Last</source> @@ -145,7 +145,7 @@ <context context-type="sourcefile">node_modules/src/pagination/pagination.ts</context> <context context-type="linenumber">379,380</context> </context-group> - <target state="needs-translation">Last</target> + <target state="translated">Zadnji</target> </trans-unit> <trans-unit id="ngb.progressbar.value" datatype="html"> <source> @@ -163,7 +163,7 @@ <context context-type="sourcefile">node_modules/src/timepicker/timepicker.ts</context> <context context-type="linenumber">138,141</context> </context-group> - <target state="needs-translation">HH</target> + <target state="translated">HH</target> </trans-unit> <trans-unit id="ngb.timepicker.hours" datatype="html"> <source>Hours</source> @@ -171,7 +171,7 @@ <context context-type="sourcefile">node_modules/src/timepicker/timepicker.ts</context> <context context-type="linenumber">161</context> </context-group> - <target state="needs-translation">Hours</target> + <target state="translated">Ura</target> </trans-unit> <trans-unit id="ngb.timepicker.MM" datatype="html"> <source>MM</source> @@ -179,7 +179,7 @@ <context context-type="sourcefile">node_modules/src/timepicker/timepicker.ts</context> <context context-type="linenumber">182</context> </context-group> - <target state="needs-translation">MM</target> + <target state="translated">MM</target> </trans-unit> <trans-unit id="ngb.timepicker.minutes" datatype="html"> <source>Minutes</source> @@ -187,7 +187,7 @@ <context context-type="sourcefile">node_modules/src/timepicker/timepicker.ts</context> <context context-type="linenumber">199</context> </context-group> - <target state="needs-translation">Minutes</target> + <target state="translated">Minuta</target> </trans-unit> <trans-unit id="ngb.timepicker.increment-hours" datatype="html"> <source>Increment hours</source> @@ -195,7 +195,7 @@ <context context-type="sourcefile">node_modules/src/timepicker/timepicker.ts</context> <context context-type="linenumber">218,219</context> </context-group> - <target state="needs-translation">Increment hours</target> + <target state="translated">Povečanje ur</target> </trans-unit> <trans-unit id="ngb.timepicker.decrement-hours" datatype="html"> <source>Decrement hours</source> @@ -203,7 +203,7 @@ <context context-type="sourcefile">node_modules/src/timepicker/timepicker.ts</context> <context context-type="linenumber">240,243</context> </context-group> - <target state="needs-translation">Decrement hours</target> + <target state="translated">Zmanjšanje ur</target> </trans-unit> <trans-unit id="ngb.timepicker.increment-minutes" datatype="html"> <source>Increment minutes</source> @@ -211,7 +211,7 @@ <context context-type="sourcefile">node_modules/src/timepicker/timepicker.ts</context> <context context-type="linenumber">268</context> </context-group> - <target state="needs-translation">Increment minutes</target> + <target state="translated">Povečanje minut</target> </trans-unit> <trans-unit id="ngb.timepicker.decrement-minutes" datatype="html"> <source>Decrement minutes</source> @@ -219,7 +219,7 @@ <context context-type="sourcefile">node_modules/src/timepicker/timepicker.ts</context> <context context-type="linenumber">288,289</context> </context-group> - <target state="needs-translation">Decrement minutes</target> + <target state="translated">Zmanjšanje minut</target> </trans-unit> <trans-unit id="ngb.timepicker.SS" datatype="html"> <source>SS</source> @@ -227,7 +227,7 @@ <context context-type="sourcefile">node_modules/src/timepicker/timepicker.ts</context> <context context-type="linenumber">295</context> </context-group> - <target state="needs-translation">SS</target> + <target state="translated">SS</target> </trans-unit> <trans-unit id="ngb.timepicker.seconds" datatype="html"> <source>Seconds</source> @@ -235,7 +235,7 @@ <context context-type="sourcefile">node_modules/src/timepicker/timepicker.ts</context> <context context-type="linenumber">295</context> </context-group> - <target state="needs-translation">Seconds</target> + <target state="translated">Sekunde</target> </trans-unit> <trans-unit id="ngb.timepicker.increment-seconds" datatype="html"> <source>Increment seconds</source> @@ -243,7 +243,7 @@ <context context-type="sourcefile">node_modules/src/timepicker/timepicker.ts</context> <context context-type="linenumber">295</context> </context-group> - <target state="needs-translation">Increment seconds</target> + <target state="translated">Povečanje sekund</target> </trans-unit> <trans-unit id="ngb.timepicker.decrement-seconds" datatype="html"> <source>Decrement seconds</source> @@ -251,7 +251,7 @@ <context context-type="sourcefile">node_modules/src/timepicker/timepicker.ts</context> <context context-type="linenumber">295</context> </context-group> - <target state="needs-translation">Decrement seconds</target> + <target state="translated">Zmanjšanje sekund</target> </trans-unit> <trans-unit id="ngb.timepicker.PM" datatype="html"> <source> @@ -277,7 +277,7 @@ <context context-type="sourcefile">node_modules/src/toast/toast.ts</context> <context context-type="linenumber">110,112</context> </context-group> - <target state="needs-translation">Close</target> + <target state="translated">Zapri</target> </trans-unit> <trans-unit id="7103632680753685326" datatype="html"> <source>Drop files to begin upload</source> @@ -285,7 +285,7 @@ <context context-type="sourcefile">src/app/app.component.html</context> <context context-type="linenumber">7</context> </context-group> - <target state="needs-translation">Drop files to begin upload</target> + <target state="translated">Za začetek nalaganja spustite datoteke</target> </trans-unit> <trans-unit id="9103526311244275943" datatype="html"> <source>Document added</source> @@ -345,7 +345,7 @@ <context context-type="sourcefile">src/app/app.component.ts</context> <context context-type="linenumber">140</context> </context-group> - <target state="needs-translation">Initiating upload...</target> + <target state="translated">Začetek nalaganja...</target> </trans-unit> <trans-unit id="2173456130768795374" datatype="html"> <source>Paperless-ngx</source> @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="translated">Odpri dokumente</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="translated">Zapri vse</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="translated">Upravljaj</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="translated">Dopisniki</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="translated">Oznake</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="translated">Vrste dokumentov</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="translated">Skrbnik</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="translated">Informacije</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="translated">Dokumentacija</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="translated">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="translated">Podaj predlog</target> </trans-unit> @@ -560,41 +560,41 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> - <target state="needs-translation">is available.</target> + <target state="translated">je na voljo.</target> </trans-unit> <trans-unit id="1175891574282637937" datatype="html"> <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> - <target state="needs-translation">Click to view.</target> + <target state="translated">Klikni za ogled.</target> </trans-unit> <trans-unit id="5052123870893768885" datatype="html"> <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> - <target state="needs-translation">Checking for updates is disabled.</target> + <target state="translated">Preverjanje posodobitev je onemogočeno.</target> </trans-unit> <trans-unit id="3601519436351639860" datatype="html"> <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> - <target state="needs-translation">Click for more information.</target> + <target state="translated">Kliknite za več informacij.</target> </trans-unit> <trans-unit id="509090351011426949" datatype="html"> <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> - <target state="needs-translation">Update available</target> + <target state="translated">Posodobitev na voljo</target> </trans-unit> <trans-unit id="5000042972069710005" datatype="html"> <source><x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="d-inline-block" style="padding-bottom: 1px;" >"/>Cancel<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/></source> @@ -602,7 +602,7 @@ <context context-type="sourcefile">src/app/components/common/confirm-dialog/confirm-dialog.component.html</context> <context context-type="linenumber">12</context> </context-group> - <target state="needs-translation"><x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="d-inline-block" style="padding-bottom: 1px;" >"/>Cancel<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/></target> + <target state="translated"><x id="START_TAG_SPAN" ctype="x-span" equiv-text="<span class="d-inline-block" style="padding-bottom: 1px;" >"/>Prekliči<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="</span>"/></target> </trans-unit> <trans-unit id="1234709746630139322" datatype="html"> <source>Confirmation</source> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="translated">Barva</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="translated">Izberi</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="translated">Prosimo, izberite vrednost</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="translated">Nalaganje...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="translated">Pozdravljen <x id="PH" equiv-text="this.displayName"/>, dobrodošel v Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="translated">Dobrodošli v Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1387,7 +1403,7 @@ <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context> <context context-type="linenumber">44</context> </context-group> - <target state="needs-translation">Previous</target> + <target state="translated">Prejšnji</target> </trans-unit> <trans-unit id="3885497195825665706" datatype="html"> <source>Next</source> @@ -1395,7 +1411,7 @@ <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context> <context context-type="linenumber">49</context> </context-group> - <target state="needs-translation">Next</target> + <target state="translated">Naslednji</target> </trans-unit> <trans-unit id="5028777105388019087" datatype="html"> <source>Details</source> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1579,7 +1595,7 @@ <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context> <context context-type="linenumber">184</context> </context-group> - <target state="needs-translation">Enter Password</target> + <target state="translated">Vnesi geslo</target> </trans-unit> <trans-unit id="3823219296477075982" datatype="html"> <source>Discard</source> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="translated">Potrdi brisanje</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="translated">Ali res želite izbrisati dokument "<x id="PH" equiv-text="this.document.title"/>"?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="translated">Datoteke za ta dokument bodo trajno izbrisane. Te operacije ni mogoče razveljaviti.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="translated">Izbriši dokument</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="translated">Napaka pri brisanju dokumenta: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="translated">Filtriraj oznake</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="translated">Filtrirajte dopisnike</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="translated">Filtrirajte vrste dokumentov</target> </trans-unit> @@ -1715,7 +1731,7 @@ <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context> <context context-type="linenumber">97,99</context> </context-group> - <target state="needs-translation">Error executing bulk operation: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> + <target state="translated">Napaka pri izvajanju operacije v velikem obsegu: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> <trans-unit id="7894972847287473517" datatype="html"> <source>"<x id="PH" equiv-text="items[0].name"/>"</source> @@ -1769,7 +1785,7 @@ <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context> <context context-type="linenumber">192,194</context> </context-group> - <target state="needs-translation">This operation will add the tags <x id="PH" equiv-text="this._localizeList( changedTags.itemsToAdd )"/> to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</target> + <target state="translated">Ta operacija bo dodala oznake <x id="PH" equiv-text="this._localizeList( changedTags.itemsToAdd )"/> na izbrane <x id="PH_1" equiv-text="this.list.selected.size"/> dokumente.</target> </trans-unit> <trans-unit id="7181166515756808573" datatype="html"> <source>This operation will remove the tag "<x id="PH" equiv-text="tag.name"/>" from <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source> @@ -1785,7 +1801,7 @@ <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context> <context context-type="linenumber">205,207</context> </context-group> - <target state="needs-translation">This operation will remove the tags <x id="PH" equiv-text="this._localizeList( changedTags.itemsToRemove )"/> from <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</target> + <target state="translated">Ta operacija bo odstranila oznake <x id="PH" equiv-text="this._localizeList( changedTags.itemsToRemove )"/> iz <x id="PH_1" equiv-text="this.list.selected.size" /> izbranih dokumentov.</target> </trans-unit> <trans-unit id="2739066218579571288" datatype="html"> <source>This operation will add the tags <x id="PH" equiv-text="this._localizeList( changedTags.itemsToAdd )"/> and remove the tags <x id="PH_1" equiv-text="this._localizeList( changedTags.itemsToRemove )"/> on <x id="PH_2" equiv-text="this.list.selected.size"/> selected document(s).</source> @@ -1793,7 +1809,7 @@ <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context> <context context-type="linenumber">209,213</context> </context-group> - <target state="needs-translation">This operation will add the tags <x id="PH" equiv-text="this._localizeList( changedTags.itemsToAdd )"/> and remove the tags <x id="PH_1" equiv-text="this._localizeList( changedTags.itemsToRemove )"/> on <x id="PH_2" equiv-text="this.list.selected.size"/> selected document(s).</target> + <target state="translated">Ta operacija bo dodala oznake <x id="PH" equiv-text="this._localizeList( changedTags.itemsToAdd )"/> in odstranila oznake <x id="PH_1" equiv-text="this._localizeList( changedTags.itemsToRemove )"/> na <x id="PH_2" equiv-text="this.list.selected.size"/> izbranih dokumentih.</target> </trans-unit> <trans-unit id="2996713129519325161" datatype="html"> <source>Confirm correspondent assignment</source> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="translated">Poglej</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="translated">Rezultat:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="translated">Nič ne izberite</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="translated">Izberite stran</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="translated">Izberite vse</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="translated">Razvrsti</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="translated">Pogledi</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="translated">Shrani "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="translated">Shrani kot...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="translated">Nalaganje...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="translated">{VAR_PLURAL, plural, =1 {Izbrano <x id="INTERPOLATION"/> enega dokumenta} other {Izbrano <x id="INTERPOLATION"/> od <x id="INTERPOLATION_1"/> dokumentov}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="translated">{VAR_PLURAL, plural, =1 {Dokument} other {<x id="INTERPOLATION"/> dokumentov}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="translated">(filtrirano)</target> </trans-unit> @@ -2067,19 +2075,19 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> - <target state="needs-translation">Error while loading documents</target> + <target state="translated">Napaka pri nalaganju dokumentov</target> </trans-unit> <trans-unit id="7517688192215738656" datatype="html"> <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="translated">Pogled »<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" je uspešno shranjen.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="translated">Pogled »<x id="PH" equiv-text="savedView.name"/>" je bil uspešno ustvarjen.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="translated">Ponastavi filtre</target> </trans-unit> @@ -2131,15 +2139,15 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> - <target state="needs-translation">Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> + <target state="translated">Dopisnik: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> <trans-unit id="8170755470576301659" datatype="html"> <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="translated">Brez dopisnika</target> </trans-unit> @@ -2147,15 +2155,15 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> - <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> + <target state="translated">Vrsta: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> <trans-unit id="4362173610367509215" datatype="html"> <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="translated">Brez vrste dokumenta</target> </trans-unit> @@ -2163,15 +2171,15 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> - <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> + <target state="translated">Oznaka: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> <trans-unit id="6494566478302448576" datatype="html"> <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="translated">Brez kakršne koli oznake</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="translated">Naslov: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="translated">ASN: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="translated">Naslov & vsebina</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="translated">Napredno iskanje</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="translated">Bolj podobno</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html"> <source>Save current view</source> <context-group purpose="location"> @@ -2253,7 +2301,7 @@ <context context-type="sourcefile">src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html</context> <context context-type="linenumber">12</context> </context-group> - <target state="needs-translation">Filter rules error occurred while saving this view</target> + <target state="translated">Pri shranjevanju tega pogleda je prišlo do napake v pravilih filtra</target> </trans-unit> <trans-unit id="6438839705789707938" datatype="html"> <source>The error returned was</source> @@ -2261,7 +2309,7 @@ <context context-type="sourcefile">src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html</context> <context context-type="linenumber">13</context> </context-group> - <target state="needs-translation">The error returned was</target> + <target state="translated">Vrnjena napaka je bila</target> </trans-unit> <trans-unit id="6316128875819022658" datatype="html"> <source>correspondent</source> @@ -2269,21 +2317,29 @@ <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> <context context-type="linenumber">33</context> </context-group> - <target state="needs-translation">correspondent</target> + <target state="translated">dopisnik</target> + </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> - <target state="needs-translation">Last used</target> + <target state="translated">Nazadnje uporabljen</target> </trans-unit> <trans-unit id="7427874343955308724" datatype="html"> <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="translated">Ali res želite izbrisati dopisnika "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2293,13 +2349,21 @@ <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> <context context-type="linenumber">30</context> </context-group> - <target state="needs-translation">document type</target> + <target state="translated">vrsta dokumenta</target> + </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> </trans-unit> <trans-unit id="4990731724078522539" datatype="html"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="translated">Ali res želite izbrisati vrsto dokumenta "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2401,10 +2465,10 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">44</context> </context-group> - <target state="needs-translation">Filter Documents</target> + <target state="translated">Filtriraj Dokumente</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="translated">Povezani dokumenti ne bodo izbrisani.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="translated">Ali res želite izbrisati oznako "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.sr_CS.xlf b/src-ui/src/locale/messages.sr_CS.xlf index b0fe5aa33..f752cacdb 100644 --- a/src-ui/src/locale/messages.sr_CS.xlf +++ b/src-ui/src/locale/messages.sr_CS.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="translated">Otvorena dokumenta</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="translated">Zatvori svе</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="translated">Upravljanje</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="translated">Dopisnici</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="translated">Oznake</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="translated">Tipovi dokumenta</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="translated">Administracija</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="translated">Informacije</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="translated">Dokumentacija</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="translated">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="translated">Predložite ideju</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="translated">je dostupno.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="translated">Klik za prеglеd.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="translated">Provera ažuriranja je isključena.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="translated">Klikni za više informacija.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="translated">Dostupno jе ažuriranjе</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="translated">Boja</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="translated">Izaberi</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="translated">Molimo odaberete objekat</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="translated">Učitavanje...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="translated">Pozdrav <x id="PH" equiv-text="this.displayName"/>, dobro došao u Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="translated">Dobro došli u Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="translated">Potvrdi brisanje</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="translated">Da li stvarno želite da obrišite dokument "<x id="PH" equiv-text="this.document.title"/>"?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="translated">Fajlovi za ovaj dokument će biti trajno obrisani. Ova operacija se ne može opozvati.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="translated">Obriši dokument</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="translated">Greška prilikom brisanja dokumenta: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="translated">Filtriraj oznake</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="translated">Filtriraj dopisnike</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="translated">Filtriraj tipove dokumenata</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="translated">Prikaz</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="translated">Rezultat:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="translated">Poništi sve</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="translated">Izaberi stranu</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="translated">Odaberi sve</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="translated">Sortiraj</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="translated">Prikazi</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="translated">Sačuvaj "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="translated">Sačuvaj kao...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="translated">Učitavanje...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="translated">{VAR_PLURAL, plural, =1 {Selektovan <x id="INTERPOLATION"/> od jednog dokumenta} other {Selektovano <x id="INTERPOLATION"/> od <x id="INTERPOLATION_1"/> dokumenata}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="translated">{VAR_PLURAL, plural, =1 {Jedan dokument} other {<x id="INTERPOLATION"/> dokumenata}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="translated">(filtrirano)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="translated">Greška pri učitavanju dokumenata</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="translated">Prikaz "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" je uspešno sačuvan.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="translated">Prikaz "<x id="PH" equiv-text="savedView.name"/>" je uspešno kreiran.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="translated">Poništavanje filtera</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="translated">Dopisnik: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="translated">Bez dopisnika</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="translated">Tip: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="translated">Bez tipa dokumenta</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="translated">Oznaka: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="translated">Bez oznake</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="translated">Naslov: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="translated">ASN: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="translated">Naslov & sadržaj</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="translated">Napredna pretraga</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="translated">Više sličnog</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="translated">dopisnik</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="translated">Da li stvarno želite da obrišete ovog dopisnika "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="translated">tip dokumenta</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="translated">Da li stvarno želite da obrišite ovaj tip dokumenta "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="translated">{VAR_PLURAL, plural, =1 {Jedan<x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> ukupno<x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="translated">Da li stvarno želite da obrišete <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="translated">Povezani dokumenti neće biti obrisani.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="translated">Greška prilikom brisanja elementa: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="translated">oznaka</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="translated">Da li stvarno želite da obrišete oznaku "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.sv_SE.xlf b/src-ui/src/locale/messages.sv_SE.xlf index 72f5c40f0..5bdaf08d7 100644 --- a/src-ui/src/locale/messages.sv_SE.xlf +++ b/src-ui/src/locale/messages.sv_SE.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="final">Öppna dokument</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="final">Stäng alla</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="final">Hantera</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="final">Korrespondenter</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="final">Taggar</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Dokumenttyper</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="needs-translation">Admin</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="needs-translation">Info</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="final">Dokumentation</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="needs-translation">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="final">Föreslå en idé</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">is available.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">Click to view.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Checking for updates is disabled.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Click for more information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="needs-translation">Update available</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="final">Färg</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="final">Välj</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="final">Välj ett objekt</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="needs-translation">Loading...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="needs-translation">Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="needs-translation">Welcome to Paperless-ngx!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="final">Bekräfta borttagning</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="final">Vill du verkligen ta bort dokumentet "<x id="PH" equiv-text="this.document.title"/>"?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="final">Filerna för detta dokument kommer att raderas permanent. Den här åtgärden kan inte ångras.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="final">Ta bort dokument</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="final">Fel vid borttagning av dokument: <x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="final">Filtrera taggar</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="final">Filtrera korrespondenter</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Filtrera dokument typ</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="final">Vy</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="final">Poäng:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="final">Markera ingen</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="final">Välj sida</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="final">Välj alla</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="final">Sortera</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="final">Vyer</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="final">Spara "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Spara som...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="needs-translation">Loading...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html" approved="yes"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="final">{VAR_PLURAL, plural, one {} =1 {Vald <x id="INTERPOLATION"/> av ett dokument} other {Vald <x id="INTERPOLATION"/> av <x id="INTERPOLATION_1"/> dokument}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">{VAR_PLURAL, plural, one {} =1 {Ett dokument} other {<x id="INTERPOLATION"/> dokument}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="final">(filtrerad)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="needs-translation">Error while loading documents</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="final">Vy "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" sparades.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="final">Vy "<x id="PH" equiv-text="savedView.name"/>" skapades.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="final">Återställ filter</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="needs-translation">Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="final">Utan korrespondent</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="final">Utan dokumenttyp</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="final">Utan tagg</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="final">Titel: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="needs-translation">ASN: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="final">Titel & innehåll</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="final">Avancerad sökning</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="final">Mer som</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html" approved="yes"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="needs-translation">correspondent</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="final">Vill du verkligen ta bort korrespondenten "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="needs-translation">document type</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html" approved="yes"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="final">Vill du verkligen ta bort dokumenttypen "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html" approved="yes"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="final">Kopplade dokument kommer inte att raderas.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html" approved="yes"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="final">Vill du verkligen ta bort taggen "<x id="PH" equiv-text="object.name"/>"?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.tr_TR.xlf b/src-ui/src/locale/messages.tr_TR.xlf index 2bd4bce99..4c1debd40 100644 --- a/src-ui/src/locale/messages.tr_TR.xlf +++ b/src-ui/src/locale/messages.tr_TR.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="translated">Belgeleri aç</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="translated">Tümünü kapat</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="translated">Yönet</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="translated">Muhabirler</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="translated">Etiketler</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="translated">Belge türleri</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="translated">Yönetici</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="translated">Bilgi</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="translated">Dökümantasyon</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="translated">Github</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="translated">Bir fikir öner</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">is available.</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="needs-translation">Click to view.</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Checking for updates is disabled.</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="needs-translation">Click for more information.</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="needs-translation">Update available</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="translated">Renk</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="translated">Seç</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="translated">Lütfen bir öğe seçin</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="translated">Yükleniyor...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="translated"><x id="PH" equiv-text="this.displayName"/> merhaba, Paperless-ngx'e hoşgeldiniz!</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="translated">Paperless-ngx'e hoşgeldiniz!</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="translated">Silmeyi onayla</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="translated">"<x id="PH" equiv-text="this.document.title"/>" olan belgeyi gerçekten silmek istiyormusunuz?</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="translated">Bu belgeye ait dosyalar kalıcı olarak siliniecektir. Bu işlem geri alınamaz.</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="translated">Belgeyi sil</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="translated"><x id="PH" equiv-text="JSON.stringify(error)"/> belgeyi silerken hata</target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="translated">Etiketlere göre filtrele</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="translated">Muhabire göre filtrele</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="translated">Belge türlerini göre filtrele</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="translated">Görüntüle</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="translated">Puan:</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="translated">Seçimi kaldır</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="translated">Sayfayı seç</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="translated">Tümünü seç</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="translated">Sırala</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="translated">Görünümler</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="translated">Kayıt et <x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/></target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="translated">Farklı kaydet...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="translated">Yükleniyor...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="translated">{VAR_PLURAL, plural, =1 {Seçili <x id="INTERPOLATION"/> bir belgeden} other {Seçili <x id="INTERPOLATION"/>, <x id="INTERPOLATION_1"/> belgeden}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="translated">{VAR_PLURAL, plural, =1 {Bir belge} other {<x id="INTERPOLATION"/> belgeler}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="translated">(filtrelenmiş)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="needs-translation">Error while loading documents</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="translated">"<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" adlı görünüm başarı ile kayıt edildi.</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="translated"><x id="PH" equiv-text="savedView.name"/> adlı görünüm başarı ile oluşturuldu.</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="translated">Filtreleri sıfırla</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="needs-translation">Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="translated">Muhabiri olmayan</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="needs-translation">Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="translated">Belge türü olmayan</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="needs-translation">Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="translated">Herhangi bir etiket olmayan</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="translated">Başlık: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="translated">ASN: <x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="translated">Başlık & İçerik</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="translated">Gelişmiş arama</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="translated">Benzeri gibi</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="needs-translation">correspondent</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="needs-translation">Last used</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="translated">"<x id="PH" equiv-text="object.name"/>" muhabirini gerçekten silmek istiyor musunuz?</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="needs-translation">document type</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="translated">"<x id="PH" equiv-text="object.name"/>" belge türünü gerçekten silmek istiyor musunuz?</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="needs-translation">Filter Documents</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="needs-translation">Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="translated">İlişkilendirilmiş belgeler silinmeyecektir.</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="needs-translation">Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="needs-translation">tag</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="translated">"<x id="PH" equiv-text="object.name"/>" olan etiketi gerçekten silmek istiyormusunuz?</target> </trans-unit> diff --git a/src-ui/src/locale/messages.zh_CN.xlf b/src-ui/src/locale/messages.zh_CN.xlf index 41a633873..0dcafacac 100644 --- a/src-ui/src/locale/messages.zh_CN.xlf +++ b/src-ui/src/locale/messages.zh_CN.xlf @@ -380,7 +380,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">147</context> + <context context-type="linenumber">148</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -416,7 +416,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">77</context> + <context context-type="linenumber">69</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -448,7 +448,7 @@ <source>Open documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">88</context> </context-group> <target state="translated">打开文档</target> </trans-unit> @@ -456,7 +456,7 @@ <source>Close all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">106</context> + <context context-type="linenumber">107</context> </context-group> <target state="translated">全部关闭</target> </trans-unit> @@ -464,7 +464,7 @@ <source>Manage</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">112</context> + <context context-type="linenumber">113</context> </context-group> <target state="translated">管理</target> </trans-unit> @@ -472,7 +472,7 @@ <source>Correspondents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">119</context> + <context context-type="linenumber">120</context> </context-group> <target state="translated">联系人</target> </trans-unit> @@ -480,7 +480,7 @@ <source>Tags</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">126</context> + <context context-type="linenumber">127</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/common/input/tags/tags.component.html</context> @@ -492,7 +492,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">18</context> + <context context-type="linenumber">21</context> </context-group> <target state="translated">标签</target> </trans-unit> @@ -500,7 +500,7 @@ <source>Document types</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <target state="translated">文档类型</target> </trans-unit> @@ -508,7 +508,7 @@ <source>Logs</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">140</context> + <context context-type="linenumber">141</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/logs/logs.component.html</context> @@ -520,7 +520,7 @@ <source>Admin</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="translated">后台管理</target> </trans-unit> @@ -528,7 +528,7 @@ <source>Info</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">160</context> + <context context-type="linenumber">161</context> </context-group> <target state="translated">信息</target> </trans-unit> @@ -536,7 +536,7 @@ <source>Documentation</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">167</context> + <context context-type="linenumber">168</context> </context-group> <target state="translated">帮助文档</target> </trans-unit> @@ -544,7 +544,7 @@ <source>GitHub</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">175</context> + <context context-type="linenumber">176</context> </context-group> <target state="translated">GitHub</target> </trans-unit> @@ -552,7 +552,7 @@ <source>Suggest an idea</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">181</context> + <context context-type="linenumber">182</context> </context-group> <target state="translated">提出建议</target> </trans-unit> @@ -560,7 +560,7 @@ <source>is available.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="translated">可用</target> </trans-unit> @@ -568,7 +568,7 @@ <source>Click to view.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">190</context> + <context context-type="linenumber">191</context> </context-group> <target state="translated">点击查看</target> </trans-unit> @@ -576,7 +576,7 @@ <source>Checking for updates is disabled.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="translated">检查更新已禁用</target> </trans-unit> @@ -584,7 +584,7 @@ <source>Click for more information.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">193</context> + <context context-type="linenumber">194</context> </context-group> <target state="translated">点击以获取更多信息</target> </trans-unit> @@ -592,7 +592,7 @@ <source>Update available</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.html</context> - <context context-type="linenumber">201</context> + <context context-type="linenumber">202</context> </context-group> <target state="translated">有可用更新</target> </trans-unit> @@ -908,7 +908,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">35</context> </context-group> <target state="translated">颜色</target> </trans-unit> @@ -1018,7 +1018,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">7</context> + <context context-type="linenumber">8</context> </context-group> <target state="translated">选择</target> </trans-unit> @@ -1030,11 +1030,27 @@ </context-group> <target state="translated">请选择一个对象</target> </trans-unit> + <trans-unit id="3894950702316166331" datatype="html"> + <source>Loading...</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context> + <context context-type="linenumber">26</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html</context> + <context context-type="linenumber">7</context> + </context-group> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> + <context context-type="linenumber">89</context> + </context-group> + <target state="translated">加载中...</target> + </trans-unit> <trans-unit id="5412339817978503936" datatype="html"> <source>Hello <x id="PH" equiv-text="this.displayName"/>, welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">28</context> + <context context-type="linenumber">27</context> </context-group> <target state="translated">您好 <x id="PH" equiv-text="this.displayName"/>，欢迎使用 Paperless-ngx！</target> </trans-unit> @@ -1042,7 +1058,7 @@ <source>Welcome to Paperless-ngx!</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context> - <context context-type="linenumber">30</context> + <context context-type="linenumber">29</context> </context-group> <target state="translated">欢迎使用 Paperless-ngx！</target> </trans-unit> @@ -1066,11 +1082,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">145</context> + <context context-type="linenumber">146</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">41</context> + <context context-type="linenumber">44</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1090,11 +1106,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">133</context> + <context context-type="linenumber">134</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">117</context> + <context context-type="linenumber">126</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1325,7 +1341,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">156</context> + <context context-type="linenumber">157</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/settings/settings.component.html</context> @@ -1345,7 +1361,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">60</context> + <context context-type="linenumber">58</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-small/document-card-small.component.html</context> @@ -1433,11 +1449,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">127</context> + <context context-type="linenumber">128</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">26</context> + <context context-type="linenumber">29</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1457,11 +1473,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">33</context> + <context context-type="linenumber">36</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -1601,11 +1617,11 @@ <source>Confirm delete</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">421</context> + <context context-type="linenumber">423</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">152</context> + <context context-type="linenumber">153</context> </context-group> <target state="translated">确认删除</target> </trans-unit> @@ -1613,7 +1629,7 @@ <source>Do you really want to delete document "<x id="PH" equiv-text="this.document.title"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">422</context> + <context context-type="linenumber">424</context> </context-group> <target state="translated">您真的想要删除文档 “<x id="PH" equiv-text="this.document.title"/>” 吗？</target> </trans-unit> @@ -1621,7 +1637,7 @@ <source>The files for this document will be deleted permanently. This operation cannot be undone.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">423</context> + <context context-type="linenumber">425</context> </context-group> <target state="translated">此文档的文件将被永久删除。此操作无法撤消。</target> </trans-unit> @@ -1629,7 +1645,7 @@ <source>Delete document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">425</context> + <context context-type="linenumber">427</context> </context-group> <target state="translated">删除文档</target> </trans-unit> @@ -1637,7 +1653,7 @@ <source>Error deleting document: <x id="PH" equiv-text="JSON.stringify(error)"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context> - <context context-type="linenumber">441</context> + <context context-type="linenumber">443</context> </context-group> <target state="translated">删除文档时出错：<x id="PH" equiv-text="JSON.stringify(error)"/></target> </trans-unit> @@ -1673,7 +1689,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">19</context> + <context context-type="linenumber">22</context> </context-group> <target state="translated">过滤器标签</target> </trans-unit> @@ -1685,7 +1701,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">27</context> + <context context-type="linenumber">30</context> </context-group> <target state="translated">过滤联系人</target> </trans-unit> @@ -1697,7 +1713,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">34</context> + <context context-type="linenumber">37</context> </context-group> <target state="translated">过滤文档类型</target> </trans-unit> @@ -1939,7 +1955,7 @@ <source>View</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">51</context> + <context context-type="linenumber">50</context> </context-group> <target state="translated">查看</target> </trans-unit> @@ -1947,7 +1963,7 @@ <source>Score:</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">85</context> </context-group> <target state="translated">分数：</target> </trans-unit> @@ -1979,7 +1995,7 @@ <source>Select none</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">10</context> + <context context-type="linenumber">11</context> </context-group> <target state="translated">选择“无”</target> </trans-unit> @@ -1987,7 +2003,7 @@ <source>Select page</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">11</context> + <context context-type="linenumber">12</context> </context-group> <target state="translated">选择页面</target> </trans-unit> @@ -1995,7 +2011,7 @@ <source>Select all</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">12</context> + <context context-type="linenumber">13</context> </context-group> <target state="translated">全选</target> </trans-unit> @@ -2003,7 +2019,7 @@ <source>Sort</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">39</context> + <context context-type="linenumber">40</context> </context-group> <target state="translated">排序</target> </trans-unit> @@ -2011,7 +2027,7 @@ <source>Views</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">65</context> </context-group> <target state="translated">视图</target> </trans-unit> @@ -2019,7 +2035,7 @@ <source>Save "<x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/>"</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">71</context> + <context context-type="linenumber">72</context> </context-group> <target state="translated">保存 <x id="INTERPOLATION" equiv-text="{{list.activeSavedViewTitle}}"/></target> </trans-unit> @@ -2027,23 +2043,15 @@ <source>Save as...</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">72</context> + <context context-type="linenumber">73</context> </context-group> <target state="translated">另存为...</target> </trans-unit> - <trans-unit id="3894950702316166331" datatype="html"> - <source>Loading...</source> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">88</context> - </context-group> - <target state="translated">加载中...</target> - </trans-unit> <trans-unit id="8786996283897742947" datatype="html"> <source>{VAR_PLURAL, plural, =1 {Selected <x id="INTERPOLATION"/> of one document} other {Selected <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">91</context> </context-group> <target state="translated">{VAR_PLURAL, plural, =1 {已选择<x id="INTERPOLATION"/> 一个文档} other {已选择<x id="INTERPOLATION"/> 共 <x id="INTERPOLATION_1"/> 文档}}</target> </trans-unit> @@ -2051,7 +2059,7 @@ <source>{VAR_PLURAL, plural, =1 {One document} other {<x id="INTERPOLATION"/> documents}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="translated">{VAR_PLURAL, plural, =1 {一个文档} other {<x id="INTERPOLATION"/> 文档}}</target> </trans-unit> @@ -2059,7 +2067,7 @@ <source>(filtered)</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">92</context> + <context context-type="linenumber">93</context> </context-group> <target state="translated">(已过滤)</target> </trans-unit> @@ -2067,7 +2075,7 @@ <source>Error while loading documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">103</context> + <context context-type="linenumber">104</context> </context-group> <target state="translated">加载文档时出错</target> </trans-unit> @@ -2075,11 +2083,11 @@ <source>ASN</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">121</context> + <context context-type="linenumber">122</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">122</context> + <context context-type="linenumber">131</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2091,11 +2099,11 @@ <source>Added</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context> - <context context-type="linenumber">151</context> + <context context-type="linenumber">152</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">48</context> + <context context-type="linenumber">51</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/rest/document.service.ts</context> @@ -2107,7 +2115,7 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">213</context> + <context context-type="linenumber">198</context> </context-group> <target state="translated">视图<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>保存成功。</target> </trans-unit> @@ -2115,7 +2123,7 @@ <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">243</context> + <context context-type="linenumber">228</context> </context-group> <target state="translated">视图：<x id="PH" equiv-text="savedView.name"/>创建成功。</target> </trans-unit> @@ -2123,7 +2131,7 @@ <source>Reset filters</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context> - <context context-type="linenumber">57</context> + <context context-type="linenumber">60</context> </context-group> <target state="translated">重置过滤器</target> </trans-unit> @@ -2131,7 +2139,7 @@ <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">60,62</context> + <context context-type="linenumber">69,71</context> </context-group> <target state="translated">联系人: <x id="PH" equiv-text="this.correspondents.find((c) => c.id == +rule.value)?.name"/></target> </trans-unit> @@ -2139,7 +2147,7 @@ <source>Without correspondent</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">64</context> + <context context-type="linenumber">73</context> </context-group> <target state="translated">没有联系人</target> </trans-unit> @@ -2147,7 +2155,7 @@ <source>Type: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">69,71</context> + <context context-type="linenumber">78,80</context> </context-group> <target state="translated">类型: <x id="PH" equiv-text="this.documentTypes.find((dt) => dt.id == +rule.value)?.name"/></target> </trans-unit> @@ -2155,7 +2163,7 @@ <source>Without document type</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">73</context> + <context context-type="linenumber">82</context> </context-group> <target state="translated">没有文档类型</target> </trans-unit> @@ -2163,7 +2171,7 @@ <source>Tag: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">77,79</context> + <context context-type="linenumber">86,88</context> </context-group> <target state="translated">标签: <x id="PH" equiv-text="this.tags.find((t) => t.id == +rule.value)?.name"/></target> </trans-unit> @@ -2171,7 +2179,7 @@ <source>Without any tag</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">83</context> + <context context-type="linenumber">92</context> </context-group> <target state="translated">没有任何标签</target> </trans-unit> @@ -2179,7 +2187,7 @@ <source>Title: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">87</context> + <context context-type="linenumber">96</context> </context-group> <target state="translated">标题：<x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2187,7 +2195,7 @@ <source>ASN: <x id="PH" equiv-text="rule.value"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">90</context> + <context context-type="linenumber">99</context> </context-group> <target state="translated">ASN：<x id="PH" equiv-text="rule.value"/></target> </trans-unit> @@ -2195,7 +2203,7 @@ <source>Title & content</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">120</context> + <context context-type="linenumber">129</context> </context-group> <target state="translated">标题 & 内容</target> </trans-unit> @@ -2203,7 +2211,7 @@ <source>Advanced search</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">125</context> + <context context-type="linenumber">134</context> </context-group> <target state="translated">高级搜索</target> </trans-unit> @@ -2211,10 +2219,50 @@ <source>More like</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> - <context context-type="linenumber">131</context> + <context context-type="linenumber">140</context> </context-group> <target state="translated">更多</target> </trans-unit> + <trans-unit id="3697582909018473071" datatype="html"> + <source>equals</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">159</context> + </context-group> + <target state="needs-translation">equals</target> + </trans-unit> + <trans-unit id="5325481293405718739" datatype="html"> + <source>is empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">163</context> + </context-group> + <target state="needs-translation">is empty</target> + </trans-unit> + <trans-unit id="6166785695326182482" datatype="html"> + <source>is not empty</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">167</context> + </context-group> + <target state="needs-translation">is not empty</target> + </trans-unit> + <trans-unit id="4686622206659266699" datatype="html"> + <source>greater than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">171</context> + </context-group> + <target state="needs-translation">greater than</target> + </trans-unit> + <trans-unit id="8014012170270529279" datatype="html"> + <source>less than</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context> + <context context-type="linenumber">175</context> + </context-group> + <target state="needs-translation">less than</target> + </trans-unit> <trans-unit id="7210076240260527720" datatype="html"> <source>Save current view</source> <context-group purpose="location"> @@ -2271,11 +2319,19 @@ </context-group> <target state="translated">联系人</target> </trans-unit> + <trans-unit id="1612355304340685070" datatype="html"> + <source>correspondents</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> + <context context-type="linenumber">34</context> + </context-group> + <target state="needs-translation">correspondents</target> + </trans-unit> <trans-unit id="6360600151505327572" datatype="html"> <source>Last used</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">37</context> + <context context-type="linenumber">38</context> </context-group> <target state="translated">最后使用</target> </trans-unit> @@ -2283,7 +2339,7 @@ <source>Do you really want to delete the correspondent "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/correspondent-list/correspondent-list.component.ts</context> - <context context-type="linenumber">47</context> + <context context-type="linenumber">48</context> </context-group> <target state="translated">您真的想要删除联系人"<x id="PH" equiv-text="object.name"/> "吗？</target> </trans-unit> @@ -2295,11 +2351,19 @@ </context-group> <target state="translated">文档类型</target> </trans-unit> + <trans-unit id="2992451138146293104" datatype="html"> + <source>document types</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">document types</target> + </trans-unit> <trans-unit id="4990731724078522539" datatype="html"> <source>Do you really want to delete the document type "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/document-type-list/document-type-list.component.ts</context> - <context context-type="linenumber">36</context> + <context context-type="linenumber">37</context> </context-group> <target state="translated">您真的想要删除文档类型"<x id="PH" equiv-text="object.name"/> "吗？</target> </trans-unit> @@ -2403,8 +2467,8 @@ </context-group> <target state="translated">筛选文档</target> </trans-unit> - <trans-unit id="808959623879724772" datatype="html"> - <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION"/>s}}</source> + <trans-unit id="8095412801504464756" datatype="html"> + <source>{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> @@ -2417,13 +2481,13 @@ <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> <context context-type="linenumber">74</context> </context-group> - <target state="translated">{VAR_PLURAL, plural, =1 {一个 <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> 总计 <x id="INTERPOLATION"/>s}}</target> + <target state="needs-translation">{VAR_PLURAL, plural, =1 {One <x id="INTERPOLATION"/>} other {<x id="INTERPOLATION_1"/> total <x id="INTERPOLATION_2"/>}}</target> </trans-unit> <trans-unit id="810888510148304696" datatype="html"> <source>Automatic</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">87</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/data/matching-model.ts</context> @@ -2435,7 +2499,7 @@ <source>Do you really want to delete the <x id="PH" equiv-text="this.typeName"/>?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">139</context> + <context context-type="linenumber">140</context> </context-group> <target state="translated">您真的想要删除 <x id="PH" equiv-text="this.typeName"/> 吗?</target> </trans-unit> @@ -2443,7 +2507,7 @@ <source>Associated documents will not be deleted.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">154</context> + <context context-type="linenumber">155</context> </context-group> <target state="translated">已关联的文档将不会被删除。</target> </trans-unit> @@ -2451,7 +2515,7 @@ <source>Error while deleting element: <x id="PH" equiv-text="JSON.stringify( error.error )"/></source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.ts</context> - <context context-type="linenumber">167,169</context> + <context context-type="linenumber">168,170</context> </context-group> <target state="translated">删除元素时出错: <x id="PH" equiv-text="JSON.stringify( error.error )"/></target> </trans-unit> @@ -2759,11 +2823,19 @@ </context-group> <target state="translated">标签</target> </trans-unit> + <trans-unit id="4975748273657042999" datatype="html"> + <source>tags</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> + <context context-type="linenumber">31</context> + </context-group> + <target state="needs-translation">tags</target> + </trans-unit> <trans-unit id="93754014749412887" datatype="html"> <source>Do you really want to delete the tag "<x id="PH" equiv-text="object.name"/>"?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/tag-list/tag-list.component.ts</context> - <context context-type="linenumber">45</context> + <context context-type="linenumber">46</context> </context-group> <target state="translated">您真的想要删除标签“<x id="PH" equiv-text="object.name"/> ”吗？</target> </trans-unit> diff --git a/src/locale/pl_PL/LC_MESSAGES/django.po b/src/locale/pl_PL/LC_MESSAGES/django.po index 2ff485da0..4d262a8c2 100644 --- a/src/locale/pl_PL/LC_MESSAGES/django.po +++ b/src/locale/pl_PL/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: paperless-ngx\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-03-02 11:20-0800\n" -"PO-Revision-Date: 2022-04-12 15:26\n" +"PO-Revision-Date: 2022-05-13 03:55\n" "Last-Translator: \n" "Language-Team: Polish\n" "Language: pl_PL\n" @@ -638,7 +638,7 @@ msgstr "konto" #: paperless_mail/models.py:119 msgid "folder" -msgstr "folder" +msgstr "katalog" #: paperless_mail/models.py:122 msgid "Subfolders must be separated by dots." diff --git a/src/locale/sr_CS/LC_MESSAGES/django.po b/src/locale/sr_CS/LC_MESSAGES/django.po index 1d0037b69..930328512 100644 --- a/src/locale/sr_CS/LC_MESSAGES/django.po +++ b/src/locale/sr_CS/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: paperless-ngx\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-03-02 11:20-0800\n" -"PO-Revision-Date: 2022-04-29 20:40\n" +"PO-Revision-Date: 2022-05-13 03:55\n" "Last-Translator: \n" "Language-Team: Serbian (Latin)\n" "Language: sr_CS\n" From 58f3cb920975a4aee2d168f743f009f2691ce3a3 Mon Sep 17 00:00:00 2001 From: Trenton Holmes <holmes.trenton@gmail.com> Date: Sat, 14 May 2022 08:20:55 -0700 Subject: [PATCH 039/291] Moves the asserts to be closer together --- src/documents/tests/test_document_model.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/documents/tests/test_document_model.py b/src/documents/tests/test_document_model.py index c456a4bb7..57455fb8f 100644 --- a/src/documents/tests/test_document_model.py +++ b/src/documents/tests/test_document_model.py @@ -77,7 +77,24 @@ class TestDocument(TestCase): utc_create_date = local_create_date.astimezone(zoneinfo.ZoneInfo("UTC")) + doc = Document( + mime_type="application/pdf", + title="test", + created=utc_create_date, + ) + + # Ensure the create date would cause an off by 1 if not properly created above self.assertEqual(utc_create_date.date().day, 24) + self.assertEqual(doc.get_public_filename(), "2020-12-25 test.pdf") + + local_create_date = timezone.datetime( + 2020, + 1, + 1, + tzinfo=zoneinfo.ZoneInfo("Europe/Berlin"), + ) + + utc_create_date = local_create_date.astimezone(zoneinfo.ZoneInfo("UTC")) doc = Document( mime_type="application/pdf", @@ -85,7 +102,9 @@ class TestDocument(TestCase): created=utc_create_date, ) - self.assertEqual(doc.get_public_filename(), "2020-12-25 test.pdf") + # Ensure the create date would cause an off by 1 in the year if not properly created above + self.assertEqual(utc_create_date.date().year, 2019) + self.assertEqual(doc.get_public_filename(), "2020-01-01 test.pdf") def test_file_name_jpg(self): From 2ad7b5ec7c20a3c3268010c8ed2e2de08a21758f Mon Sep 17 00:00:00 2001 From: Trenton Holmes <holmes.trenton@gmail.com> Date: Sun, 15 May 2022 11:25:14 -0700 Subject: [PATCH 040/291] Makes the workflow triggers more specific --- .github/workflows/installer-library.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/installer-library.yml b/.github/workflows/installer-library.yml index 31e08638e..77a66e5d2 100644 --- a/.github/workflows/installer-library.yml +++ b/.github/workflows/installer-library.yml @@ -19,8 +19,10 @@ on: # Trigger if a package was updated - ".build-config.json" - "Pipfile.lock" - # Also trigger on workflow changes (such as this file) - - ".github/workflows/**" + # Also trigger on workflow changes related to the library + - ".github/workflows/installer-library.yml" + - ".github/workflows/reusable-workflow-builder.yml" + - ".github/scripts/**" # Set a workflow level concurrency group so primary workflow # can wait for this to complete if needed From 836373bc3b977f01a2f72e80a48062132be17ca5 Mon Sep 17 00:00:00 2001 From: Trenton Holmes <holmes.trenton@gmail.com> Date: Sun, 15 May 2022 11:48:12 -0700 Subject: [PATCH 041/291] Adds configuration variable to the inotify debounce timing --- docs/configuration.rst | 8 ++++++++ .../management/commands/document_consumer.py | 19 ++++++++++++++++--- .../tests/test_management_consumer.py | 5 ++++- src/paperless/settings.py | 12 ++++++++++++ 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/docs/configuration.rst b/docs/configuration.rst index 3a4960f82..675a929bf 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -590,6 +590,14 @@ PAPERLESS_CONSUMER_POLLING=<num> Defaults to 0, which disables polling and uses filesystem notifications. +PAPERLESS_CONSUMER_INOTIFY_DELAY=<num> + Sets the time in seconds the consumer will wait for additional events + from inotify before the consumer will consider a file ready and begin consumption. + Certain scanners or network setups may generate multiple events for a single file, + leading to multiple consumers working on the same file. Configure this to + prevent that. + + Defaults to 0.5 seconds. PAPERLESS_CONSUMER_DELETE_DUPLICATES=<bool> When the consumer detects a duplicate document, it will not touch the diff --git a/src/documents/management/commands/document_consumer.py b/src/documents/management/commands/document_consumer.py index 87e3af2c3..bddb566aa 100644 --- a/src/documents/management/commands/document_consumer.py +++ b/src/documents/management/commands/document_consumer.py @@ -216,7 +216,7 @@ class Command(BaseCommand): try: - inotify_debounce: Final[float] = 0.5 + inotify_debounce: Final[float] = settings.CONSUMER_INOTIFY_DELAY notified_files = {} while not self.stop_flag: @@ -234,10 +234,23 @@ class Command(BaseCommand): for filepath in notified_files: # Time of the last inotify event for this file last_event_time = notified_files[filepath] - if (monotonic() - last_event_time) > inotify_debounce: + + # Current time - last time over the configured timeout + waited_long_enough = ( + monotonic() - last_event_time + ) > inotify_debounce + + # Also make sure the file exists still, some scanners might write a + # temporary file first + file_still_exists = os.path.exists(filepath) and os.path.isfile( + filepath, + ) + + if waited_long_enough and file_still_exists: _consume(filepath) - else: + elif file_still_exists: still_waiting[filepath] = last_event_time + # These files are still waiting to hit the timeout notified_files = still_waiting diff --git a/src/documents/tests/test_management_consumer.py b/src/documents/tests/test_management_consumer.py index e8463ab64..32b04282b 100644 --- a/src/documents/tests/test_management_consumer.py +++ b/src/documents/tests/test_management_consumer.py @@ -98,6 +98,9 @@ class ConsumerMixin: print("file completed.") +@override_settings( + CONSUMER_INOTIFY_DELAY=0.01, +) class TestConsumer(DirectoriesMixin, ConsumerMixin, TransactionTestCase): def test_consume_file(self): self.t_start() @@ -286,7 +289,7 @@ class TestConsumerPolling(TestConsumer): pass -@override_settings(CONSUMER_RECURSIVE=True) +@override_settings(CONSUMER_INOTIFY_DELAY=0.01, CONSUMER_RECURSIVE=True) class TestConsumerRecursive(TestConsumer): # just do all the tests with recursive pass diff --git a/src/paperless/settings.py b/src/paperless/settings.py index b5be6c420..9b779d575 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -48,6 +48,13 @@ def __get_int(key: str, default: int) -> int: return int(os.getenv(key, default)) +def __get_float(key: str, default: float) -> float: + """ + Return an integer value based on the environment variable or a default + """ + return float(os.getenv(key, default)) + + # NEVER RUN WITH DEBUG IN PRODUCTION. DEBUG = __get_boolean("PAPERLESS_DEBUG", "NO") @@ -485,6 +492,11 @@ CONSUMER_POLLING_RETRY_COUNT = int( os.getenv("PAPERLESS_CONSUMER_POLLING_RETRY_COUNT", 5), ) +CONSUMER_INOTIFY_DELAY: Final[float] = __get_float( + "PAPERLESS_CONSUMER_INOTIFY_DELAY", + 0.5, +) + CONSUMER_DELETE_DUPLICATES = __get_boolean("PAPERLESS_CONSUMER_DELETE_DUPLICATES") CONSUMER_RECURSIVE = __get_boolean("PAPERLESS_CONSUMER_RECURSIVE") From dc75035bdc98abdc3e5ed7e63449347dd0de9301 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 15 May 2022 22:55:25 -0700 Subject: [PATCH 042/291] Warn on closing edited doc due to max open docs --- .../saved-view-widget.component.html | 2 +- .../saved-view-widget.component.ts | 15 +++++++++-- .../document-card-large.component.html | 2 +- .../document-card-large.component.ts | 20 ++++++++++---- .../document-card-small.component.html | 2 +- .../document-card-small.component.ts | 17 ++++++++++-- .../document-list.component.html | 2 +- .../document-list/document-list.component.ts | 13 +++++++++- .../app/services/open-documents.service.ts | 26 ++++++++++++++----- 9 files changed, 79 insertions(+), 20 deletions(-) diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html index 8d5b9c43f..eb9a136ab 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html @@ -11,7 +11,7 @@ </tr> </thead> <tbody> - <tr *ngFor="let doc of documents" [routerLink]="['/', 'documents', doc.id]"> + <tr *ngFor="let doc of documents" (click)="clickDoc(doc)"> <td>{{doc.created | customDate}}</td> <td>{{doc.title | documentTitle}}<app-tag [tag]="t" *ngFor="let t of doc.tags$ | async" class="ms-1" (click)="clickTag(t); $event.stopPropagation();"></app-tag></td> </tr> diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts index 6e8b67900..89db3ef81 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core' import { Router } from '@angular/router' -import { Subscription } from 'rxjs' +import { first, Subscription } from 'rxjs' import { PaperlessDocument } from 'src/app/data/paperless-document' import { PaperlessSavedView } from 'src/app/data/paperless-saved-view' import { ConsumerStatusService } from 'src/app/services/consumer-status.service' @@ -8,6 +8,7 @@ import { DocumentService } from 'src/app/services/rest/document.service' import { PaperlessTag } from 'src/app/data/paperless-tag' import { FILTER_HAS_TAGS_ALL } from 'src/app/data/filter-rule-type' import { QueryParamsService } from 'src/app/services/query-params.service' +import { OpenDocumentsService } from 'src/app/services/open-documents.service' @Component({ selector: 'app-saved-view-widget', @@ -21,7 +22,8 @@ export class SavedViewWidgetComponent implements OnInit, OnDestroy { private documentService: DocumentService, private router: Router, private queryParamsService: QueryParamsService, - private consumerStatusService: ConsumerStatusService + private consumerStatusService: ConsumerStatusService, + private openDocumentsService: OpenDocumentsService ) {} @Input() @@ -70,6 +72,15 @@ export class SavedViewWidgetComponent implements OnInit, OnDestroy { } } + clickDoc(doc: PaperlessDocument) { + this.openDocumentsService + .openDocument(doc) + .pipe(first()) + .subscribe((open) => { + if (open) this.router.navigate(['documents', doc.id]) + }) + } + clickTag(tag: PaperlessTag) { this.queryParamsService.navigateWithFilterRules([ { rule_type: FILTER_HAS_TAGS_ALL, value: tag.id.toString() }, diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html index a5b238504..d0080f0ce 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html @@ -37,7 +37,7 @@ <use xlink:href="assets/bootstrap-icons.svg#diagram-3"/> </svg> <span class="d-none d-md-inline" i18n>More like this</span> </a> - <a routerLink="/documents/{{document.id}}" class="btn btn-sm btn-outline-secondary"> + <a (click)="clickEdit()" class="btn btn-sm btn-outline-secondary"> <svg class="sidebaricon" fill="currentColor" class="sidebaricon"> <use xlink:href="assets/bootstrap-icons.svg#pencil"/> </svg> <span class="d-none d-md-inline" i18n>Edit</span> diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts index 1c4e9a7aa..8eff2e491 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts @@ -6,7 +6,6 @@ import { Output, ViewChild, } from '@angular/core' -import { DomSanitizer } from '@angular/platform-browser' import { PaperlessDocument } from 'src/app/data/paperless-document' import { DocumentService } from 'src/app/services/rest/document.service' import { @@ -14,8 +13,9 @@ import { SETTINGS_KEYS, } from 'src/app/services/settings.service' import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' -import { DocumentListViewService } from 'src/app/services/document-list-view.service' -import { FILTER_FULLTEXT_MORELIKE } from 'src/app/data/filter-rule-type' +import { OpenDocumentsService } from 'src/app/services/open-documents.service' +import { Router } from '@angular/router' +import { first } from 'rxjs' @Component({ selector: 'app-document-card-large', @@ -28,8 +28,9 @@ import { FILTER_FULLTEXT_MORELIKE } from 'src/app/data/filter-rule-type' export class DocumentCardLargeComponent implements OnInit { constructor( private documentService: DocumentService, - private sanitizer: DomSanitizer, - private settingsService: SettingsService + private settingsService: SettingsService, + private openDocumentsService: OpenDocumentsService, + private router: Router ) {} @Input() @@ -120,4 +121,13 @@ export class DocumentCardLargeComponent implements OnInit { get contentTrimmed() { return this.document.content.substr(0, 500) } + + clickEdit() { + this.openDocumentsService + .openDocument(this.document) + .pipe(first()) + .subscribe((open) => { + if (open) this.router.navigate(['documents', this.document.id]) + }) + } } diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html index 2e8d29b7f..7844ce419 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html @@ -63,7 +63,7 @@ </div> <div class="d-flex justify-content-between align-items-center"> <div class="btn-group w-100"> - <a routerLink="/documents/{{document.id}}" class="btn btn-sm btn-outline-secondary" title="Edit" i18n-title> + <a (click)="clickEdit()" class="btn btn-sm btn-outline-secondary" title="Edit" i18n-title> <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-pencil" fill="currentColor" xmlns="http://www.w3.org/2000/svg"> <path fill-rule="evenodd" d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5L13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175l-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z"/> </svg> diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts index cbff950a2..c7fff39b5 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts @@ -6,7 +6,7 @@ import { Output, ViewChild, } from '@angular/core' -import { map } from 'rxjs/operators' +import { first, map } from 'rxjs/operators' import { PaperlessDocument } from 'src/app/data/paperless-document' import { DocumentService } from 'src/app/services/rest/document.service' import { @@ -14,6 +14,8 @@ import { SETTINGS_KEYS, } from 'src/app/services/settings.service' import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' +import { OpenDocumentsService } from 'src/app/services/open-documents.service' +import { Router } from '@angular/router' @Component({ selector: 'app-document-card-small', @@ -26,7 +28,9 @@ import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' export class DocumentCardSmallComponent implements OnInit { constructor( private documentService: DocumentService, - private settingsService: SettingsService + private settingsService: SettingsService, + private openDocumentsService: OpenDocumentsService, + private router: Router ) {} @Input() @@ -109,4 +113,13 @@ export class DocumentCardSmallComponent implements OnInit { mouseLeaveCard() { this.popover.close() } + + clickEdit() { + this.openDocumentsService + .openDocument(this.document) + .pipe(first()) + .subscribe((open) => { + if (open) this.router.navigate(['documents', this.document.id]) + }) + } } diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html index 4a15fe976..1b0eae525 100644 --- a/src-ui/src/app/components/document-list/document-list.component.html +++ b/src-ui/src/app/components/document-list/document-list.component.html @@ -168,7 +168,7 @@ </ng-container> </td> <td> - <a routerLink="/documents/{{d.id}}" title="Edit document" style="overflow-wrap: anywhere;">{{d.title | documentTitle}}</a> + <a (click)="clickEdit(d.id)" title="Edit document" style="overflow-wrap: anywhere;">{{d.title | documentTitle}}</a> <app-tag [tag]="t" *ngFor="let t of d.tags$ | async" class="ms-1" clickable="true" linkTitle="Filter by tag" (click)="clickTag(t.id);$event.stopPropagation()"></app-tag> </td> <td class="d-none d-xl-table-cell"> diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index 01c2bee34..3d6db5731 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -20,6 +20,7 @@ import { } from 'src/app/directives/sortable.directive' import { ConsumerStatusService } from 'src/app/services/consumer-status.service' import { DocumentListViewService } from 'src/app/services/document-list-view.service' +import { OpenDocumentsService } from 'src/app/services/open-documents.service' import { filterRulesFromQueryParams, QueryParamsService, @@ -47,7 +48,8 @@ export class DocumentListComponent implements OnInit, OnDestroy, AfterViewInit { private toastService: ToastService, private modalService: NgbModal, private consumerStatusService: ConsumerStatusService, - private queryParamsService: QueryParamsService + private queryParamsService: QueryParamsService, + private openDocumentsService: OpenDocumentsService ) {} @ViewChild('filterEditor') @@ -245,6 +247,15 @@ export class DocumentListComponent implements OnInit, OnDestroy, AfterViewInit { else this.list.selectRangeTo(document) } + clickEdit(doc: PaperlessDocument) { + this.openDocumentsService + .openDocument(doc) + .pipe(first()) + .subscribe((open) => { + if (open) this.router.navigate(['documents', doc.id]) + }) + } + clickTag(tagID: number) { this.list.selectNone() setTimeout(() => { diff --git a/src-ui/src/app/services/open-documents.service.ts b/src-ui/src/app/services/open-documents.service.ts index 5297a38bf..37e29cd6e 100644 --- a/src-ui/src/app/services/open-documents.service.ts +++ b/src-ui/src/app/services/open-documents.service.ts @@ -55,14 +55,24 @@ export class OpenDocumentsService { return this.openDocuments.find((d) => d.id == id) } - openDocument(doc: PaperlessDocument) { + openDocument(doc: PaperlessDocument): Observable<boolean> { if (this.openDocuments.find((d) => d.id == doc.id) == null) { - this.openDocuments.unshift(doc) - if (this.openDocuments.length > this.MAX_OPEN_DOCUMENTS) { - this.openDocuments.pop() + if (this.openDocuments.length == this.MAX_OPEN_DOCUMENTS) { + const docToRemove = this.openDocuments[this.MAX_OPEN_DOCUMENTS - 1] + const closeObservable = this.closeDocument(docToRemove) + closeObservable.pipe(first()).subscribe((closed) => { + if (closed) { + this.openDocuments.unshift(doc) + this.save() + } + }) + return closeObservable + } else { + this.openDocuments.unshift(doc) + this.save() } - this.save() } + return of(true) } setDirty(documentId: number, dirty: boolean) { @@ -82,7 +92,11 @@ export class OpenDocumentsService { backdrop: 'static', }) modal.componentInstance.title = $localize`Unsaved Changes` - modal.componentInstance.messageBold = $localize`You have unsaved changes.` + modal.componentInstance.messageBold = + $localize`You have unsaved changes to the document` + + ' "' + + doc.title + + '"' modal.componentInstance.message = $localize`Are you sure you want to close this document?` modal.componentInstance.btnClass = 'btn-warning' modal.componentInstance.btnCaption = $localize`Close document` From d0f70c8f18b2991af63cddbecacad7d9de495b6d Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 15 May 2022 23:42:41 -0700 Subject: [PATCH 043/291] Update messages.xlf --- src-ui/messages.xlf | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index dd388c374..0c9ca23e0 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -368,7 +368,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">69</context> + <context context-type="linenumber">68</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/manage/management-list/management-list.component.html</context> @@ -1913,14 +1913,14 @@ <source>View "<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>" saved successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">198</context> + <context context-type="linenumber">197</context> </context-group> </trans-unit> <trans-unit id="6837554170707123455" datatype="html"> <source>View "<x id="PH" equiv-text="savedView.name"/>" created successfully.</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context> - <context context-type="linenumber">228</context> + <context context-type="linenumber">227</context> </context-group> </trans-unit> <trans-unit id="6849725902312323996" datatype="html"> @@ -2651,11 +2651,11 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/open-documents.service.ts</context> - <context context-type="linenumber">84</context> + <context context-type="linenumber">111</context> </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/open-documents.service.ts</context> - <context context-type="linenumber">107</context> + <context context-type="linenumber">138</context> </context-group> </trans-unit> <trans-unit id="2573823578527613511" datatype="html"> @@ -2666,11 +2666,7 @@ </context-group> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/open-documents.service.ts</context> - <context context-type="linenumber">85</context> - </context-group> - <context-group purpose="location"> - <context context-type="sourcefile">src/app/services/open-documents.service.ts</context> - <context context-type="linenumber">108</context> + <context context-type="linenumber">139</context> </context-group> </trans-unit> <trans-unit id="3305084982600522070" datatype="html"> @@ -2803,32 +2799,39 @@ <context context-type="linenumber">27</context> </context-group> </trans-unit> + <trans-unit id="5523607037798226031" datatype="html"> + <source>You have unsaved changes to the document</source> + <context-group purpose="location"> + <context context-type="sourcefile">src/app/services/open-documents.service.ts</context> + <context context-type="linenumber">113</context> + </context-group> + </trans-unit> <trans-unit id="2089045849587358256" datatype="html"> <source>Are you sure you want to close this document?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/open-documents.service.ts</context> - <context context-type="linenumber">86</context> + <context context-type="linenumber">117</context> </context-group> </trans-unit> <trans-unit id="2885986061416655600" datatype="html"> <source>Close document</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/open-documents.service.ts</context> - <context context-type="linenumber">88</context> + <context context-type="linenumber">119</context> </context-group> </trans-unit> <trans-unit id="6755718693176327396" datatype="html"> <source>Are you sure you want to close all documents?</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/open-documents.service.ts</context> - <context context-type="linenumber">109</context> + <context context-type="linenumber">140</context> </context-group> </trans-unit> <trans-unit id="4215561719980781894" datatype="html"> <source>Close documents</source> <context-group purpose="location"> <context context-type="sourcefile">src/app/services/open-documents.service.ts</context> - <context context-type="linenumber">111</context> + <context context-type="linenumber">142</context> </context-group> </trans-unit> <trans-unit id="3553216189604488439" datatype="html"> From c1fb277f253f54ef917d17b3fa507a78977bf93d Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 15 May 2022 23:25:46 -0700 Subject: [PATCH 044/291] let OpenDocumentsService handle nav --- .../saved-view-widget.component.html | 2 +- .../saved-view-widget.component.ts | 13 ++----- .../document-detail.component.ts | 2 +- .../document-card-large.component.html | 2 +- .../document-card-large.component.ts | 14 +------- .../document-card-small.component.html | 2 +- .../document-card-small.component.ts | 15 ++------ .../document-list.component.html | 2 +- .../document-list/document-list.component.ts | 16 ++------- .../app/services/open-documents.service.ts | 35 ++++++++++++++----- 10 files changed, 38 insertions(+), 65 deletions(-) diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html index eb9a136ab..50d064c37 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html @@ -11,7 +11,7 @@ </tr> </thead> <tbody> - <tr *ngFor="let doc of documents" (click)="clickDoc(doc)"> + <tr *ngFor="let doc of documents" (click)="openDocumentsService.openDocument(doc)"> <td>{{doc.created | customDate}}</td> <td>{{doc.title | documentTitle}}<app-tag [tag]="t" *ngFor="let t of doc.tags$ | async" class="ms-1" (click)="clickTag(t); $event.stopPropagation();"></app-tag></td> </tr> diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts index 89db3ef81..94e0c4052 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core' import { Router } from '@angular/router' -import { first, Subscription } from 'rxjs' +import { Subscription } from 'rxjs' import { PaperlessDocument } from 'src/app/data/paperless-document' import { PaperlessSavedView } from 'src/app/data/paperless-saved-view' import { ConsumerStatusService } from 'src/app/services/consumer-status.service' @@ -23,7 +23,7 @@ export class SavedViewWidgetComponent implements OnInit, OnDestroy { private router: Router, private queryParamsService: QueryParamsService, private consumerStatusService: ConsumerStatusService, - private openDocumentsService: OpenDocumentsService + public openDocumentsService: OpenDocumentsService ) {} @Input() @@ -72,15 +72,6 @@ export class SavedViewWidgetComponent implements OnInit, OnDestroy { } } - clickDoc(doc: PaperlessDocument) { - this.openDocumentsService - .openDocument(doc) - .pipe(first()) - .subscribe((open) => { - if (open) this.router.navigate(['documents', doc.id]) - }) - } - clickTag(tag: PaperlessTag) { this.queryParamsService.navigateWithFilterRules([ { rule_type: FILTER_HAS_TAGS_ALL, value: tag.id.toString() }, diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts index 4d66ea384..6f1614e5f 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.ts @@ -204,7 +204,7 @@ export class DocumentDetailComponent this.openDocumentService.getOpenDocument(this.documentId) ) } else { - this.openDocumentService.openDocument(doc) + this.openDocumentService.openDocument(doc, false) this.updateComponent(doc) } diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html index d0080f0ce..5eb4a97dd 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html @@ -37,7 +37,7 @@ <use xlink:href="assets/bootstrap-icons.svg#diagram-3"/> </svg> <span class="d-none d-md-inline" i18n>More like this</span> </a> - <a (click)="clickEdit()" class="btn btn-sm btn-outline-secondary"> + <a (click)="openDocumentsService.openDocument(document)" class="btn btn-sm btn-outline-secondary"> <svg class="sidebaricon" fill="currentColor" class="sidebaricon"> <use xlink:href="assets/bootstrap-icons.svg#pencil"/> </svg> <span class="d-none d-md-inline" i18n>Edit</span> diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts index 8eff2e491..061a0e681 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts @@ -14,8 +14,6 @@ import { } from 'src/app/services/settings.service' import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' import { OpenDocumentsService } from 'src/app/services/open-documents.service' -import { Router } from '@angular/router' -import { first } from 'rxjs' @Component({ selector: 'app-document-card-large', @@ -29,8 +27,7 @@ export class DocumentCardLargeComponent implements OnInit { constructor( private documentService: DocumentService, private settingsService: SettingsService, - private openDocumentsService: OpenDocumentsService, - private router: Router + public openDocumentsService: OpenDocumentsService ) {} @Input() @@ -121,13 +118,4 @@ export class DocumentCardLargeComponent implements OnInit { get contentTrimmed() { return this.document.content.substr(0, 500) } - - clickEdit() { - this.openDocumentsService - .openDocument(this.document) - .pipe(first()) - .subscribe((open) => { - if (open) this.router.navigate(['documents', this.document.id]) - }) - } } diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html index 7844ce419..6c68cc26f 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html @@ -63,7 +63,7 @@ </div> <div class="d-flex justify-content-between align-items-center"> <div class="btn-group w-100"> - <a (click)="clickEdit()" class="btn btn-sm btn-outline-secondary" title="Edit" i18n-title> + <a (click)="openDocumentsService.openDocument(document)" class="btn btn-sm btn-outline-secondary" title="Edit" i18n-title> <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-pencil" fill="currentColor" xmlns="http://www.w3.org/2000/svg"> <path fill-rule="evenodd" d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5L13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175l-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z"/> </svg> diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts index c7fff39b5..c166b42cb 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts @@ -6,7 +6,7 @@ import { Output, ViewChild, } from '@angular/core' -import { first, map } from 'rxjs/operators' +import { map } from 'rxjs/operators' import { PaperlessDocument } from 'src/app/data/paperless-document' import { DocumentService } from 'src/app/services/rest/document.service' import { @@ -15,7 +15,6 @@ import { } from 'src/app/services/settings.service' import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' import { OpenDocumentsService } from 'src/app/services/open-documents.service' -import { Router } from '@angular/router' @Component({ selector: 'app-document-card-small', @@ -29,8 +28,7 @@ export class DocumentCardSmallComponent implements OnInit { constructor( private documentService: DocumentService, private settingsService: SettingsService, - private openDocumentsService: OpenDocumentsService, - private router: Router + public openDocumentsService: OpenDocumentsService ) {} @Input() @@ -113,13 +111,4 @@ export class DocumentCardSmallComponent implements OnInit { mouseLeaveCard() { this.popover.close() } - - clickEdit() { - this.openDocumentsService - .openDocument(this.document) - .pipe(first()) - .subscribe((open) => { - if (open) this.router.navigate(['documents', this.document.id]) - }) - } } diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html index 1b0eae525..aa43243fc 100644 --- a/src-ui/src/app/components/document-list/document-list.component.html +++ b/src-ui/src/app/components/document-list/document-list.component.html @@ -168,7 +168,7 @@ </ng-container> </td> <td> - <a (click)="clickEdit(d.id)" title="Edit document" style="overflow-wrap: anywhere;">{{d.title | documentTitle}}</a> + <a (click)="openDocumentsService.openDocument(d)" title="Edit document" style="overflow-wrap: anywhere;">{{d.title | documentTitle}}</a> <app-tag [tag]="t" *ngFor="let t of d.tags$ | async" class="ms-1" clickable="true" linkTitle="Filter by tag" (click)="clickTag(t.id);$event.stopPropagation()"></app-tag> </td> <td class="d-none d-xl-table-cell"> diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index 3d6db5731..8cf6c3848 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -21,10 +21,7 @@ import { import { ConsumerStatusService } from 'src/app/services/consumer-status.service' import { DocumentListViewService } from 'src/app/services/document-list-view.service' import { OpenDocumentsService } from 'src/app/services/open-documents.service' -import { - filterRulesFromQueryParams, - QueryParamsService, -} from 'src/app/services/query-params.service' +import { QueryParamsService } from 'src/app/services/query-params.service' import { DOCUMENT_SORT_FIELDS, DOCUMENT_SORT_FIELDS_FULLTEXT, @@ -49,7 +46,7 @@ export class DocumentListComponent implements OnInit, OnDestroy, AfterViewInit { private modalService: NgbModal, private consumerStatusService: ConsumerStatusService, private queryParamsService: QueryParamsService, - private openDocumentsService: OpenDocumentsService + public openDocumentsService: OpenDocumentsService ) {} @ViewChild('filterEditor') @@ -247,15 +244,6 @@ export class DocumentListComponent implements OnInit, OnDestroy, AfterViewInit { else this.list.selectRangeTo(document) } - clickEdit(doc: PaperlessDocument) { - this.openDocumentsService - .openDocument(doc) - .pipe(first()) - .subscribe((open) => { - if (open) this.router.navigate(['documents', doc.id]) - }) - } - clickTag(tagID: number) { this.list.selectNone() setTimeout(() => { diff --git a/src-ui/src/app/services/open-documents.service.ts b/src-ui/src/app/services/open-documents.service.ts index 37e29cd6e..d7746d261 100644 --- a/src-ui/src/app/services/open-documents.service.ts +++ b/src-ui/src/app/services/open-documents.service.ts @@ -6,6 +6,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap' import { ConfirmDialogComponent } from 'src/app/components/common/confirm-dialog/confirm-dialog.component' import { Observable, Subject, of } from 'rxjs' import { first } from 'rxjs/operators' +import { Router } from '@angular/router' @Injectable({ providedIn: 'root', @@ -15,7 +16,8 @@ export class OpenDocumentsService { constructor( private documentService: DocumentService, - private modalService: NgbModal + private modalService: NgbModal, + private router: Router ) { if (sessionStorage.getItem(OPEN_DOCUMENT_SERVICE.DOCUMENTS)) { try { @@ -55,26 +57,41 @@ export class OpenDocumentsService { return this.openDocuments.find((d) => d.id == id) } - openDocument(doc: PaperlessDocument): Observable<boolean> { + openDocument( + doc: PaperlessDocument, + navigate: boolean = true + ): Observable<boolean> { if (this.openDocuments.find((d) => d.id == doc.id) == null) { if (this.openDocuments.length == this.MAX_OPEN_DOCUMENTS) { + // at max, ensure changes arent lost const docToRemove = this.openDocuments[this.MAX_OPEN_DOCUMENTS - 1] const closeObservable = this.closeDocument(docToRemove) closeObservable.pipe(first()).subscribe((closed) => { - if (closed) { - this.openDocuments.unshift(doc) - this.save() - } + if (closed) this.finishOpenDocument(doc, navigate) }) return closeObservable } else { - this.openDocuments.unshift(doc) - this.save() + // not at max + this.finishOpenDocument(doc, navigate) + } + } else { + // doc is open, just maybe navigate + if (navigate) { + this.router.navigate(['documents', doc.id]) } } return of(true) } + private finishOpenDocument(doc: PaperlessDocument, navigate: boolean) { + this.openDocuments.unshift(doc) + this.dirtyDocuments.delete(doc.id) + this.save() + if (navigate) { + this.router.navigate(['documents', doc.id]) + } + } + setDirty(documentId: number, dirty: boolean) { if (dirty) this.dirtyDocuments.add(documentId) else this.dirtyDocuments.delete(documentId) @@ -96,7 +113,7 @@ export class OpenDocumentsService { $localize`You have unsaved changes to the document` + ' "' + doc.title + - '"' + '".' modal.componentInstance.message = $localize`Are you sure you want to close this document?` modal.componentInstance.btnClass = 'btn-warning' modal.componentInstance.btnCaption = $localize`Close document` From 78cb3430e02cc3bcac6d72170df02bdfbe19ca46 Mon Sep 17 00:00:00 2001 From: Florian Brandes <florian.brandes@posteo.de> Date: Mon, 16 May 2022 17:29:29 +0200 Subject: [PATCH 045/291] fixes #949: change to MIME detection for files Signed-off-by: Florian Brandes <florian.brandes@posteo.de> --- src/documents/tasks.py | 35 +++++++++++++++------- src/documents/tests/test_tasks.py | 50 ++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 11 deletions(-) diff --git a/src/documents/tasks.py b/src/documents/tasks.py index 10a1ad671..7fd1f5672 100644 --- a/src/documents/tasks.py +++ b/src/documents/tasks.py @@ -4,6 +4,7 @@ import shutil import tempfile from typing import List # for type hinting. Can be removed, if only Python >3.8 is used +import magic import tqdm from asgiref.sync import async_to_sync from channels.layers import get_channel_layer @@ -95,19 +96,33 @@ def barcode_reader(image) -> List[str]: return barcodes +def get_file_type(path: str) -> str: + """ + Determines the file type, based on MIME type. + + Returns the MIME type. + """ + mime_type = magic.from_file(path, mime=True) + logger.debug(f"Detected mime type: {mime_type}") + return mime_type + + def convert_from_tiff_to_pdf(filepath: str) -> str: """ - converts a given TIFF image file to pdf into a temp. directory. + converts a given TIFF image file to pdf into a temporary directory. + Returns the new pdf file. """ file_name = os.path.splitext(os.path.basename(filepath))[0] - file_extension = os.path.splitext(os.path.basename(filepath))[1].lower() + mime_type = get_file_type(filepath) tempdir = tempfile.mkdtemp(prefix="paperless-", dir=settings.SCRATCH_DIR) # use old file name with pdf extension - if file_extension == ".tif" or file_extension == ".tiff": + if mime_type == "image/tiff": newpath = os.path.join(tempdir, file_name + ".pdf") else: - logger.warning(f"Cannot convert from {str(file_extension)} to pdf.") + logger.warning( + f"Cannot convert mime type {str(mime_type)} from {str(filepath)} to pdf.", + ) return None with Image.open(filepath) as image: images = [] @@ -231,17 +246,17 @@ def consume_file( document_list = [] converted_tiff = None if settings.CONSUMER_BARCODE_TIFF_SUPPORT: - supported_extensions = [".pdf", ".tiff", ".tif"] + supported_mime = ["image/tiff", "application/pdf"] else: - supported_extensions = [".pdf"] - file_extension = os.path.splitext(os.path.basename(path))[1].lower() - if file_extension not in supported_extensions: + supported_mime = ["application/pdf"] + mime_type = get_file_type(path) + if mime_type not in supported_mime: # if not supported, skip this routine logger.warning( - f"Unsupported file format for barcode reader: {str(file_extension)}", + f"Unsupported file format for barcode reader: {str(mime_type)}", ) else: - if file_extension in {".tif", ".tiff"}: + if mime_type == "image/tiff": file_to_process = convert_from_tiff_to_pdf(path) else: file_to_process = path diff --git a/src/documents/tests/test_tasks.py b/src/documents/tests/test_tasks.py index 7e5381def..41b9380db 100644 --- a/src/documents/tests/test_tasks.py +++ b/src/documents/tests/test_tasks.py @@ -204,6 +204,34 @@ class TestTasks(DirectoriesMixin, TestCase): img = Image.open(test_file) self.assertEqual(tasks.barcode_reader(img), ["CUSTOM BARCODE"]) + def test_get_mime_type(self): + tiff_file = os.path.join( + os.path.dirname(__file__), + "samples", + "simple.tiff", + ) + pdf_file = os.path.join( + os.path.dirname(__file__), + "samples", + "simple.pdf", + ) + png_file = os.path.join( + os.path.dirname(__file__), + "samples", + "barcodes", + "barcode-128-custom.png", + ) + tiff_file_no_extension = os.path.join(settings.SCRATCH_DIR, "testfile1") + pdf_file_no_extension = os.path.join(settings.SCRATCH_DIR, "testfile2") + shutil.copy(tiff_file, tiff_file_no_extension) + shutil.copy(pdf_file, pdf_file_no_extension) + + self.assertEqual(tasks.get_file_type(tiff_file), "image/tiff") + self.assertEqual(tasks.get_file_type(pdf_file), "application/pdf") + self.assertEqual(tasks.get_file_type(tiff_file_no_extension), "image/tiff") + self.assertEqual(tasks.get_file_type(pdf_file_no_extension), "application/pdf") + self.assertEqual(tasks.get_file_type(png_file), "image/png") + def test_convert_from_tiff_to_pdf(self): test_file = os.path.join( os.path.dirname(__file__), @@ -469,7 +497,7 @@ class TestTasks(DirectoriesMixin, TestCase): self.assertEqual( cm.output, [ - "WARNING:paperless.tasks:Unsupported file format for barcode reader: .jpg", + "WARNING:paperless.tasks:Unsupported file format for barcode reader: image/jpeg", ], ) m.assert_called_once() @@ -481,6 +509,26 @@ class TestTasks(DirectoriesMixin, TestCase): self.assertIsNone(kwargs["override_document_type_id"]) self.assertIsNone(kwargs["override_tag_ids"]) + @override_settings( + CONSUMER_ENABLE_BARCODES=True, + CONSUMER_BARCODE_TIFF_SUPPORT=True, + ) + def test_consume_barcode_supported_no_extension_file(self): + """ + This test assumes barcode and TIFF support are enabled and + the user uploads a supported image file, but without extension + """ + test_file = os.path.join( + os.path.dirname(__file__), + "samples", + "barcodes", + "patch-code-t-middle.tiff", + ) + dst = os.path.join(settings.SCRATCH_DIR, "patch-code-t-middle") + shutil.copy(test_file, dst) + + self.assertEqual(tasks.consume_file(dst), "File successfully split") + @mock.patch("documents.tasks.sanity_checker.check_sanity") def test_sanity_check_success(self, m): m.return_value = SanityCheckMessages() From 465d2cdf85216af83f65838831306498ad179f20 Mon Sep 17 00:00:00 2001 From: Trenton Holmes <holmes.trenton@gmail.com> Date: Mon, 16 May 2022 16:05:40 -0700 Subject: [PATCH 046/291] Manually updates dependency files --- Pipfile.lock | 306 +++++++++++++++++++++++------------------------ requirements.txt | 21 ++-- 2 files changed, 158 insertions(+), 169 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index f9c5a9bdd..b81373e4a 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -28,11 +28,11 @@ }, "anyio": { "hashes": [ - "sha256:a0aeffe2fb1fdf374a8e4b471444f0f3ac4fb9f5a5b542b48824475e0042a5a6", - "sha256:b5fa16c5ff93fa1046f2eeb5bbff2dad4d3514d6cda61d02816dba34fa8c3c2e" + "sha256:413adf95f93886e442aea925f3ee43baa5a765a64a0f52c6081894f9992fdd0b", + "sha256:cb29b9c70620506a9a8f87a309591713446953302d7d995344d0d7c6c0c9a7be" ], "markers": "python_full_version >= '3.6.2'", - "version": "==3.5.0" + "version": "==3.6.1" }, "arrow": { "hashes": [ @@ -44,11 +44,11 @@ }, "asgiref": { "hashes": [ - "sha256:45a429524fba18aba9d512498b19d220c4d628e75b40cf5c627524dbaebc5cc1", - "sha256:fddeea3c53fa99d0cdb613c3941cc6e52d822491fc2753fba25768fb5bf4e865" + "sha256:1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4", + "sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424" ], "markers": "python_version >= '3.7'", - "version": "==3.5.1" + "version": "==3.5.2" }, "async-timeout": { "hashes": [ @@ -189,20 +189,12 @@ "index": "pypi", "version": "==3.4.0" }, - "chardet": { - "hashes": [ - "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa", - "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5" - ], - "markers": "python_version >= '3.1'", - "version": "==4.0.0" - }, "charset-normalizer": { "hashes": [ "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597", "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df" ], - "markers": "python_version >= '3'", + "markers": "python_version >= '3.5'", "version": "==2.0.12" }, "click": { @@ -238,31 +230,29 @@ }, "cryptography": { "hashes": [ - "sha256:093cb351031656d3ee2f4fa1be579a8c69c754cf874206be1d4cf3b542042804", - "sha256:0cc20f655157d4cfc7bada909dc5cc228211b075ba8407c46467f63597c78178", - "sha256:1b9362d34363f2c71b7853f6251219298124aa4cc2075ae2932e64c91a3e2717", - "sha256:1f3bfbd611db5cb58ca82f3deb35e83af34bb8cf06043fa61500157d50a70982", - "sha256:2bd1096476aaac820426239ab534b636c77d71af66c547b9ddcd76eb9c79e004", - "sha256:31fe38d14d2e5f787e0aecef831457da6cec68e0bb09a35835b0b44ae8b988fe", - "sha256:3b8398b3d0efc420e777c40c16764d6870bcef2eb383df9c6dbb9ffe12c64452", - "sha256:3c81599befb4d4f3d7648ed3217e00d21a9341a9a688ecdd615ff72ffbed7336", - "sha256:419c57d7b63f5ec38b1199a9521d77d7d1754eb97827bbb773162073ccd8c8d4", - "sha256:46f4c544f6557a2fefa7ac8ac7d1b17bf9b647bd20b16decc8fbcab7117fbc15", - "sha256:471e0d70201c069f74c837983189949aa0d24bb2d751b57e26e3761f2f782b8d", - "sha256:59b281eab51e1b6b6afa525af2bd93c16d49358404f814fe2c2410058623928c", - "sha256:731c8abd27693323b348518ed0e0705713a36d79fdbd969ad968fbef0979a7e0", - "sha256:95e590dd70642eb2079d280420a888190aa040ad20f19ec8c6e097e38aa29e06", - "sha256:a68254dd88021f24a68b613d8c51d5c5e74d735878b9e32cc0adf19d1f10aaf9", - "sha256:a7d5137e556cc0ea418dca6186deabe9129cee318618eb1ffecbd35bee55ddc1", - "sha256:aeaba7b5e756ea52c8861c133c596afe93dd716cbcacae23b80bc238202dc023", - "sha256:dc26bb134452081859aa21d4990474ddb7e863aa39e60d1592800a8865a702de", - "sha256:e53258e69874a306fcecb88b7534d61820db8a98655662a3dd2ec7f1afd9132f", - "sha256:ef15c2df7656763b4ff20a9bc4381d8352e6640cfeb95c2972c38ef508e75181", - "sha256:f224ad253cc9cea7568f49077007d2263efa57396a2f2f78114066fd54b5c68e", - "sha256:f8ec91983e638a9bcd75b39f1396e5c0dc2330cbd9ce4accefe68717e6779e0a" + "sha256:0a3bf09bb0b7a2c93ce7b98cb107e9170a90c51a0162a20af1c61c765b90e60b", + "sha256:1f64a62b3b75e4005df19d3b5235abd43fa6358d5516cfc43d87aeba8d08dd51", + "sha256:32db5cc49c73f39aac27574522cecd0a4bb7384e71198bc65a0d23f901e89bb7", + "sha256:4881d09298cd0b669bb15b9cfe6166f16fc1277b4ed0d04a22f3d6430cb30f1d", + "sha256:4e2dddd38a5ba733be6a025a1475a9f45e4e41139d1321f412c6b360b19070b6", + "sha256:53e0285b49fd0ab6e604f4c5d9c5ddd98de77018542e88366923f152dbeb3c29", + "sha256:70f8f4f7bb2ac9f340655cbac89d68c527af5bb4387522a8413e841e3e6628c9", + "sha256:7b2d54e787a884ffc6e187262823b6feb06c338084bbe80d45166a1cb1c6c5bf", + "sha256:7be666cc4599b415f320839e36367b273db8501127b38316f3b9f22f17a0b815", + "sha256:8241cac0aae90b82d6b5c443b853723bcc66963970c67e56e71a2609dc4b5eaf", + "sha256:82740818f2f240a5da8dfb8943b360e4f24022b093207160c77cadade47d7c85", + "sha256:8897b7b7ec077c819187a123174b645eb680c13df68354ed99f9b40a50898f77", + "sha256:c2c5250ff0d36fd58550252f54915776940e4e866f38f3a7866d92b32a654b86", + "sha256:ca9f686517ec2c4a4ce930207f75c00bf03d94e5063cbc00a1dc42531511b7eb", + "sha256:d2b3d199647468d410994dbeb8cec5816fb74feb9368aedf300af709ef507e3e", + "sha256:da73d095f8590ad437cd5e9faf6628a218aa7c387e1fdf67b888b47ba56a17f0", + "sha256:e167b6b710c7f7bc54e67ef593f8731e1f45aa35f8a8a7b72d6e42ec76afd4b3", + "sha256:ea634401ca02367c1567f012317502ef3437522e2fc44a3ea1844de028fa4b84", + "sha256:ec6597aa85ce03f3e507566b8bcdf9da2227ec86c4266bd5e6ab4d9e0cc8dab2", + "sha256:f64b232348ee82f13aac22856515ce0195837f6968aeaa94a3d0353ea2ec06a6" ], "markers": "python_version >= '3.6'", - "version": "==37.0.2" + "version": "==36.0.2" }, "daphne": { "hashes": [ @@ -338,11 +328,11 @@ }, "filelock": { "hashes": [ - "sha256:9cd540a9352e432c7246a48fe4e8712b10acb1df2ad1f30e8c070b82ae1fed85", - "sha256:f8314284bfffbdcfa0ff3d7992b023d4c628ced6feb957351d4c48d059f56bc0" + "sha256:b795f1b42a61bbf8ec7113c341dad679d772567b936fbd1bf43c9a238e673e20", + "sha256:c7b5fdb219b398a5b28c8e4c1893ef5f98ece6a38c6ab2c22e26ec161556fed6" ], "index": "pypi", - "version": "==3.6.0" + "version": "==3.7.0" }, "fuzzywuzzy": { "extras": [ @@ -675,11 +665,11 @@ }, "ocrmypdf": { "hashes": [ - "sha256:0c1cc0a7596fa9da1bfde67141227eeb813aba5e954f88199eacc5f51f1d67d9", - "sha256:48bbdd5d15b76f34aa3a91910918e51f91bb3833b4e86da45f8542afda118404" + "sha256:1169e7acee4cb12d0d61ca1c2cf1f78250ed5d2d0e33fd68f58defbaf3770af7", + "sha256:d132a9e5dcd73a477f8bd89f15de2c4ae64b394ca296644971fcd004168ace9d" ], "index": "pypi", - "version": "==13.4.3" + "version": "==13.4.4" }, "packaging": { "hashes": [ @@ -707,44 +697,45 @@ }, "pdfminer.six": { "hashes": [ - "sha256:af0630f98a292bad4170f54e80f82ca81b916dd0b2c996437ec45c02f11d8762", - "sha256:eff2ce0abeaa4df94dc3461f70eab104487c7b4a2b3c7e9fd0aeec6c5f44d6a6" + "sha256:0960be95fe8724a4847f83d53d0331b890871f6035ba706841568caa2b541bf5", + "sha256:3d65c1a0f4a0465c709e191550ec77a684ebe0bcb562337ccbfb7aa228c52076" ], "index": "pypi", - "version": "==20220319" + "version": "==20220506" }, "pikepdf": { "hashes": [ - "sha256:101ec256a8d312c17decae52226cf32a3e7dc834583134300c2f4e60b70e6e91", - "sha256:12b5b3cfc649e2542576a7e55c11e245278f14f727f116904893e54329102867", - "sha256:1b8f68a75c0a6f6d4d102d0821365ae2aaa9ab635c6eb6c840569a56b1a266f4", - "sha256:1bef3512be59fe0f481375b7eb415ca51ee7c80555031401f5f17ee3392e4add", - "sha256:1d3141916dc9efc433fd22beba544f67a53a805800c3ff902baffa398ef4c85e", - "sha256:3052df8514d26b676c50e65afc49a1d260c43a08c322c75cc2592c10a9a5b26d", - "sha256:356d5554516a295fc10db3f25cfde4e92326f6d015da55d71b84f5ced2a07a5a", - "sha256:55330c24b8e04ee09f1bc514c2b6107bb03a5eeb0b74929a61100cd6be22ae29", - "sha256:553cf11933fdfe07fdd357ab40b9732db102e921b27c1065239308d42b7b858f", - "sha256:5626312990a894c5db3a269455f7eb98df5f59188dde1797c0e352d60fdf89af", - "sha256:59c24a65c94693ab4a7e92f4809f847b57461120256c083054e61c99c4952e84", - "sha256:607deb1181a7cf5369cf70edfc41574d46c0a17c0cac1f6234272bd4cb3487e4", - "sha256:60bdd49e6251f8c99989e6769d4ad29b209c1eaf88090f49d4b30fba98442e40", - "sha256:73a7cc3c42609e00393b9d4e1b9ee132f528060254a174bf18ef31a154be0386", - "sha256:75f1e2917b4d2d6573fe3d1c3b2ec70829b64515b2f723f5c3bebcdd65761e6c", - "sha256:92ca9191680eccc21697e9e9c218e600ab31e7c24f6125749738c10ae2dc7c07", - "sha256:9bcaf96e2f571f0fc7e3178cdf1bcca7c13e5c68128e8246031226d47ecf23f1", - "sha256:a8f3e2229e2683497fe4ccc4af06050c125160a11bb3562b6c4ddaee4d0cc5c5", - "sha256:c277066938ca0ddb2bfe75874ef8dd3aa259936fe15c4cf7d4282f89ba82ab3a", - "sha256:c532542a99757d9f41df0cf1fc8f64a044d0eb822822cc069c80be35731df275", - "sha256:dfa89bd86e01413531c1d7d201fb01f0e62b52ea926a8e8ca6f99f86ed761e95", - "sha256:e064010b733b0a2ec4ec97982cd2887f9025292f2d228c6d5e6eca9d84851e53", - "sha256:ea927afe7cb04cc7ade30b961f528ef53e8d9cf467dcc4639cf944fef872a1a1", - "sha256:f40703b6267aa43d7f72468fa0a3b505ffff74ece2a4c69cfd3c90e023c41381", - "sha256:f45cc4544bbd4c308a525a6bb8e2e29b3f849803ee557c6e35c684447f0a92e5", - "sha256:f8ccda5ee992c73f647bcd96c9aa30f5eb9e8a6c5bdd6e3dcb29ebbffbe01a69", - "sha256:fe386d93345c9b5a9690f7a7bfb789a5ec5467c34402628e10bda8a4f5bac73e" + "sha256:00e66dcb803cc4f5348ae117287b85bd940744be38c111a88503843b0787ddfe", + "sha256:0e392c32e1f82f8cb4e891cadaf137c8cbdb1e88b4714eeb3dcd2cc6ee227575", + "sha256:143eef60457c828874000e11a34bc79c348544c7453f89e09ad9697b7102a108", + "sha256:18907145f6d2772fc77b1ea8d4eb3971dbd8e2594698764a64c22c1c43645eee", + "sha256:210cea8dc30bc9e668de1a380c83a31ec1b0edf8a2f91334ac99b23ec74b01e1", + "sha256:270b4805e00f4599108231c4342701574de47b1c7df3573c2d80aed176dd6843", + "sha256:35e0a82fd01e3fd57de473b65a56231e99cf17aaa632de0bafc02df5d25fd443", + "sha256:397dc297ec4390a67f920466b868cfd100b9be6bc12ab4134f455226c3d1ddef", + "sha256:44c909f2e16fe4646a3175273fad60e102750383c448a01ca8073b05cc086ffa", + "sha256:4f4dcc07d9222faa976b9ea6e21a30f6669cd8152cd2fa5e7a898d325da059c2", + "sha256:524785518325fac3cda133b339ff4cd56687cefc4a43b14aef102f06fabc0ffa", + "sha256:7a2aaaa6968b7268c97dc6beffc5be5148470f9675fcb940681a30ca68f00f6d", + "sha256:84915fcff1c28bfba4caa9df0a72a53264e1218b17f0870744aad43a477a13c0", + "sha256:85965ff4f42542998db1daa641f33b9b7a6a03a0e7531a76c06a185d8bf6653b", + "sha256:85ce51ac8354c1d6912edcb3b018e39fc9678cf1946087ef526d990eedf49756", + "sha256:8ce07b03affe29628f7babf25a54010f765f89d887a02e12393f365a8dc37d65", + "sha256:a074af7054206d91a70513269254b932e7ad244fed6cfb37c590cf7b665dcd53", + "sha256:aadb3e93b10299c8d3a6c5366e507ccdded727fc22e5b7ebae61bcd6883774dc", + "sha256:afcd1d4a1c4b9c99226b6ce1ceb5132fa219b420e562984564a431bed7160949", + "sha256:b43c57f37cd6278dcb52d3bda7f482b1961c2eb8a5fc1127cabe941914a858a9", + "sha256:c34e4239661d2ddf23caa1c4256f636c866ce8069a5052a2bf8ee06e3cae22f3", + "sha256:d3015baf32d9a559c50aa5ff15ac7bf5d2733efa4d1996eb846fb289e3f5a0e4", + "sha256:d37aee5705ee23f28513f480749773495f88d72a9177de6c5af32b20a2ad1592", + "sha256:e1b7edde3d3599a23a283341f15a41943a5894308df623cf6e04ff58304bd4b3", + "sha256:e552419963bdc4adab4f5a912994de96ba2dfc313ce935d8b727a9e40d6ccd67", + "sha256:e5941c4c6e61895114cf0caff871e7b17ce9145822c5068b6c6f16114dd1267b", + "sha256:f808eadb454adc6f4fb72b651eaa41a2926812e2b0306e2c320e5e3181440e49", + "sha256:ffa2b7d68fe45202895e74ba660619172e8528950905bee0ec862529760c4246" ], "index": "pypi", - "version": "==5.1.2" + "version": "==5.1.3" }, "pillow": { "hashes": [ @@ -875,11 +866,11 @@ }, "pyparsing": { "hashes": [ - "sha256:7bf433498c016c4314268d95df76c81b842a4cb2b276fa3312cfb1e1d85f6954", - "sha256:ef7b523f6356f763771559412c0d7134753f037822dad1b16945b7b846f7ad06" + "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb", + "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc" ], "markers": "python_full_version >= '3.6.8'", - "version": "==3.0.8" + "version": "==3.0.9" }, "python-dateutil": { "hashes": [ @@ -1333,33 +1324,34 @@ }, "watchdog": { "hashes": [ - "sha256:03b43d583df0f18782a0431b6e9e9965c5b3f7cf8ec36a00b930def67942c385", - "sha256:0908bb50f6f7de54d5d31ec3da1654cb7287c6b87bce371954561e6de379d690", - "sha256:0b4a1fe6201c6e5a1926f5767b8664b45f0fcb429b62564a41f490ff1ce1dc7a", - "sha256:177bae28ca723bc00846466016d34f8c1d6a621383b6caca86745918d55c7383", - "sha256:19b36d436578eb437e029c6b838e732ed08054956366f6dd11875434a62d2b99", - "sha256:1d1cf7dfd747dec519486a98ef16097e6c480934ef115b16f18adb341df747a4", - "sha256:1e877c70245424b06c41ac258023ea4bd0c8e4ff15d7c1368f17cd0ae6e351dd", - "sha256:340b875aecf4b0e6672076a6f05cfce6686935559bb6d34cebedee04126a9566", - "sha256:351e09b6d9374d5bcb947e6ac47a608ec25b9d70583e9db00b2fcdb97b00b572", - "sha256:3fd47815353be9c44eebc94cc28fe26b2b0c5bd889dafc4a5a7cbdf924143480", - "sha256:49639865e3db4be032a96695c98ac09eed39bbb43fe876bb217da8f8101689a6", - "sha256:4d0e98ac2e8dd803a56f4e10438b33a2d40390a72750cff4939b4b274e7906fa", - "sha256:6e6ae29b72977f2e1ee3d0b760d7ee47896cb53e831cbeede3e64485e5633cc8", - "sha256:7f14ce6adea2af1bba495acdde0e510aecaeb13b33f7bd2f6324e551b26688ca", - "sha256:81982c7884aac75017a6ecc72f1a4fedbae04181a8665a34afce9539fc1b3fab", - "sha256:81a5861d0158a7e55fe149335fb2bbfa6f48cbcbd149b52dbe2cd9a544034bbd", - "sha256:ae934e34c11aa8296c18f70bf66ed60e9870fcdb4cc19129a04ca83ab23e7055", - "sha256:b26e13e8008dcaea6a909e91d39b629a39635d1a8a7239dd35327c74f4388601", - "sha256:b3750ee5399e6e9c69eae8b125092b871ee9e2fcbd657a92747aea28f9056a5c", - "sha256:b61acffaf5cd5d664af555c0850f9747cc5f2baf71e54bbac164c58398d6ca7b", - "sha256:b9777664848160449e5b4260e0b7bc1ae0f6f4992a8b285db4ec1ef119ffa0e2", - "sha256:bdcbf75580bf4b960fb659bbccd00123d83119619195f42d721e002c1621602f", - "sha256:d802d65262a560278cf1a65ef7cae4e2bc7ecfe19e5451349e4c67e23c9dc420", - "sha256:ed6d9aad09a2a948572224663ab00f8975fae242aa540509737bb4507133fa2d" + "sha256:036ed15f7cd656351bf4e17244447be0a09a61aaa92014332d50719fc5973bc0", + "sha256:0c520009b8cce79099237d810aaa19bc920941c268578436b62013b2f0102320", + "sha256:0fb60c7d31474b21acba54079ce9ff0136411183e9a591369417cddb1d7d00d7", + "sha256:156ec3a94695ea68cfb83454b98754af6e276031ba1ae7ae724dc6bf8973b92a", + "sha256:1ae17b6be788fb8e4d8753d8d599de948f0275a232416e16436363c682c6f850", + "sha256:1e5d0fdfaa265c29dc12621913a76ae99656cf7587d03950dfeb3595e5a26102", + "sha256:24dedcc3ce75e150f2a1d704661f6879764461a481ba15a57dc80543de46021c", + "sha256:2962628a8777650703e8f6f2593065884c602df7bae95759b2df267bd89b2ef5", + "sha256:47598fe6713fc1fee86b1ca85c9cbe77e9b72d002d6adeab9c3b608f8a5ead10", + "sha256:4978db33fc0934c92013ee163a9db158ec216099b69fce5aec790aba704da412", + "sha256:5e2e51c53666850c3ecffe9d265fc5d7351db644de17b15e9c685dd3cdcd6f97", + "sha256:676263bee67b165f16b05abc52acc7a94feac5b5ab2449b491f1a97638a79277", + "sha256:68dbe75e0fa1ba4d73ab3f8e67b21770fbed0651d32ce515cd38919a26873266", + "sha256:6d03149126864abd32715d4e9267d2754cede25a69052901399356ad3bc5ecff", + "sha256:6ddf67bc9f413791072e3afb466e46cc72c6799ba73dea18439b412e8f2e3257", + "sha256:746e4c197ec1083581bb1f64d07d1136accf03437badb5ff8fcb862565c193b2", + "sha256:7721ac736170b191c50806f43357407138c6748e4eb3e69b071397f7f7aaeedd", + "sha256:88ef3e8640ef0a64b7ad7394b0f23384f58ac19dd759da7eaa9bc04b2898943f", + "sha256:aa68d2d9a89d686fae99d28a6edf3b18595e78f5adf4f5c18fbfda549ac0f20c", + "sha256:b962de4d7d92ff78fb2dbc6a0cb292a679dea879a0eb5568911484d56545b153", + "sha256:ce7376aed3da5fd777483fe5ebc8475a440c6d18f23998024f832134b2938e7b", + "sha256:ddde157dc1447d8130cb5b8df102fad845916fe4335e3d3c3f44c16565becbb7", + "sha256:efcc8cbc1b43902571b3dce7ef53003f5b97fe4f275fe0489565fc6e2ebe3314", + "sha256:f9ee4c6bf3a1b2ed6be90a2d78f3f4bbd8105b6390c04a86eb48ed67bbfa0b0b", + "sha256:fed4de6e45a4f16e4046ea00917b4fe1700b97244e5d114f594b4a1b9de6bed8" ], "index": "pypi", - "version": "==2.1.7" + "version": "==2.1.8" }, "watchgod": { "hashes": [ @@ -1585,7 +1577,7 @@ "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597", "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df" ], - "markers": "python_version >= '3'", + "markers": "python_version >= '3.5'", "version": "==2.0.12" }, "click": { @@ -1597,54 +1589,52 @@ "version": "==8.1.3" }, "coverage": { - "extras": [ - "toml" - ], + "extras": [], "hashes": [ - "sha256:03e2a7826086b91ef345ff18742ee9fc47a6839ccd517061ef8fa1976e652ce9", - "sha256:07e6db90cd9686c767dcc593dff16c8c09f9814f5e9c51034066cad3373b914d", - "sha256:18d520c6860515a771708937d2f78f63cc47ab3b80cb78e86573b0a760161faf", - "sha256:1ebf730d2381158ecf3dfd4453fbca0613e16eaa547b4170e2450c9707665ce7", - "sha256:21b7745788866028adeb1e0eca3bf1101109e2dc58456cb49d2d9b99a8c516e6", - "sha256:26e2deacd414fc2f97dd9f7676ee3eaecd299ca751412d89f40bc01557a6b1b4", - "sha256:2c6dbb42f3ad25760010c45191e9757e7dce981cbfb90e42feef301d71540059", - "sha256:2fea046bfb455510e05be95e879f0e768d45c10c11509e20e06d8fcaa31d9e39", - "sha256:34626a7eee2a3da12af0507780bb51eb52dca0e1751fd1471d0810539cefb536", - "sha256:37d1141ad6b2466a7b53a22e08fe76994c2d35a5b6b469590424a9953155afac", - "sha256:46191097ebc381fbf89bdce207a6c107ac4ec0890d8d20f3360345ff5976155c", - "sha256:4dd8bafa458b5c7d061540f1ee9f18025a68e2d8471b3e858a9dad47c8d41903", - "sha256:4e21876082ed887baed0146fe222f861b5815455ada3b33b890f4105d806128d", - "sha256:58303469e9a272b4abdb9e302a780072c0633cdcc0165db7eec0f9e32f901e05", - "sha256:5ca5aeb4344b30d0bec47481536b8ba1181d50dbe783b0e4ad03c95dc1296684", - "sha256:68353fe7cdf91f109fc7d474461b46e7f1f14e533e911a2a2cbb8b0fc8613cf1", - "sha256:6f89d05e028d274ce4fa1a86887b071ae1755082ef94a6740238cd7a8178804f", - "sha256:7a15dc0a14008f1da3d1ebd44bdda3e357dbabdf5a0b5034d38fcde0b5c234b7", - "sha256:8bdde1177f2311ee552f47ae6e5aa7750c0e3291ca6b75f71f7ffe1f1dab3dca", - "sha256:8ce257cac556cb03be4a248d92ed36904a59a4a5ff55a994e92214cde15c5bad", - "sha256:8cf5cfcb1521dc3255d845d9dca3ff204b3229401994ef8d1984b32746bb45ca", - "sha256:8fbbdc8d55990eac1b0919ca69eb5a988a802b854488c34b8f37f3e2025fa90d", - "sha256:9548f10d8be799551eb3a9c74bbf2b4934ddb330e08a73320123c07f95cc2d92", - "sha256:96f8a1cb43ca1422f36492bebe63312d396491a9165ed3b9231e778d43a7fca4", - "sha256:9b27d894748475fa858f9597c0ee1d4829f44683f3813633aaf94b19cb5453cf", - "sha256:9baff2a45ae1f17c8078452e9e5962e518eab705e50a0aa8083733ea7d45f3a6", - "sha256:a2a8b8bcc399edb4347a5ca8b9b87e7524c0967b335fbb08a83c8421489ddee1", - "sha256:acf53bc2cf7282ab9b8ba346746afe703474004d9e566ad164c91a7a59f188a4", - "sha256:b0be84e5a6209858a1d3e8d1806c46214e867ce1b0fd32e4ea03f4bd8b2e3359", - "sha256:b31651d018b23ec463e95cf10070d0b2c548aa950a03d0b559eaa11c7e5a6fa3", - "sha256:b78e5afb39941572209f71866aa0b206c12f0109835aa0d601e41552f9b3e620", - "sha256:c76aeef1b95aff3905fb2ae2d96e319caca5b76fa41d3470b19d4e4a3a313512", - "sha256:dd035edafefee4d573140a76fdc785dc38829fe5a455c4bb12bac8c20cfc3d69", - "sha256:dd6fe30bd519694b356cbfcaca9bd5c1737cddd20778c6a581ae20dc8c04def2", - "sha256:e5f4e1edcf57ce94e5475fe09e5afa3e3145081318e5fd1a43a6b4539a97e518", - "sha256:ec6bc7fe73a938933d4178c9b23c4e0568e43e220aef9472c4f6044bfc6dd0f0", - "sha256:f1555ea6d6da108e1999b2463ea1003fe03f29213e459145e70edbaf3e004aaa", - "sha256:f5fa5803f47e095d7ad8443d28b01d48c0359484fec1b9d8606d0e3282084bc4", - "sha256:f7331dbf301b7289013175087636bbaf5b2405e57259dd2c42fdcc9fcc47325e", - "sha256:f9987b0354b06d4df0f4d3e0ec1ae76d7ce7cbca9a2f98c25041eb79eec766f1", - "sha256:fd9e830e9d8d89b20ab1e5af09b32d33e1a08ef4c4e14411e559556fd788e6b2" + "sha256:06f54765cdbce99901871d50fe9f41d58213f18e98b170a30ca34f47de7dd5e8", + "sha256:114944e6061b68a801c5da5427b9173a0dd9d32cd5fcc18a13de90352843737d", + "sha256:1414e8b124611bf4df8d77215bd32cba6e3425da8ce9c1f1046149615e3a9a31", + "sha256:2781c43bffbbec2b8867376d4d61916f5e9c4cc168232528562a61d1b4b01879", + "sha256:2ab88a01cd180b5640ccc9c47232e31924d5f9967ab7edd7e5c91c68eee47a69", + "sha256:338c417613f15596af9eb7a39353b60abec9d8ce1080aedba5ecee6a5d85f8d3", + "sha256:3401b0d2ed9f726fadbfa35102e00d1b3547b73772a1de5508ef3bdbcb36afe7", + "sha256:462105283de203df8de58a68c1bb4ba2a8a164097c2379f664fa81d6baf94b81", + "sha256:4cd696aa712e6cd16898d63cf66139dc70d998f8121ab558f0e1936396dbc579", + "sha256:4d06380e777dd6b35ee936f333d55b53dc4a8271036ff884c909cf6e94be8b6c", + "sha256:61f4fbf3633cb0713437291b8848634ea97f89c7e849c2be17a665611e433f53", + "sha256:6d4a6f30f611e657495cc81a07ff7aa8cd949144e7667c5d3e680d73ba7a70e4", + "sha256:6f5fee77ec3384b934797f1873758f796dfb4f167e1296dc00f8b2e023ce6ee9", + "sha256:75b5dbffc334e0beb4f6c503fb95e6d422770fd2d1b40a64898ea26d6c02742d", + "sha256:7835f76a081787f0ca62a53504361b3869840a1620049b56d803a8cb3a9eeea3", + "sha256:79bf405432428e989cad7b8bc60581963238f7645ae8a404f5dce90236cc0293", + "sha256:8329635c0781927a2c6ae068461e19674c564e05b86736ab8eb29c420ee7dc20", + "sha256:8586b177b4407f988731eb7f41967415b2197f35e2a6ee1a9b9b561f6323c8e9", + "sha256:892e7fe32191960da559a14536768a62e83e87bbb867e1b9c643e7e0fbce2579", + "sha256:91502bf27cbd5c83c95cfea291ef387469f2387508645602e1ca0fd8a4ba7548", + "sha256:93b16b08f94c92cab88073ffd185070cdcb29f1b98df8b28e6649145b7f2c90d", + "sha256:9c9441d57b0963cf8340268ad62fc83de61f1613034b79c2b1053046af0c5284", + "sha256:ad8f9068f5972a46d50fe5f32c09d6ee11da69c560fcb1b4c3baea246ca4109b", + "sha256:afb03f981fadb5aed1ac6e3dd34f0488e1a0875623d557b6fad09b97a942b38a", + "sha256:b5ba058610e8289a07db2a57bce45a1793ec0d3d11db28c047aae2aa1a832572", + "sha256:baa8be8aba3dd1e976e68677be68a960a633a6d44c325757aefaa4d66175050f", + "sha256:c06455121a089252b5943ea682187a4e0a5cf0a3fb980eb8e7ce394b144430a9", + "sha256:c1a9942e282cc9d3ed522cd3e3cab081149b27ea3bda72d6f61f84eaf88c1a63", + "sha256:c488db059848702aff30aa1d90ef87928d4e72e4f00717343800546fdbff0a94", + "sha256:cb5311d6ccbd22578c80028c5e292a7ab9adb91bd62c1982087fad75abe2e63d", + "sha256:cbe91bc84be4e5ef0b1480d15c7b18e29c73bdfa33e07d3725da7d18e1b0aff2", + "sha256:cc692c9ee18f0dd3214843779ba6b275ee4bb9b9a5745ba64265bce911aefd1a", + "sha256:cc972d829ad5ef4d4c5fcabd2bbe2add84ce8236f64ba1c0c72185da3a273130", + "sha256:ceb6534fcdfb5c503affb6b1130db7b5bfc8a0f77fa34880146f7a5c117987d0", + "sha256:d522f1dc49127eab0bfbba4e90fa068ecff0899bbf61bf4065c790ddd6c177fe", + "sha256:db094a6a4ae6329ed322a8973f83630b12715654c197dd392410400a5bfa1a73", + "sha256:df32ee0f4935a101e4b9a5f07b617d884a531ed5666671ff6ac66d2e8e8246d8", + "sha256:e5af1feee71099ae2e3b086ec04f57f9950e1be9ecf6c420696fea7977b84738", + "sha256:e814a4a5a1d95223b08cdb0f4f57029e8eab22ffdbae2f97107aeef28554517e", + "sha256:f8cabc5fd0091976ab7b020f5708335033e422de25e20ddf9416bdce2b7e07d8", + "sha256:fbc86ae8cc129c801e7baaafe3addf3c8d49c9c1597c44bdf2d78139707c3c62" ], "markers": "python_version >= '3.7'", - "version": "==6.3.2" + "version": "==6.3.3" }, "coveralls": { "hashes": [ @@ -1693,19 +1683,19 @@ }, "faker": { "hashes": [ - "sha256:7b25b2b980d3f0e61c586ec6365a39c797bae095f594890cc7bfb6f5ee8e66b4", - "sha256:f1b6dccdd57261918830b974a7cfa5b6a9044cf05d17d57bcbc757e0220db56f" + "sha256:c6ff91847d7c820afc0a74d95e824b48aab71ddfd9003f300641e42d58ae886f", + "sha256:cad1f69d72a68878cd67855140b6fe3e44c11628971cd838595d289c98bc45de" ], "markers": "python_version >= '3.6'", - "version": "==13.11.0" + "version": "==13.11.1" }, "filelock": { "hashes": [ - "sha256:9cd540a9352e432c7246a48fe4e8712b10acb1df2ad1f30e8c070b82ae1fed85", - "sha256:f8314284bfffbdcfa0ff3d7992b023d4c628ced6feb957351d4c48d059f56bc0" + "sha256:b795f1b42a61bbf8ec7113c341dad679d772567b936fbd1bf43c9a238e673e20", + "sha256:c7b5fdb219b398a5b28c8e4c1893ef5f98ece6a38c6ab2c22e26ec161556fed6" ], "index": "pypi", - "version": "==3.6.0" + "version": "==3.7.0" }, "identify": { "hashes": [ @@ -1879,11 +1869,11 @@ }, "pyparsing": { "hashes": [ - "sha256:7bf433498c016c4314268d95df76c81b842a4cb2b276fa3312cfb1e1d85f6954", - "sha256:ef7b523f6356f763771559412c0d7134753f037822dad1b16945b7b846f7ad06" + "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb", + "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc" ], "markers": "python_full_version >= '3.6.8'", - "version": "==3.0.8" + "version": "==3.0.9" }, "pytest": { "hashes": [ diff --git a/requirements.txt b/requirements.txt index e6329b7a8..07ab384c1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,9 +8,9 @@ -i https://pypi.python.org/simple --extra-index-url https://www.piwheels.org/simple aioredis==1.3.1 -anyio==3.5.0; python_full_version >= '3.6.2' +anyio==3.6.1; python_full_version >= '3.6.2' arrow==1.2.2; python_version >= '3.6' -asgiref==3.5.1; python_version >= '3.7' +asgiref==3.5.2; python_version >= '3.7' async-timeout==4.0.2; python_version >= '3.6' attrs==21.4.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' autobahn==22.4.2; python_version >= '3.7' @@ -21,13 +21,12 @@ certifi==2021.10.8 cffi==1.15.0 channels-redis==3.4.0 channels==3.0.4 -chardet==4.0.0; python_version >= '3.1' -charset-normalizer==2.0.12; python_version >= '3' +charset-normalizer==2.0.12; python_version >= '3.5' click==8.1.3; python_version >= '3.7' coloredlogs==15.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' concurrent-log-handler==0.9.20 constantly==15.1.0 -cryptography==37.0.2; python_version >= '3.6' +cryptography==36.0.2; python_version >= '3.6' daphne==3.0.2; python_version >= '3.6' dateparser==1.1.1 django-cors-headers==3.12.0 @@ -37,7 +36,7 @@ django-picklefield==3.0.1; python_version >= '3' django-q==1.3.9 django==4.0.4 djangorestframework==3.13.1 -filelock==3.6.0 +filelock==3.7.0 fuzzywuzzy[speedup]==0.18.0 gunicorn==20.1.0 h11==0.13.0; python_version >= '3.6' @@ -57,12 +56,12 @@ langdetect==1.0.9 lxml==4.8.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' msgpack==1.0.3 numpy==1.22.3; python_version >= '3.8' -ocrmypdf==13.4.3 +ocrmypdf==13.4.4 packaging==21.3; python_version >= '3.6' pathvalidate==2.5.0 pdf2image==1.16.0 -pdfminer.six==20220319 -pikepdf==5.1.2 +pdfminer.six==20220506 +pikepdf==5.1.3 pillow==9.1.0 pluggy==1.0.0; python_version >= '3.6' portalocker==2.4.0; python_version >= '3' @@ -71,7 +70,7 @@ pyasn1-modules==0.2.8 pyasn1==0.4.8 pycparser==2.21 pyopenssl==22.0.0 -pyparsing==3.0.8; python_full_version >= '3.6.8' +pyparsing==3.0.9; python_full_version >= '3.6.8' python-dateutil==2.8.2 python-dotenv==0.20.0 python-gnupg==0.4.8 @@ -103,7 +102,7 @@ tzlocal==4.2; python_version >= '3.6' urllib3==1.26.9; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4' uvicorn[standard]==0.17.6 uvloop==0.16.0 -watchdog==2.1.7 +watchdog==2.1.8 watchgod==0.8.2 wcwidth==0.2.5 websockets==10.3 From af157a4585ae35e3190cad1cdd723f6a2e1244a2 Mon Sep 17 00:00:00 2001 From: Trenton Holmes <holmes.trenton@gmail.com> Date: Tue, 17 May 2022 08:56:52 -0700 Subject: [PATCH 047/291] Adds troubleshooting and missing documentation for inotify and polling configuration --- docs/configuration.rst | 14 +++++++++ docs/troubleshooting.rst | 63 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/docs/configuration.rst b/docs/configuration.rst index 675a929bf..3d57236e1 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -590,6 +590,20 @@ PAPERLESS_CONSUMER_POLLING=<num> Defaults to 0, which disables polling and uses filesystem notifications. +PAPERLESS_CONSUMER_POLLING_RETRY_COUNT=<num> + If consumer polling is enabled, sets the number of times paperless will check for a + file to remain unmodified. + + Defaults to 5. + +PAPERLESS_CONSUMER_POLLING_DELAY=<num> + If consumer polling is enabled, sets the delay in seconds between each check (above) paperless + will do while waiting for a file to remain unmodified. + + Defaults to 5. + +.. _configuration-inotify: + PAPERLESS_CONSUMER_INOTIFY_DELAY=<num> Sets the time in seconds the consumer will wait for additional events from inotify before the consumer will consider a file ready and begin consumption. diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst index b1f41f096..08cc916b0 100644 --- a/docs/troubleshooting.rst +++ b/docs/troubleshooting.rst @@ -235,3 +235,66 @@ You might find messages like these in your log files: This indicates that paperless failed to read PDF metadata from one of your documents. This happens when you open the affected documents in paperless for editing. Paperless will continue to work, and will simply not show the invalid metadata. + +Consumer fails with a FileNotFoundError +############################ + +You might find messages like these in your log files: + +.. code:: + [ERROR] [paperless.consumer] Error while consuming document SCN_0001.pdf: FileNotFoundError: [Errno 2] No such file or directory: '/tmp/ocrmypdf.io.yhk3zbv0/origin.pdf' + Traceback (most recent call last): + File "/app/paperless/src/paperless_tesseract/parsers.py", line 261, in parse + ocrmypdf.ocr(**args) + File "/usr/local/lib/python3.8/dist-packages/ocrmypdf/api.py", line 337, in ocr + return run_pipeline(options=options, plugin_manager=plugin_manager, api=True) + File "/usr/local/lib/python3.8/dist-packages/ocrmypdf/_sync.py", line 385, in run_pipeline + exec_concurrent(context, executor) + File "/usr/local/lib/python3.8/dist-packages/ocrmypdf/_sync.py", line 302, in exec_concurrent + pdf = post_process(pdf, context, executor) + File "/usr/local/lib/python3.8/dist-packages/ocrmypdf/_sync.py", line 235, in post_process + pdf_out = metadata_fixup(pdf_out, context) + File "/usr/local/lib/python3.8/dist-packages/ocrmypdf/_pipeline.py", line 798, in metadata_fixup + with pikepdf.open(context.origin) as original, pikepdf.open(working_file) as pdf: + File "/usr/local/lib/python3.8/dist-packages/pikepdf/_methods.py", line 923, in open + pdf = Pdf._open( + FileNotFoundError: [Errno 2] No such file or directory: '/tmp/ocrmypdf.io.yhk3zbv0/origin.pdf' + +This probably indicates paperless tried to consume the same file twice. This can happen for a number of reasons, +depending on how documents are placed into the consume folder. If paperless is using inotify (the default) to +check for documents, try adjusting the :ref:`inotify configuration <configuration-inotify>`. If polling is enabled, +try adjusting the :ref:`polling configuration <configuration-polling>`. + +Consumer fails waiting for file to remain unmodified. +############################ + +You might find messages like these in your log files: + +.. code:: + [ERROR] [paperless.management.consumer] Timeout while waiting on file /usr/src/paperless/src/../consume/SCN_0001.pdf to remain unmodified. + +This indicates paperless timed out while waiting for the file to be completely written to the consume folder. +Adjusting :ref:`polling configuration <configuration-polling>` values should resolve the issue. + +.. note:: + + The user will need to manually move the file out of the consume folder and + back in, for the initial failing file to be consumed. + +Consumer fails reporting "OS reports file as busy still". +############################ + +You might find messages like these in your log files: + +.. code:: + [WARNING] [paperless.management.consumer] Not consuming file /usr/src/paperless/src/../consume/SCN_0001.pdf: OS reports file as busy still + +This indicates paperless was unable to open the file, as the OS reported the file as still being in use. To prevent a +crash, paperless did not try to consume the file. If paperless is using inotify (the default) to +check for documents, try adjusting the :ref:`inotify configuration <configuration-inotify>`. If polling is enabled, +try adjusting the :ref:`polling configuration <configuration-polling>`. + +.. note:: + + The user will need to manually move the file out of the consume folder and + back in, for the initial failing file to be consumed. From 6b4a2b6ca84d6f7ece34a2f38b2325dad70ba9a0 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 17 May 2022 09:09:38 -0700 Subject: [PATCH 048/291] close button color with light primary only for toasts --- src-ui/src/theme.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/theme.scss b/src-ui/src/theme.scss index a18ce1358..732ac47d9 100644 --- a/src-ui/src/theme.scss +++ b/src-ui/src/theme.scss @@ -39,7 +39,7 @@ $form-check-radio-checked-bg-image-dark: url("data:image/svg+xml,<svg xmlns='htt background-image: escape-svg($form-check-radio-checked-bg-image-dark); } - .btn-close { + .toast .btn-close { filter: none !important; } } From 356a667f2d9764e25f035636c5d92d169a0f3cc5 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 17 May 2022 09:59:14 -0700 Subject: [PATCH 049/291] Fix title subscription fires even after doc change --- .../document-detail.component.ts | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts index 4d66ea384..3d4289ad8 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.ts @@ -85,6 +85,7 @@ export class DocumentDetailComponent store: BehaviorSubject<any> isDirty$: Observable<boolean> unsubscribeNotifier: Subject<any> = new Subject() + docChangeNotifier: Subject<any> = new Subject() requiresPassword: boolean = false password: string @@ -117,18 +118,7 @@ export class DocumentDetailComponent private toastService: ToastService, private settings: SettingsService, private queryParamsService: QueryParamsService - ) { - this.titleSubject - .pipe( - debounceTime(1000), - distinctUntilChanged(), - takeUntil(this.unsubscribeNotifier) - ) - .subscribe((titleValue) => { - this.title = titleValue - this.documentForm.patchValue({ title: titleValue }) - }) - } + ) {} titleKeyUp(event) { this.titleSubject.next(event.target?.value) @@ -184,6 +174,7 @@ export class DocumentDetailComponent .pipe( switchMap((paramMap) => { const documentId = +paramMap.get('id') + this.docChangeNotifier.next(documentId) return this.documentsService.get(documentId) }) ) @@ -208,6 +199,18 @@ export class DocumentDetailComponent this.updateComponent(doc) } + this.titleSubject + .pipe( + debounceTime(1000), + distinctUntilChanged(), + takeUntil(this.docChangeNotifier), + takeUntil(this.unsubscribeNotifier) + ) + .subscribe((titleValue) => { + this.title = titleValue + this.documentForm.patchValue({ title: titleValue }) + }) + this.ogDate = new Date(normalizeDateStr(doc.created.toString())) // Initialize dirtyCheck From 55db5b9e0ff1f351532bebec102a7f80cc893bdd Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 17 May 2022 10:36:43 -0700 Subject: [PATCH 050/291] Manually dirty check title on doc change --- .../document-detail.component.ts | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts index 3d4289ad8..f3515c974 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.ts @@ -172,6 +172,7 @@ export class DocumentDetailComponent this.route.paramMap .pipe( + takeUntil(this.unsubscribeNotifier), switchMap((paramMap) => { const documentId = +paramMap.get('id') this.docChangeNotifier.next(documentId) @@ -206,9 +207,20 @@ export class DocumentDetailComponent takeUntil(this.docChangeNotifier), takeUntil(this.unsubscribeNotifier) ) - .subscribe((titleValue) => { - this.title = titleValue - this.documentForm.patchValue({ title: titleValue }) + .subscribe({ + next: (titleValue) => { + this.title = titleValue + this.documentForm.patchValue({ title: titleValue }) + }, + complete: () => { + // doc changed so we manually check dirty in case title was changed + if ( + this.store.getValue().title !== + this.documentForm.get('title').value + ) { + this.openDocumentService.setDirty(doc.id, true) + } + }, }) this.ogDate = new Date(normalizeDateStr(doc.created.toString())) @@ -238,7 +250,6 @@ export class DocumentDetailComponent return this.isDirty$.pipe(map((dirty) => ({ doc, dirty }))) }) ) - .pipe(takeUntil(this.unsubscribeNotifier)) .subscribe({ next: ({ doc, dirty }) => { this.openDocumentService.setDirty(doc.id, dirty) From 3fc58020940200c28811d4d9a27f8e7cff58d2c0 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 6 May 2022 19:49:45 -0700 Subject: [PATCH 051/291] Update settings.service.ts --- src-ui/src/app/services/settings.service.ts | 42 +++++++++++++++++---- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index 1a424e4ca..802c55611 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -65,18 +65,46 @@ const SETTINGS: PaperlessSettings[] = [ type: 'boolean', default: false, }, - { key: SETTINGS_KEYS.DOCUMENT_LIST_SIZE, type: 'number', default: 50 }, - { key: SETTINGS_KEYS.DARK_MODE_USE_SYSTEM, type: 'boolean', default: true }, - { key: SETTINGS_KEYS.DARK_MODE_ENABLED, type: 'boolean', default: false }, + { + key: SETTINGS_KEYS.DOCUMENT_LIST_SIZE, + type: 'number', + default: 50, + }, + { + key: SETTINGS_KEYS.DARK_MODE_USE_SYSTEM, + type: 'boolean', + default: true, + }, + { + key: SETTINGS_KEYS.DARK_MODE_ENABLED, + type: 'boolean', + default: false, + }, { key: SETTINGS_KEYS.DARK_MODE_THUMB_INVERTED, type: 'boolean', default: true, }, - { key: SETTINGS_KEYS.THEME_COLOR, type: 'string', default: '' }, - { key: SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, type: 'boolean', default: false }, - { key: SETTINGS_KEYS.DATE_LOCALE, type: 'string', default: '' }, - { key: SETTINGS_KEYS.DATE_FORMAT, type: 'string', default: 'mediumDate' }, + { + key: SETTINGS_KEYS.THEME_COLOR, + type: 'string', + default: '', + }, + { + key: SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, + type: 'boolean', + default: false, + }, + { + key: SETTINGS_KEYS.DATE_LOCALE, + type: 'string', + default: '', + }, + { + key: SETTINGS_KEYS.DATE_FORMAT, + type: 'string', + default: 'mediumDate', + }, { key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT, type: 'boolean', From e0efcdaa01e716cc4935d1a7c8bf18a15d6741cc Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 6 May 2022 22:10:35 -0700 Subject: [PATCH 052/291] frontend settings db migration --- .../migrations/1019_frontendsettings.py | 39 +++++++++++++++++++ src/documents/models.py | 22 +++++++++++ 2 files changed, 61 insertions(+) create mode 100644 src/documents/migrations/1019_frontendsettings.py diff --git a/src/documents/migrations/1019_frontendsettings.py b/src/documents/migrations/1019_frontendsettings.py new file mode 100644 index 000000000..1da17c974 --- /dev/null +++ b/src/documents/migrations/1019_frontendsettings.py @@ -0,0 +1,39 @@ +# Generated by Django 4.0.4 on 2022-05-07 05:10 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ("documents", "1018_alter_savedviewfilterrule_value"), + ] + + operations = [ + migrations.CreateModel( + name="FrontendSettings", + fields=[ + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("settings", models.JSONField(null=True)), + ( + "user", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + related_name="frontend_settings", + to=settings.AUTH_USER_MODEL, + ), + ), + ], + ), + ] diff --git a/src/documents/models.py b/src/documents/models.py index 206df4e8a..198bf27b2 100644 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -9,6 +9,8 @@ import pathvalidate from django.conf import settings from django.contrib.auth.models import User from django.db import models +from django.db.models.signals import post_save +from django.dispatch import receiver from django.utils import timezone from django.utils.translation import gettext_lazy as _ from documents.parsers import get_default_file_extension @@ -465,3 +467,23 @@ class FileInfo: cls._mangle_property(properties, "created") cls._mangle_property(properties, "title") return cls(**properties) + + +# Extending User Model Using a One-To-One Link +class FrontendSettings(models.Model): + + user = models.OneToOneField( + User, + on_delete=models.CASCADE, + related_name="frontend_settings", + ) + settings = models.JSONField(null=True) + + def __str__(self): + return self.user.username + + +@receiver(post_save, sender=User) +def create_user_frontend_settings(sender, instance, created, **kwargs): + if created: + FrontendSettings.objects.create(user=instance) From fd59b14d88d39f9405b5e3a590f0915f9b3b6cd8 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 6 May 2022 22:29:30 -0700 Subject: [PATCH 053/291] skeleton frontend_settings api endpoint --- src/documents/serialisers.py | 19 +++++++++++++++++++ src/documents/views.py | 35 +++++++++++++++++++++++++++++++++++ src/paperless/urls.py | 6 ++++++ 3 files changed, 60 insertions(+) diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index a257a1dd6..0339db88e 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -11,6 +11,7 @@ from . import bulk_edit from .models import Correspondent from .models import Document from .models import DocumentType +from .models import FrontendSettings from .models import MatchingModel from .models import SavedView from .models import SavedViewFilterRule @@ -498,3 +499,21 @@ class BulkDownloadSerializer(DocumentListSerializer): "bzip2": zipfile.ZIP_BZIP2, "lzma": zipfile.ZIP_LZMA, }[compression] + + +class FrontendSettingsViewSerializer(serializers.ModelSerializer): + class Meta: + model = FrontendSettings + depth = 1 + fields = [ + "id", + "settings", + ] + + def update(self, instance, validated_data): + super(FrontendSettingsViewSerializer, self).update(instance, validated_data) + return instance + + def create(self, validated_data): + frontend_settings = FrontendSettings.objects.create(**validated_data) + return frontend_settings diff --git a/src/documents/views.py b/src/documents/views.py index 5d179da02..8b548eed7 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -11,6 +11,7 @@ from unicodedata import normalize from urllib.parse import quote from django.conf import settings +from django.contrib.auth.models import User from django.db.models import Case from django.db.models import Count from django.db.models import IntegerField @@ -70,6 +71,7 @@ from .serialisers import CorrespondentSerializer from .serialisers import DocumentListSerializer from .serialisers import DocumentSerializer from .serialisers import DocumentTypeSerializer +from .serialisers import FrontendSettingsViewSerializer from .serialisers import PostDocumentSerializer from .serialisers import SavedViewSerializer from .serialisers import TagSerializer @@ -715,3 +717,36 @@ class RemoteVersionView(GenericAPIView): "feature_is_set": feature_is_set, }, ) + + +class FrontendSettingsView(GenericAPIView): + + permission_classes = (IsAuthenticated,) + serializer_class = FrontendSettingsViewSerializer + + def get(self, request, format=None): + serializer = self.get_serializer(data=request.data) + serializer.is_valid(raise_exception=True) + + user = User.objects.get(pk=request.user.id) + settings = [] + if hasattr(user, "frontend_settings"): + settings = user.frontend_settings.settings + return Response( + { + "user_id": user.id, + "settings": settings, + }, + ) + + def post(self, request, format=None): + serializer = self.get_serializer(data=request.data) + serializer.is_valid(raise_exception=True) + + serializer.save(user=self.request.user) + + return Response( + { + "success": True, + }, + ) diff --git a/src/paperless/urls.py b/src/paperless/urls.py index 833788cce..0ad9d072f 100644 --- a/src/paperless/urls.py +++ b/src/paperless/urls.py @@ -11,6 +11,7 @@ from documents.views import BulkDownloadView from documents.views import BulkEditView from documents.views import CorrespondentViewSet from documents.views import DocumentTypeViewSet +from documents.views import FrontendSettingsView from documents.views import IndexView from documents.views import LogViewSet from documents.views import PostDocumentView @@ -78,6 +79,11 @@ urlpatterns = [ RemoteVersionView.as_view(), name="remoteversion", ), + re_path( + r"^frontend_settings/", + FrontendSettingsView.as_view(), + name="frontend_settings", + ), path("token/", views.obtain_auth_token), ] + api_router.urls, From 7fbd2076c3b289257f114b96e8f0f414c8189e88 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 7 May 2022 00:05:51 -0700 Subject: [PATCH 054/291] Basic frontend settings retrieval --- .../manage/settings/settings.component.ts | 179 ++++++++++-------- src-ui/src/app/services/settings.service.ts | 52 ++++- src/documents/serialisers.py | 2 +- 3 files changed, 146 insertions(+), 87 deletions(-) diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts index 45785c709..0978a94ab 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.ts +++ b/src-ui/src/app/components/manage/settings/settings.component.ts @@ -17,7 +17,7 @@ import { } from 'src/app/services/settings.service' import { ToastService } from 'src/app/services/toast.service' import { dirtyCheck, DirtyComponent } from '@ngneat/dirty-check-forms' -import { Observable, Subscription, BehaviorSubject } from 'rxjs' +import { Observable, Subscription, BehaviorSubject, first } from 'rxjs' @Component({ selector: 'app-settings', @@ -72,85 +72,93 @@ export class SettingsComponent implements OnInit, OnDestroy, DirtyComponent { ngOnInit() { this.savedViewService.listAll().subscribe((r) => { this.savedViews = r.results - let storeData = { - bulkEditConfirmationDialogs: this.settings.get( - SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS - ), - bulkEditApplyOnClose: this.settings.get( - SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE - ), - documentListItemPerPage: this.settings.get( - SETTINGS_KEYS.DOCUMENT_LIST_SIZE - ), - darkModeUseSystem: this.settings.get( - SETTINGS_KEYS.DARK_MODE_USE_SYSTEM - ), - darkModeEnabled: this.settings.get(SETTINGS_KEYS.DARK_MODE_ENABLED), - darkModeInvertThumbs: this.settings.get( - SETTINGS_KEYS.DARK_MODE_THUMB_INVERTED - ), - themeColor: this.settings.get(SETTINGS_KEYS.THEME_COLOR), - useNativePdfViewer: this.settings.get( - SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER - ), - savedViews: {}, - displayLanguage: this.settings.getLanguage(), - dateLocale: this.settings.get(SETTINGS_KEYS.DATE_LOCALE), - dateFormat: this.settings.get(SETTINGS_KEYS.DATE_FORMAT), - notificationsConsumerNewDocument: this.settings.get( - SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT - ), - notificationsConsumerSuccess: this.settings.get( - SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS - ), - notificationsConsumerFailed: this.settings.get( - SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_FAILED - ), - notificationsConsumerSuppressOnDashboard: this.settings.get( - SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD - ), - } + this.settings + .retrieveSettings() + .pipe(first()) + .subscribe(() => { + let storeData = { + bulkEditConfirmationDialogs: this.settings.get( + SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS + ), + bulkEditApplyOnClose: this.settings.get( + SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE + ), + documentListItemPerPage: this.settings.get( + SETTINGS_KEYS.DOCUMENT_LIST_SIZE + ), + darkModeUseSystem: this.settings.get( + SETTINGS_KEYS.DARK_MODE_USE_SYSTEM + ), + darkModeEnabled: this.settings.get(SETTINGS_KEYS.DARK_MODE_ENABLED), + darkModeInvertThumbs: this.settings.get( + SETTINGS_KEYS.DARK_MODE_THUMB_INVERTED + ), + themeColor: this.settings.get(SETTINGS_KEYS.THEME_COLOR), + useNativePdfViewer: this.settings.get( + SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER + ), + savedViews: {}, + displayLanguage: this.settings.getLanguage(), + dateLocale: this.settings.get(SETTINGS_KEYS.DATE_LOCALE), + dateFormat: this.settings.get(SETTINGS_KEYS.DATE_FORMAT), + notificationsConsumerNewDocument: this.settings.get( + SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT + ), + notificationsConsumerSuccess: this.settings.get( + SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS + ), + notificationsConsumerFailed: this.settings.get( + SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_FAILED + ), + notificationsConsumerSuppressOnDashboard: this.settings.get( + SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD + ), + } - for (let view of this.savedViews) { - storeData.savedViews[view.id.toString()] = { - id: view.id, - name: view.name, - show_on_dashboard: view.show_on_dashboard, - show_in_sidebar: view.show_in_sidebar, - } - this.savedViewGroup.addControl( - view.id.toString(), - new FormGroup({ - id: new FormControl(null), - name: new FormControl(null), - show_on_dashboard: new FormControl(null), - show_in_sidebar: new FormControl(null), + for (let view of this.savedViews) { + storeData.savedViews[view.id.toString()] = { + id: view.id, + name: view.name, + show_on_dashboard: view.show_on_dashboard, + show_in_sidebar: view.show_in_sidebar, + } + this.savedViewGroup.addControl( + view.id.toString(), + new FormGroup({ + id: new FormControl(null), + name: new FormControl(null), + show_on_dashboard: new FormControl(null), + show_in_sidebar: new FormControl(null), + }) + ) + } + + this.store = new BehaviorSubject(storeData) + + this.storeSub = this.store.asObservable().subscribe((state) => { + this.settingsForm.patchValue(state, { emitEvent: false }) }) - ) - } - this.store = new BehaviorSubject(storeData) + // Initialize dirtyCheck + this.isDirty$ = dirtyCheck( + this.settingsForm, + this.store.asObservable() + ) - this.storeSub = this.store.asObservable().subscribe((state) => { - this.settingsForm.patchValue(state, { emitEvent: false }) - }) + // Record dirty in case we need to 'undo' appearance settings if not saved on close + this.isDirty$.subscribe((dirty) => { + this.isDirty = dirty + }) - // Initialize dirtyCheck - this.isDirty$ = dirtyCheck(this.settingsForm, this.store.asObservable()) - - // Record dirty in case we need to 'undo' appearance settings if not saved on close - this.isDirty$.subscribe((dirty) => { - this.isDirty = dirty - }) - - // "Live" visual changes prior to save - this.settingsForm.valueChanges.subscribe(() => { - this.settings.updateAppearanceSettings( - this.settingsForm.get('darkModeUseSystem').value, - this.settingsForm.get('darkModeEnabled').value, - this.settingsForm.get('themeColor').value - ) - }) + // "Live" visual changes prior to save + this.settingsForm.valueChanges.subscribe(() => { + this.settings.updateAppearanceSettings( + this.settingsForm.get('darkModeUseSystem').value, + this.settingsForm.get('darkModeEnabled').value, + this.settingsForm.get('themeColor').value + ) + }) + }) }) } @@ -227,10 +235,23 @@ export class SettingsComponent implements OnInit, OnDestroy, DirtyComponent { this.settingsForm.value.notificationsConsumerSuppressOnDashboard ) this.settings.setLanguage(this.settingsForm.value.displayLanguage) - this.store.next(this.settingsForm.value) - this.documentListViewService.updatePageSize() - this.settings.updateAppearanceSettings() - this.toastService.showInfo($localize`Settings saved successfully.`) + this.settings + .storeSettings() + .pipe(first()) + .subscribe({ + next: () => { + this.store.next(this.settingsForm.value) + this.documentListViewService.updatePageSize() + this.settings.updateAppearanceSettings() + this.toastService.showInfo($localize`Settings saved successfully.`) + }, + error: (error) => { + this.toastService.showError( + $localize`An error occurred while saving settings.` + ) + console.log(error) + }, + }) } get displayLanguageOptions(): LanguageOption[] { diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index 802c55611..f4708880a 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -1,4 +1,5 @@ import { DOCUMENT } from '@angular/common' +import { HttpClient } from '@angular/common/http' import { Inject, Injectable, @@ -9,11 +10,14 @@ import { } from '@angular/core' import { Meta } from '@angular/platform-browser' import { CookieService } from 'ngx-cookie-service' +import { first, Observable } from 'rxjs' import { BRIGHTNESS, estimateBrightnessForColor, hexToHsl, } from 'src/app/utils/color' +import { environment } from 'src/environments/environment' +import { Results } from '../data/results' export interface PaperlessSettings { key: string @@ -132,17 +136,34 @@ const SETTINGS: PaperlessSettings[] = [ }) export class SettingsService { private renderer: Renderer2 + protected baseUrl: string = environment.apiBaseUrl + 'frontend_settings/' + + private settings: Object = {} + private settings$: Observable<Results<any>> constructor( - private rendererFactory: RendererFactory2, + rendererFactory: RendererFactory2, @Inject(DOCUMENT) private document, private cookieService: CookieService, private meta: Meta, - @Inject(LOCALE_ID) private localeId: string + @Inject(LOCALE_ID) private localeId: string, + protected http: HttpClient ) { this.renderer = rendererFactory.createRenderer(null, null) - this.updateAppearanceSettings() + this.retrieveSettings() + .pipe(first()) + .subscribe((response) => { + Object.assign(this.settings, response['settings']) + + this.updateAppearanceSettings() + }) + } + + public retrieveSettings(): Observable<Results<any>> { + if (!this.settings$) + this.settings$ = this.http.get<Results<any>>(this.baseUrl) + return this.settings$ } public updateAppearanceSettings( @@ -390,7 +411,16 @@ export class SettingsService { return null } - let value = localStorage.getItem(key) + let value = null + // parse key:key:key into nested object + const keys = key.replace('general-settings:', '').split(':') + let settingObj = this.settings + keys.forEach((keyPart, index) => { + keyPart = keyPart.replace(/-/g, '_') + if (!settingObj.hasOwnProperty(keyPart)) return + if (index == keys.length - 1) value = settingObj[keyPart] + else settingObj = settingObj[keyPart] + }) if (value != null) { switch (setting.type) { @@ -409,10 +439,18 @@ export class SettingsService { } set(key: string, value: any) { - localStorage.setItem(key, value.toString()) + // parse key:key:key into nested object + let settingObj = this.settings + const keys = key.replace('general-settings:', '').split(':') + keys.forEach((keyPart, index) => { + keyPart = keyPart.replace(/-/g, '_') + if (!settingObj.hasOwnProperty(keyPart)) settingObj[keyPart] = {} + if (index == keys.length - 1) settingObj[keyPart] = value + else settingObj = settingObj[keyPart] + }) } - unset(key: string) { - localStorage.removeItem(key) + storeSettings(): Observable<any> { + return this.http.post(this.baseUrl, { settings: this.settings }) } } diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 0339db88e..75b6b8cdd 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -515,5 +515,5 @@ class FrontendSettingsViewSerializer(serializers.ModelSerializer): return instance def create(self, validated_data): - frontend_settings = FrontendSettings.objects.create(**validated_data) + frontend_settings = FrontendSettings.objects.update_or_create(**validated_data) return frontend_settings From 798c827b0f87d02640c22b56cee4ed9463d9c80a Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 7 May 2022 00:15:58 -0700 Subject: [PATCH 055/291] fix key constraint error --- src/documents/serialisers.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 75b6b8cdd..9119779e8 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -515,5 +515,8 @@ class FrontendSettingsViewSerializer(serializers.ModelSerializer): return instance def create(self, validated_data): - frontend_settings = FrontendSettings.objects.update_or_create(**validated_data) + frontend_settings = FrontendSettings.objects.update_or_create( + user=validated_data.get("user"), + defaults={"settings": validated_data.get("settings", None)}, + ) return frontend_settings From 000a3ec16440cb4681ce00e24b58c5dbe52684d2 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 7 May 2022 00:41:35 -0700 Subject: [PATCH 056/291] Use app initializer to wait on settings --- src-ui/src/app/app.module.ts | 16 +- .../manage/settings/settings.component.ts | 156 +++++++++--------- src-ui/src/app/services/settings.service.ts | 20 +-- 3 files changed, 96 insertions(+), 96 deletions(-) diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index e891d217d..79bbe9700 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -1,5 +1,5 @@ import { BrowserModule } from '@angular/platform-browser' -import { NgModule } from '@angular/core' +import { APP_INITIALIZER, NgModule } from '@angular/core' import { AppRoutingModule } from './app-routing.module' import { AppComponent } from './app.component' import { @@ -87,6 +87,8 @@ import localeSr from '@angular/common/locales/sr' import localeSv from '@angular/common/locales/sv' import localeTr from '@angular/common/locales/tr' import localeZh from '@angular/common/locales/zh' +import { Observable } from 'rxjs' +import { SettingsService } from './services/settings.service' registerLocaleData(localeBe) registerLocaleData(localeCs) @@ -109,6 +111,12 @@ registerLocaleData(localeSv) registerLocaleData(localeTr) registerLocaleData(localeZh) +function initializeApp(settings: SettingsService) { + return () => { + return settings.initializeSettings() + } +} + @NgModule({ declarations: [ AppComponent, @@ -174,6 +182,12 @@ registerLocaleData(localeZh) ColorSliderModule, ], providers: [ + { + provide: APP_INITIALIZER, + useFactory: initializeApp, + deps: [SettingsService], + multi: true, + }, DatePipe, CookieService, { diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts index 0978a94ab..ce999c14c 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.ts +++ b/src-ui/src/app/components/manage/settings/settings.component.ts @@ -72,93 +72,85 @@ export class SettingsComponent implements OnInit, OnDestroy, DirtyComponent { ngOnInit() { this.savedViewService.listAll().subscribe((r) => { this.savedViews = r.results - this.settings - .retrieveSettings() - .pipe(first()) - .subscribe(() => { - let storeData = { - bulkEditConfirmationDialogs: this.settings.get( - SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS - ), - bulkEditApplyOnClose: this.settings.get( - SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE - ), - documentListItemPerPage: this.settings.get( - SETTINGS_KEYS.DOCUMENT_LIST_SIZE - ), - darkModeUseSystem: this.settings.get( - SETTINGS_KEYS.DARK_MODE_USE_SYSTEM - ), - darkModeEnabled: this.settings.get(SETTINGS_KEYS.DARK_MODE_ENABLED), - darkModeInvertThumbs: this.settings.get( - SETTINGS_KEYS.DARK_MODE_THUMB_INVERTED - ), - themeColor: this.settings.get(SETTINGS_KEYS.THEME_COLOR), - useNativePdfViewer: this.settings.get( - SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER - ), - savedViews: {}, - displayLanguage: this.settings.getLanguage(), - dateLocale: this.settings.get(SETTINGS_KEYS.DATE_LOCALE), - dateFormat: this.settings.get(SETTINGS_KEYS.DATE_FORMAT), - notificationsConsumerNewDocument: this.settings.get( - SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT - ), - notificationsConsumerSuccess: this.settings.get( - SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS - ), - notificationsConsumerFailed: this.settings.get( - SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_FAILED - ), - notificationsConsumerSuppressOnDashboard: this.settings.get( - SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD - ), - } + let storeData = { + bulkEditConfirmationDialogs: this.settings.get( + SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS + ), + bulkEditApplyOnClose: this.settings.get( + SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE + ), + documentListItemPerPage: this.settings.get( + SETTINGS_KEYS.DOCUMENT_LIST_SIZE + ), + darkModeUseSystem: this.settings.get( + SETTINGS_KEYS.DARK_MODE_USE_SYSTEM + ), + darkModeEnabled: this.settings.get(SETTINGS_KEYS.DARK_MODE_ENABLED), + darkModeInvertThumbs: this.settings.get( + SETTINGS_KEYS.DARK_MODE_THUMB_INVERTED + ), + themeColor: this.settings.get(SETTINGS_KEYS.THEME_COLOR), + useNativePdfViewer: this.settings.get( + SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER + ), + savedViews: {}, + displayLanguage: this.settings.getLanguage(), + dateLocale: this.settings.get(SETTINGS_KEYS.DATE_LOCALE), + dateFormat: this.settings.get(SETTINGS_KEYS.DATE_FORMAT), + notificationsConsumerNewDocument: this.settings.get( + SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT + ), + notificationsConsumerSuccess: this.settings.get( + SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS + ), + notificationsConsumerFailed: this.settings.get( + SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_FAILED + ), + notificationsConsumerSuppressOnDashboard: this.settings.get( + SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD + ), + } - for (let view of this.savedViews) { - storeData.savedViews[view.id.toString()] = { - id: view.id, - name: view.name, - show_on_dashboard: view.show_on_dashboard, - show_in_sidebar: view.show_in_sidebar, - } - this.savedViewGroup.addControl( - view.id.toString(), - new FormGroup({ - id: new FormControl(null), - name: new FormControl(null), - show_on_dashboard: new FormControl(null), - show_in_sidebar: new FormControl(null), - }) - ) - } - - this.store = new BehaviorSubject(storeData) - - this.storeSub = this.store.asObservable().subscribe((state) => { - this.settingsForm.patchValue(state, { emitEvent: false }) + for (let view of this.savedViews) { + storeData.savedViews[view.id.toString()] = { + id: view.id, + name: view.name, + show_on_dashboard: view.show_on_dashboard, + show_in_sidebar: view.show_in_sidebar, + } + this.savedViewGroup.addControl( + view.id.toString(), + new FormGroup({ + id: new FormControl(null), + name: new FormControl(null), + show_on_dashboard: new FormControl(null), + show_in_sidebar: new FormControl(null), }) + ) + } - // Initialize dirtyCheck - this.isDirty$ = dirtyCheck( - this.settingsForm, - this.store.asObservable() - ) + this.store = new BehaviorSubject(storeData) - // Record dirty in case we need to 'undo' appearance settings if not saved on close - this.isDirty$.subscribe((dirty) => { - this.isDirty = dirty - }) + this.storeSub = this.store.asObservable().subscribe((state) => { + this.settingsForm.patchValue(state, { emitEvent: false }) + }) - // "Live" visual changes prior to save - this.settingsForm.valueChanges.subscribe(() => { - this.settings.updateAppearanceSettings( - this.settingsForm.get('darkModeUseSystem').value, - this.settingsForm.get('darkModeEnabled').value, - this.settingsForm.get('themeColor').value - ) - }) - }) + // Initialize dirtyCheck + this.isDirty$ = dirtyCheck(this.settingsForm, this.store.asObservable()) + + // Record dirty in case we need to 'undo' appearance settings if not saved on close + this.isDirty$.subscribe((dirty) => { + this.isDirty = dirty + }) + + // "Live" visual changes prior to save + this.settingsForm.valueChanges.subscribe(() => { + this.settings.updateAppearanceSettings( + this.settingsForm.get('darkModeUseSystem').value, + this.settingsForm.get('darkModeEnabled').value, + this.settingsForm.get('themeColor').value + ) + }) }) } diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index f4708880a..f19afb956 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -139,7 +139,6 @@ export class SettingsService { protected baseUrl: string = environment.apiBaseUrl + 'frontend_settings/' private settings: Object = {} - private settings$: Observable<Results<any>> constructor( rendererFactory: RendererFactory2, @@ -150,20 +149,15 @@ export class SettingsService { protected http: HttpClient ) { this.renderer = rendererFactory.createRenderer(null, null) - - this.retrieveSettings() - .pipe(first()) - .subscribe((response) => { - Object.assign(this.settings, response['settings']) - - this.updateAppearanceSettings() - }) } - public retrieveSettings(): Observable<Results<any>> { - if (!this.settings$) - this.settings$ = this.http.get<Results<any>>(this.baseUrl) - return this.settings$ + // this is called by the app initializer in app.module + public initializeSettings(): Observable<Results<any>> { + let settings$ = this.http.get<Results<any>>(this.baseUrl) + settings$.pipe(first()).subscribe((response) => { + Object.assign(this.settings, response['settings']) + }) + return settings$ } public updateAppearanceSettings( From 06490aff246ce9586227f1074c45635a373707d8 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 7 May 2022 01:53:37 -0700 Subject: [PATCH 057/291] Automatic migration to database --- src-ui/src/app/services/settings.service.ts | 40 ++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index f19afb956..f624f953d 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -18,6 +18,7 @@ import { } from 'src/app/utils/color' import { environment } from 'src/environments/environment' import { Results } from '../data/results' +import { ToastService } from './toast.service' export interface PaperlessSettings { key: string @@ -146,7 +147,8 @@ export class SettingsService { private cookieService: CookieService, private meta: Meta, @Inject(LOCALE_ID) private localeId: string, - protected http: HttpClient + protected http: HttpClient, + private toastService: ToastService ) { this.renderer = rendererFactory.createRenderer(null, null) } @@ -156,6 +158,7 @@ export class SettingsService { let settings$ = this.http.get<Results<any>>(this.baseUrl) settings$.pipe(first()).subscribe((response) => { Object.assign(this.settings, response['settings']) + this.maybeMigrateSettings() }) return settings$ } @@ -447,4 +450,39 @@ export class SettingsService { storeSettings(): Observable<any> { return this.http.post(this.baseUrl, { settings: this.settings }) } + + maybeMigrateSettings() { + if ( + !this.settings.hasOwnProperty('documentListSize') && + localStorage.getItem(SETTINGS_KEYS.DOCUMENT_LIST_SIZE) + ) { + // lets migrate + const successMessage = $localize`Successfully completed one-time migratration of settings to the database!` + const errorMessage = $localize`Unable to migrate settings to the database, please try saving manually.` + + try { + for (const setting in SETTINGS_KEYS) { + const key = SETTINGS_KEYS[setting] + const value = localStorage.getItem(key) + this.set(key, value) + } + } catch (error) { + this.toastService.showError(errorMessage) + console.log(error) + } + + this.storeSettings() + .pipe(first()) + .subscribe({ + next: () => { + this.updateAppearanceSettings() + this.toastService.showInfo(successMessage) + }, + error: (e) => { + this.toastService.showError(errorMessage) + console.log(e) + }, + }) + } + } } From ca14b228aa8b574e31af7787c9e952c74d9c72ca Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 7 May 2022 02:14:20 -0700 Subject: [PATCH 058/291] include language in db settings --- src-ui/src/app/services/settings.service.ts | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index f624f953d..e83ee1415 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -38,6 +38,8 @@ export interface LanguageOption { } export const SETTINGS_KEYS = { + LANGUAGE: 'language', + // maintain old general-settings: for backwards compatibility BULK_EDIT_CONFIRMATION_DIALOGS: 'general-settings:bulk-edit:confirmation-dialogs', BULK_EDIT_APPLY_ON_CLOSE: 'general-settings:bulk-edit:apply-on-close', @@ -60,6 +62,11 @@ export const SETTINGS_KEYS = { } const SETTINGS: PaperlessSettings[] = [ + { + key: SETTINGS_KEYS.LANGUAGE, + type: 'string', + default: '', + }, { key: SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS, type: 'boolean', @@ -379,11 +386,13 @@ export class SettingsService { } getLanguage(): string { - return this.cookieService.get(this.getLanguageCookieName()) + return this.get(SETTINGS_KEYS.LANGUAGE) } setLanguage(language: string) { - if (language) { + this.set(SETTINGS_KEYS.LANGUAGE, language) + if (language?.length) { + // for Django this.cookieService.set(this.getLanguageCookieName(), language) } else { this.cookieService.delete(this.getLanguageCookieName()) @@ -466,6 +475,10 @@ export class SettingsService { const value = localStorage.getItem(key) this.set(key, value) } + this.set( + SETTINGS_KEYS.LANGUAGE, + this.cookieService.get(this.getLanguageCookieName()) + ) } catch (error) { this.toastService.showError(errorMessage) console.log(error) From ed96373eb2e722d99566aefd01d4c09f36c58fd7 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 7 May 2022 07:17:03 -0700 Subject: [PATCH 059/291] update e2e tests for settings initialization --- .../fixtures/frontend_settings/settings.json | 29 +++++++ .../integration/document-detail.spec.ts | 3 + .../integration/documents-list.spec.ts | 3 + src-ui/cypress/integration/manage.spec.ts | 3 + src-ui/cypress/integration/settings.spec.ts | 76 ++++++++++--------- 5 files changed, 80 insertions(+), 34 deletions(-) create mode 100644 src-ui/cypress/fixtures/frontend_settings/settings.json diff --git a/src-ui/cypress/fixtures/frontend_settings/settings.json b/src-ui/cypress/fixtures/frontend_settings/settings.json new file mode 100644 index 000000000..9a92ba410 --- /dev/null +++ b/src-ui/cypress/fixtures/frontend_settings/settings.json @@ -0,0 +1,29 @@ +{ + "bulk_edit": { + "apply_on_close": false, + "confirmation_dialogs": true + }, + "dark_mode": { + "enabled": "false", + "thumb_inverted": "true", + "use_system": true + }, + "date_display": { + "date_format": "mediumDate", + "date_locale": "" + }, + "documentListSize": 50, + "document_details": { + "native_pdf_viewer": false + }, + "language": "", + "notifications": { + "consumer_failed": true, + "consumer_new_documents": true, + "consumer_success": true, + "consumer_suppress_on_dashboard": true + }, + "theme": { + "color": "#cd42cf" + } +} diff --git a/src-ui/cypress/integration/document-detail.spec.ts b/src-ui/cypress/integration/document-detail.spec.ts index 9ff566760..7083ef582 100644 --- a/src-ui/cypress/integration/document-detail.spec.ts +++ b/src-ui/cypress/integration/document-detail.spec.ts @@ -2,6 +2,9 @@ describe('document-detail', () => { beforeEach(() => { this.modifiedDocuments = [] + cy.intercept('http://localhost:8000/api/frontend_settings/', { + fixture: 'frontend_settings/settings.json', + }) cy.fixture('documents/documents.json').then((documentsJson) => { cy.intercept('GET', 'http://localhost:8000/api/documents/1/', (req) => { let response = { ...documentsJson } diff --git a/src-ui/cypress/integration/documents-list.spec.ts b/src-ui/cypress/integration/documents-list.spec.ts index 5b923ed2f..45d292fc7 100644 --- a/src-ui/cypress/integration/documents-list.spec.ts +++ b/src-ui/cypress/integration/documents-list.spec.ts @@ -3,6 +3,9 @@ describe('documents-list', () => { this.bulkEdits = {} // mock API methods + cy.intercept('http://localhost:8000/api/frontend_settings/', { + fixture: 'frontend_settings/settings.json', + }) cy.fixture('documents/documents.json').then((documentsJson) => { // bulk edit cy.intercept( diff --git a/src-ui/cypress/integration/manage.spec.ts b/src-ui/cypress/integration/manage.spec.ts index e28556a24..b098ea6a5 100644 --- a/src-ui/cypress/integration/manage.spec.ts +++ b/src-ui/cypress/integration/manage.spec.ts @@ -1,5 +1,8 @@ describe('manage', () => { beforeEach(() => { + cy.intercept('http://localhost:8000/api/frontend_settings/', { + fixture: 'frontend_settings/settings.json', + }) cy.intercept('http://localhost:8000/api/correspondents/*', { fixture: 'correspondents/correspondents.json', }) diff --git a/src-ui/cypress/integration/settings.spec.ts b/src-ui/cypress/integration/settings.spec.ts index 72f9835f2..8350ae035 100644 --- a/src-ui/cypress/integration/settings.spec.ts +++ b/src-ui/cypress/integration/settings.spec.ts @@ -3,45 +3,53 @@ describe('settings', () => { this.modifiedViews = [] // mock API methods - cy.fixture('saved_views/savedviews.json').then((savedViewsJson) => { - // saved views PATCH - cy.intercept( - 'PATCH', - 'http://localhost:8000/api/saved_views/*', - (req) => { - this.modifiedViews.push(req.body) // store this for later - req.reply({ result: 'OK' }) - } - ) + cy.intercept('http://localhost:8000/api/frontend_settings/', { + fixture: 'frontend_settings/settings.json', + }).then(() => { + cy.fixture('saved_views/savedviews.json').then((savedViewsJson) => { + // saved views PATCH + cy.intercept( + 'PATCH', + 'http://localhost:8000/api/saved_views/*', + (req) => { + this.modifiedViews.push(req.body) // store this for later + req.reply({ result: 'OK' }) + } + ) - cy.intercept('GET', 'http://localhost:8000/api/saved_views/*', (req) => { - let response = { ...savedViewsJson } - if (this.modifiedViews.length) { - response.results = response.results.map((v) => { - if (this.modifiedViews.find((mv) => mv.id == v.id)) - v = this.modifiedViews.find((mv) => mv.id == v.id) - return v - }) - } + cy.intercept( + 'GET', + 'http://localhost:8000/api/saved_views/*', + (req) => { + let response = { ...savedViewsJson } + if (this.modifiedViews.length) { + response.results = response.results.map((v) => { + if (this.modifiedViews.find((mv) => mv.id == v.id)) + v = this.modifiedViews.find((mv) => mv.id == v.id) + return v + }) + } - req.reply(response) - }).as('savedViews') - }) - - cy.fixture('documents/documents.json').then((documentsJson) => { - cy.intercept('GET', 'http://localhost:8000/api/documents/1/', (req) => { - let response = { ...documentsJson } - response = response.results.find((d) => d.id == 1) - req.reply(response) + req.reply(response) + } + ).as('savedViews') }) - }) - cy.intercept('http://localhost:8000/api/documents/1/metadata/', { - fixture: 'documents/1/metadata.json', - }) + cy.fixture('documents/documents.json').then((documentsJson) => { + cy.intercept('GET', 'http://localhost:8000/api/documents/1/', (req) => { + let response = { ...documentsJson } + response = response.results.find((d) => d.id == 1) + req.reply(response) + }) + }) - cy.intercept('http://localhost:8000/api/documents/1/suggestions/', { - fixture: 'documents/1/suggestions.json', + cy.intercept('http://localhost:8000/api/documents/1/metadata/', { + fixture: 'documents/1/metadata.json', + }) + + cy.intercept('http://localhost:8000/api/documents/1/suggestions/', { + fixture: 'documents/1/suggestions.json', + }) }) cy.viewport(1024, 1024) From 67b3473365036d73e2c12d99bb74660bcaa07558 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sat, 7 May 2022 08:11:10 -0700 Subject: [PATCH 060/291] Refactor to UiSettings --- .../{frontend_settings => ui_settings}/settings.json | 0 src-ui/cypress/integration/document-detail.spec.ts | 4 ++-- src-ui/cypress/integration/documents-list.spec.ts | 4 ++-- src-ui/cypress/integration/manage.spec.ts | 4 ++-- src-ui/cypress/integration/settings.spec.ts | 4 ++-- src-ui/src/app/services/settings.service.ts | 2 +- .../{1019_frontendsettings.py => 1019_uisettings.py} | 4 ++-- src/documents/models.py | 8 ++++---- src/documents/serialisers.py | 12 ++++++------ src/documents/views.py | 10 +++++----- src/paperless/urls.py | 8 ++++---- 11 files changed, 30 insertions(+), 30 deletions(-) rename src-ui/cypress/fixtures/{frontend_settings => ui_settings}/settings.json (100%) rename src/documents/migrations/{1019_frontendsettings.py => 1019_uisettings.py} (91%) diff --git a/src-ui/cypress/fixtures/frontend_settings/settings.json b/src-ui/cypress/fixtures/ui_settings/settings.json similarity index 100% rename from src-ui/cypress/fixtures/frontend_settings/settings.json rename to src-ui/cypress/fixtures/ui_settings/settings.json diff --git a/src-ui/cypress/integration/document-detail.spec.ts b/src-ui/cypress/integration/document-detail.spec.ts index 7083ef582..8faf2412c 100644 --- a/src-ui/cypress/integration/document-detail.spec.ts +++ b/src-ui/cypress/integration/document-detail.spec.ts @@ -2,8 +2,8 @@ describe('document-detail', () => { beforeEach(() => { this.modifiedDocuments = [] - cy.intercept('http://localhost:8000/api/frontend_settings/', { - fixture: 'frontend_settings/settings.json', + cy.intercept('http://localhost:8000/api/ui_settings/', { + fixture: 'ui_settings/settings.json', }) cy.fixture('documents/documents.json').then((documentsJson) => { cy.intercept('GET', 'http://localhost:8000/api/documents/1/', (req) => { diff --git a/src-ui/cypress/integration/documents-list.spec.ts b/src-ui/cypress/integration/documents-list.spec.ts index 45d292fc7..169bd333b 100644 --- a/src-ui/cypress/integration/documents-list.spec.ts +++ b/src-ui/cypress/integration/documents-list.spec.ts @@ -3,8 +3,8 @@ describe('documents-list', () => { this.bulkEdits = {} // mock API methods - cy.intercept('http://localhost:8000/api/frontend_settings/', { - fixture: 'frontend_settings/settings.json', + cy.intercept('http://localhost:8000/api/ui_settings/', { + fixture: 'ui_settings/settings.json', }) cy.fixture('documents/documents.json').then((documentsJson) => { // bulk edit diff --git a/src-ui/cypress/integration/manage.spec.ts b/src-ui/cypress/integration/manage.spec.ts index b098ea6a5..ef7e12723 100644 --- a/src-ui/cypress/integration/manage.spec.ts +++ b/src-ui/cypress/integration/manage.spec.ts @@ -1,7 +1,7 @@ describe('manage', () => { beforeEach(() => { - cy.intercept('http://localhost:8000/api/frontend_settings/', { - fixture: 'frontend_settings/settings.json', + cy.intercept('http://localhost:8000/api/ui_settings/', { + fixture: 'ui_settings/settings.json', }) cy.intercept('http://localhost:8000/api/correspondents/*', { fixture: 'correspondents/correspondents.json', diff --git a/src-ui/cypress/integration/settings.spec.ts b/src-ui/cypress/integration/settings.spec.ts index 8350ae035..16e706b63 100644 --- a/src-ui/cypress/integration/settings.spec.ts +++ b/src-ui/cypress/integration/settings.spec.ts @@ -3,8 +3,8 @@ describe('settings', () => { this.modifiedViews = [] // mock API methods - cy.intercept('http://localhost:8000/api/frontend_settings/', { - fixture: 'frontend_settings/settings.json', + cy.intercept('http://localhost:8000/api/ui_settings/', { + fixture: 'ui_settings/settings.json', }).then(() => { cy.fixture('saved_views/savedviews.json').then((savedViewsJson) => { // saved views PATCH diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index e83ee1415..81b15e1b0 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -144,7 +144,7 @@ const SETTINGS: PaperlessSettings[] = [ }) export class SettingsService { private renderer: Renderer2 - protected baseUrl: string = environment.apiBaseUrl + 'frontend_settings/' + protected baseUrl: string = environment.apiBaseUrl + 'ui_settings/' private settings: Object = {} diff --git a/src/documents/migrations/1019_frontendsettings.py b/src/documents/migrations/1019_uisettings.py similarity index 91% rename from src/documents/migrations/1019_frontendsettings.py rename to src/documents/migrations/1019_uisettings.py index 1da17c974..edc944a37 100644 --- a/src/documents/migrations/1019_frontendsettings.py +++ b/src/documents/migrations/1019_uisettings.py @@ -14,7 +14,7 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( - name="FrontendSettings", + name="UiSettings", fields=[ ( "id", @@ -30,7 +30,7 @@ class Migration(migrations.Migration): "user", models.OneToOneField( on_delete=django.db.models.deletion.CASCADE, - related_name="frontend_settings", + related_name="ui_settings", to=settings.AUTH_USER_MODEL, ), ), diff --git a/src/documents/models.py b/src/documents/models.py index 198bf27b2..208938509 100644 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -470,12 +470,12 @@ class FileInfo: # Extending User Model Using a One-To-One Link -class FrontendSettings(models.Model): +class UiSettings(models.Model): user = models.OneToOneField( User, on_delete=models.CASCADE, - related_name="frontend_settings", + related_name="ui_settings", ) settings = models.JSONField(null=True) @@ -484,6 +484,6 @@ class FrontendSettings(models.Model): @receiver(post_save, sender=User) -def create_user_frontend_settings(sender, instance, created, **kwargs): +def create_user_ui_settings(sender, instance, created, **kwargs): if created: - FrontendSettings.objects.create(user=instance) + UiSettings.objects.create(user=instance) diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 9119779e8..a26b67e43 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -11,11 +11,11 @@ from . import bulk_edit from .models import Correspondent from .models import Document from .models import DocumentType -from .models import FrontendSettings from .models import MatchingModel from .models import SavedView from .models import SavedViewFilterRule from .models import Tag +from .models import UiSettings from .parsers import is_mime_type_supported @@ -501,9 +501,9 @@ class BulkDownloadSerializer(DocumentListSerializer): }[compression] -class FrontendSettingsViewSerializer(serializers.ModelSerializer): +class UiSettingsViewSerializer(serializers.ModelSerializer): class Meta: - model = FrontendSettings + model = UiSettings depth = 1 fields = [ "id", @@ -511,12 +511,12 @@ class FrontendSettingsViewSerializer(serializers.ModelSerializer): ] def update(self, instance, validated_data): - super(FrontendSettingsViewSerializer, self).update(instance, validated_data) + super(UiSettingsViewSerializer, self).update(instance, validated_data) return instance def create(self, validated_data): - frontend_settings = FrontendSettings.objects.update_or_create( + ui_settings = UiSettings.objects.update_or_create( user=validated_data.get("user"), defaults={"settings": validated_data.get("settings", None)}, ) - return frontend_settings + return ui_settings diff --git a/src/documents/views.py b/src/documents/views.py index 8b548eed7..a47c7c74f 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -71,11 +71,11 @@ from .serialisers import CorrespondentSerializer from .serialisers import DocumentListSerializer from .serialisers import DocumentSerializer from .serialisers import DocumentTypeSerializer -from .serialisers import FrontendSettingsViewSerializer from .serialisers import PostDocumentSerializer from .serialisers import SavedViewSerializer from .serialisers import TagSerializer from .serialisers import TagSerializerVersion1 +from .serialisers import UiSettingsViewSerializer logger = logging.getLogger("paperless.api") @@ -719,10 +719,10 @@ class RemoteVersionView(GenericAPIView): ) -class FrontendSettingsView(GenericAPIView): +class UiSettingsView(GenericAPIView): permission_classes = (IsAuthenticated,) - serializer_class = FrontendSettingsViewSerializer + serializer_class = UiSettingsViewSerializer def get(self, request, format=None): serializer = self.get_serializer(data=request.data) @@ -730,8 +730,8 @@ class FrontendSettingsView(GenericAPIView): user = User.objects.get(pk=request.user.id) settings = [] - if hasattr(user, "frontend_settings"): - settings = user.frontend_settings.settings + if hasattr(user, "ui_settings"): + settings = user.ui_settings.settings return Response( { "user_id": user.id, diff --git a/src/paperless/urls.py b/src/paperless/urls.py index 0ad9d072f..1e41a5979 100644 --- a/src/paperless/urls.py +++ b/src/paperless/urls.py @@ -11,7 +11,6 @@ from documents.views import BulkDownloadView from documents.views import BulkEditView from documents.views import CorrespondentViewSet from documents.views import DocumentTypeViewSet -from documents.views import FrontendSettingsView from documents.views import IndexView from documents.views import LogViewSet from documents.views import PostDocumentView @@ -21,6 +20,7 @@ from documents.views import SearchAutoCompleteView from documents.views import SelectionDataView from documents.views import StatisticsView from documents.views import TagViewSet +from documents.views import UiSettingsView from documents.views import UnifiedSearchViewSet from paperless.consumers import StatusConsumer from paperless.views import FaviconView @@ -80,9 +80,9 @@ urlpatterns = [ name="remoteversion", ), re_path( - r"^frontend_settings/", - FrontendSettingsView.as_view(), - name="frontend_settings", + r"^ui_settings/", + UiSettingsView.as_view(), + name="ui_settings", ), path("token/", views.obtain_auth_token), ] From 083290e798628eb70c26faa030d06e6537bfd4d5 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 9 May 2022 11:01:45 -0700 Subject: [PATCH 061/291] PaperlessUiSettings data object --- src-ui/src/app/app.component.ts | 3 +- .../document-detail.component.ts | 6 +- .../bulk-editor/bulk-editor.component.ts | 6 +- .../document-card-large.component.ts | 8 +- .../document-card-small.component.ts | 6 +- .../manage/settings/settings.component.ts | 2 +- src-ui/src/app/data/paperless-uisettings.ts | 117 +++++++++++++++++ src-ui/src/app/pipes/custom-date.pipe.ts | 3 +- .../services/document-list-view.service.ts | 3 +- src-ui/src/app/services/settings.service.ts | 122 ++---------------- 10 files changed, 143 insertions(+), 133 deletions(-) create mode 100644 src-ui/src/app/data/paperless-uisettings.ts diff --git a/src-ui/src/app/app.component.ts b/src-ui/src/app/app.component.ts index f8c98fbc7..c7954e3a6 100644 --- a/src-ui/src/app/app.component.ts +++ b/src-ui/src/app/app.component.ts @@ -1,4 +1,5 @@ -import { SettingsService, SETTINGS_KEYS } from './services/settings.service' +import { SettingsService } from './services/settings.service' +import { SETTINGS_KEYS } from './data/paperless-uisettings' import { Component, OnDestroy, OnInit } from '@angular/core' import { Router } from '@angular/router' import { Subscription } from 'rxjs' diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts index 6f1614e5f..992f5ff06 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.ts @@ -18,10 +18,7 @@ import { DocumentTypeEditDialogComponent } from '../common/edit-dialog/document- import { PDFDocumentProxy } from 'ng2-pdf-viewer' import { ToastService } from 'src/app/services/toast.service' import { TextComponent } from '../common/input/text/text.component' -import { - SettingsService, - SETTINGS_KEYS, -} from 'src/app/services/settings.service' +import { SettingsService } from 'src/app/services/settings.service' import { dirtyCheck, DirtyComponent } from '@ngneat/dirty-check-forms' import { Observable, Subject, BehaviorSubject } from 'rxjs' import { @@ -36,6 +33,7 @@ import { PaperlessDocumentSuggestions } from 'src/app/data/paperless-document-su import { FILTER_FULLTEXT_MORELIKE } from 'src/app/data/filter-rule-type' import { normalizeDateStr } from 'src/app/utils/date' import { QueryParamsService } from 'src/app/services/query-params.service' +import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings' @Component({ selector: 'app-document-detail', diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index c451f851e..b17af67eb 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -19,12 +19,10 @@ import { } from '../../common/filterable-dropdown/filterable-dropdown.component' import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component' import { MatchingModel } from 'src/app/data/matching-model' -import { - SettingsService, - SETTINGS_KEYS, -} from 'src/app/services/settings.service' +import { SettingsService } from 'src/app/services/settings.service' import { ToastService } from 'src/app/services/toast.service' import { saveAs } from 'file-saver' +import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings' @Component({ selector: 'app-bulk-editor', diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts index 061a0e681..9b9e20b8c 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts @@ -8,12 +8,12 @@ import { } from '@angular/core' import { PaperlessDocument } from 'src/app/data/paperless-document' import { DocumentService } from 'src/app/services/rest/document.service' -import { - SettingsService, - SETTINGS_KEYS, -} from 'src/app/services/settings.service' +import { SettingsService } from 'src/app/services/settings.service' import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' import { OpenDocumentsService } from 'src/app/services/open-documents.service' +import { DocumentListViewService } from 'src/app/services/document-list-view.service' +import { FILTER_FULLTEXT_MORELIKE } from 'src/app/data/filter-rule-type' +import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings' @Component({ selector: 'app-document-card-large', diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts index c166b42cb..06e2fe967 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts @@ -9,12 +9,10 @@ import { import { map } from 'rxjs/operators' import { PaperlessDocument } from 'src/app/data/paperless-document' import { DocumentService } from 'src/app/services/rest/document.service' -import { - SettingsService, - SETTINGS_KEYS, -} from 'src/app/services/settings.service' +import { SettingsService } from 'src/app/services/settings.service' import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' import { OpenDocumentsService } from 'src/app/services/open-documents.service' +import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings' @Component({ selector: 'app-document-card-small', diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts index ce999c14c..d9877d281 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.ts +++ b/src-ui/src/app/components/manage/settings/settings.component.ts @@ -13,11 +13,11 @@ import { SavedViewService } from 'src/app/services/rest/saved-view.service' import { LanguageOption, SettingsService, - SETTINGS_KEYS, } from 'src/app/services/settings.service' import { ToastService } from 'src/app/services/toast.service' import { dirtyCheck, DirtyComponent } from '@ngneat/dirty-check-forms' import { Observable, Subscription, BehaviorSubject, first } from 'rxjs' +import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings' @Component({ selector: 'app-settings', diff --git a/src-ui/src/app/data/paperless-uisettings.ts b/src-ui/src/app/data/paperless-uisettings.ts new file mode 100644 index 000000000..75aec2a51 --- /dev/null +++ b/src-ui/src/app/data/paperless-uisettings.ts @@ -0,0 +1,117 @@ +export interface PaperlessUiSettings { + user_id: number + + username: string + + display_name: string + + settings: Object +} + +export interface PaperlessUiSetting { + key: string + type: string + default: any +} + +export const SETTINGS_KEYS = { + LANGUAGE: 'language', + // maintain old general-settings: for backwards compatibility + BULK_EDIT_CONFIRMATION_DIALOGS: + 'general-settings:bulk-edit:confirmation-dialogs', + BULK_EDIT_APPLY_ON_CLOSE: 'general-settings:bulk-edit:apply-on-close', + DOCUMENT_LIST_SIZE: 'general-settings:documentListSize', + DARK_MODE_USE_SYSTEM: 'general-settings:dark-mode:use-system', + DARK_MODE_ENABLED: 'general-settings:dark-mode:enabled', + DARK_MODE_THUMB_INVERTED: 'general-settings:dark-mode:thumb-inverted', + THEME_COLOR: 'general-settings:theme:color', + USE_NATIVE_PDF_VIEWER: 'general-settings:document-details:native-pdf-viewer', + DATE_LOCALE: 'general-settings:date-display:date-locale', + DATE_FORMAT: 'general-settings:date-display:date-format', + NOTIFICATIONS_CONSUMER_NEW_DOCUMENT: + 'general-settings:notifications:consumer-new-documents', + NOTIFICATIONS_CONSUMER_SUCCESS: + 'general-settings:notifications:consumer-success', + NOTIFICATIONS_CONSUMER_FAILED: + 'general-settings:notifications:consumer-failed', + NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD: + 'general-settings:notifications:consumer-suppress-on-dashboard', +} + +export const SETTINGS: PaperlessUiSetting[] = [ + { + key: SETTINGS_KEYS.LANGUAGE, + type: 'string', + default: '', + }, + { + key: SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS, + type: 'boolean', + default: true, + }, + { + key: SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE, + type: 'boolean', + default: false, + }, + { + key: SETTINGS_KEYS.DOCUMENT_LIST_SIZE, + type: 'number', + default: 50, + }, + { + key: SETTINGS_KEYS.DARK_MODE_USE_SYSTEM, + type: 'boolean', + default: true, + }, + { + key: SETTINGS_KEYS.DARK_MODE_ENABLED, + type: 'boolean', + default: false, + }, + { + key: SETTINGS_KEYS.DARK_MODE_THUMB_INVERTED, + type: 'boolean', + default: true, + }, + { + key: SETTINGS_KEYS.THEME_COLOR, + type: 'string', + default: '', + }, + { + key: SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, + type: 'boolean', + default: false, + }, + { + key: SETTINGS_KEYS.DATE_LOCALE, + type: 'string', + default: '', + }, + { + key: SETTINGS_KEYS.DATE_FORMAT, + type: 'string', + default: 'mediumDate', + }, + { + key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT, + type: 'boolean', + default: true, + }, + { + key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS, + type: 'boolean', + default: true, + }, + { + key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_FAILED, + type: 'boolean', + default: true, + }, + { + key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD, + type: 'boolean', + default: true, + }, +] diff --git a/src-ui/src/app/pipes/custom-date.pipe.ts b/src-ui/src/app/pipes/custom-date.pipe.ts index bd4833d04..c9cfc2876 100644 --- a/src-ui/src/app/pipes/custom-date.pipe.ts +++ b/src-ui/src/app/pipes/custom-date.pipe.ts @@ -1,6 +1,7 @@ import { DatePipe } from '@angular/common' import { Inject, LOCALE_ID, Pipe, PipeTransform } from '@angular/core' -import { SettingsService, SETTINGS_KEYS } from '../services/settings.service' +import { SETTINGS_KEYS } from '../data/paperless-uisettings' +import { SettingsService } from '../services/settings.service' import { normalizeDateStr } from '../utils/date' const FORMAT_TO_ISO_FORMAT = { diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts index 99349d37f..471fc7944 100644 --- a/src-ui/src/app/services/document-list-view.service.ts +++ b/src-ui/src/app/services/document-list-view.service.ts @@ -8,9 +8,10 @@ import { } from '../data/filter-rule' import { PaperlessDocument } from '../data/paperless-document' import { PaperlessSavedView } from '../data/paperless-saved-view' +import { SETTINGS_KEYS } from '../data/paperless-uisettings' import { DOCUMENT_LIST_SERVICE } from '../data/storage-keys' import { DocumentService, DOCUMENT_SORT_FIELDS } from './rest/document.service' -import { SettingsService, SETTINGS_KEYS } from './settings.service' +import { SettingsService } from './settings.service' /** * Captures the current state of the list view. diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index 81b15e1b0..aeab14df4 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -17,15 +17,13 @@ import { hexToHsl, } from 'src/app/utils/color' import { environment } from 'src/environments/environment' -import { Results } from '../data/results' +import { + PaperlessUiSettings, + SETTINGS, + SETTINGS_KEYS, +} from '../data/paperless-uisettings' import { ToastService } from './toast.service' -export interface PaperlessSettings { - key: string - type: string - default: any -} - export interface LanguageOption { code: string name: string @@ -37,108 +35,6 @@ export interface LanguageOption { dateInputFormat?: string } -export const SETTINGS_KEYS = { - LANGUAGE: 'language', - // maintain old general-settings: for backwards compatibility - BULK_EDIT_CONFIRMATION_DIALOGS: - 'general-settings:bulk-edit:confirmation-dialogs', - BULK_EDIT_APPLY_ON_CLOSE: 'general-settings:bulk-edit:apply-on-close', - DOCUMENT_LIST_SIZE: 'general-settings:documentListSize', - DARK_MODE_USE_SYSTEM: 'general-settings:dark-mode:use-system', - DARK_MODE_ENABLED: 'general-settings:dark-mode:enabled', - DARK_MODE_THUMB_INVERTED: 'general-settings:dark-mode:thumb-inverted', - THEME_COLOR: 'general-settings:theme:color', - USE_NATIVE_PDF_VIEWER: 'general-settings:document-details:native-pdf-viewer', - DATE_LOCALE: 'general-settings:date-display:date-locale', - DATE_FORMAT: 'general-settings:date-display:date-format', - NOTIFICATIONS_CONSUMER_NEW_DOCUMENT: - 'general-settings:notifications:consumer-new-documents', - NOTIFICATIONS_CONSUMER_SUCCESS: - 'general-settings:notifications:consumer-success', - NOTIFICATIONS_CONSUMER_FAILED: - 'general-settings:notifications:consumer-failed', - NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD: - 'general-settings:notifications:consumer-suppress-on-dashboard', -} - -const SETTINGS: PaperlessSettings[] = [ - { - key: SETTINGS_KEYS.LANGUAGE, - type: 'string', - default: '', - }, - { - key: SETTINGS_KEYS.BULK_EDIT_CONFIRMATION_DIALOGS, - type: 'boolean', - default: true, - }, - { - key: SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE, - type: 'boolean', - default: false, - }, - { - key: SETTINGS_KEYS.DOCUMENT_LIST_SIZE, - type: 'number', - default: 50, - }, - { - key: SETTINGS_KEYS.DARK_MODE_USE_SYSTEM, - type: 'boolean', - default: true, - }, - { - key: SETTINGS_KEYS.DARK_MODE_ENABLED, - type: 'boolean', - default: false, - }, - { - key: SETTINGS_KEYS.DARK_MODE_THUMB_INVERTED, - type: 'boolean', - default: true, - }, - { - key: SETTINGS_KEYS.THEME_COLOR, - type: 'string', - default: '', - }, - { - key: SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, - type: 'boolean', - default: false, - }, - { - key: SETTINGS_KEYS.DATE_LOCALE, - type: 'string', - default: '', - }, - { - key: SETTINGS_KEYS.DATE_FORMAT, - type: 'string', - default: 'mediumDate', - }, - { - key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_NEW_DOCUMENT, - type: 'boolean', - default: true, - }, - { - key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUCCESS, - type: 'boolean', - default: true, - }, - { - key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_FAILED, - type: 'boolean', - default: true, - }, - { - key: SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD, - type: 'boolean', - default: true, - }, -] - @Injectable({ providedIn: 'root', }) @@ -161,10 +57,10 @@ export class SettingsService { } // this is called by the app initializer in app.module - public initializeSettings(): Observable<Results<any>> { - let settings$ = this.http.get<Results<any>>(this.baseUrl) - settings$.pipe(first()).subscribe((response) => { - Object.assign(this.settings, response['settings']) + public initializeSettings(): Observable<PaperlessUiSettings> { + let settings$ = this.http.get<PaperlessUiSettings>(this.baseUrl) + settings$.pipe(first()).subscribe((uisettings) => { + Object.assign(this.settings, uisettings.settings) this.maybeMigrateSettings() }) return settings$ From c12e55f54cc5a97ae1fa0aa2d78bfd3b3dbe5d50 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 9 May 2022 11:08:28 -0700 Subject: [PATCH 062/291] Properly get username & display name --- .../app-frame/app-frame.component.html | 10 ++++----- .../app-frame/app-frame.component.ts | 19 +++------------- .../dashboard/dashboard.component.ts | 22 ++++++------------- src-ui/src/app/services/settings.service.ts | 3 +++ src/documents/templates/index.html | 2 -- src/documents/views.py | 5 +++++ 6 files changed, 23 insertions(+), 38 deletions(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index 718e2a242..ce9c8993b 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -21,17 +21,17 @@ </div> <ul ngbNav class="order-sm-3"> <li ngbDropdown class="nav-item dropdown"> - <button class="btn text-light" id="userDropdown" ngbDropdownToggle> - <span *ngIf="displayName" class="navbar-text small me-2 text-light d-none d-sm-inline"> - {{displayName}} + <button class="btn" id="userDropdown" ngbDropdownToggle> + <span class="small me-2 d-none d-sm-inline"> + {{this.settingsService.displayName}} </span> <svg width="1.3em" height="1.3em" fill="currentColor"> <use xlink:href="assets/bootstrap-icons.svg#person-circle"/> </svg> </button> <div ngbDropdownMenu class="dropdown-menu-end shadow me-2" aria-labelledby="userDropdown"> - <div *ngIf="displayName" class="d-sm-none"> - <p class="small mb-0 px-3 text-muted" i18n>Logged in as {{displayName}}</p> + <div class="d-sm-none"> + <p class="small mb-0 px-3 text-muted" i18n>Logged in as {{this.settingsService.displayName}}</p> <div class="dropdown-divider"></div> </div> <a ngbDropdownItem class="nav-link" routerLink="settings" (click)="closeMenu()"> diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts index 9290c09fa..675bfc920 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.ts @@ -23,6 +23,7 @@ import { AppRemoteVersion, } from 'src/app/services/rest/remote-version.service' import { QueryParamsService } from 'src/app/services/query-params.service' +import { SettingsService } from 'src/app/services/settings.service' @Component({ selector: 'app-app-frame', @@ -36,10 +37,9 @@ export class AppFrameComponent { private openDocumentsService: OpenDocumentsService, private searchService: SearchService, public savedViewService: SavedViewService, - private list: DocumentListViewService, - private meta: Meta, private remoteVersionService: RemoteVersionService, - private queryParamsService: QueryParamsService + private queryParamsService: QueryParamsService, + public settingsService: SettingsService ) { this.remoteVersionService .checkForUpdates() @@ -143,17 +143,4 @@ export class AppFrameComponent { } }) } - - get displayName() { - // TODO: taken from dashboard component, is this the best way to pass around username? - let tagFullName = this.meta.getTag('name=full_name') - let tagUsername = this.meta.getTag('name=username') - if (tagFullName && tagFullName.content) { - return tagFullName.content - } else if (tagUsername && tagUsername.content) { - return tagUsername.content - } else { - return null - } - } } diff --git a/src-ui/src/app/components/dashboard/dashboard.component.ts b/src-ui/src/app/components/dashboard/dashboard.component.ts index 640883f6f..a58140d5a 100644 --- a/src-ui/src/app/components/dashboard/dashboard.component.ts +++ b/src-ui/src/app/components/dashboard/dashboard.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core' import { Meta } from '@angular/platform-browser' import { SavedViewService } from 'src/app/services/rest/saved-view.service' +import { SettingsService } from 'src/app/services/settings.service' @Component({ selector: 'app-dashboard', @@ -8,23 +9,14 @@ import { SavedViewService } from 'src/app/services/rest/saved-view.service' styleUrls: ['./dashboard.component.scss'], }) export class DashboardComponent { - constructor(public savedViewService: SavedViewService, private meta: Meta) {} - - get displayName() { - let tagFullName = this.meta.getTag('name=full_name') - let tagUsername = this.meta.getTag('name=username') - if (tagFullName && tagFullName.content) { - return tagFullName.content - } else if (tagUsername && tagUsername.content) { - return tagUsername.content - } else { - return null - } - } + constructor( + public savedViewService: SavedViewService, + public settingsService: SettingsService + ) {} get subtitle() { - if (this.displayName) { - return $localize`Hello ${this.displayName}, welcome to Paperless-ngx!` + if (this.settingsService.displayName) { + return $localize`Hello ${this.settingsService.displayName}, welcome to Paperless-ngx!` } else { return $localize`Welcome to Paperless-ngx!` } diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index aeab14df4..4aa125380 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -44,6 +44,8 @@ export class SettingsService { private settings: Object = {} + public displayName: string + constructor( rendererFactory: RendererFactory2, @Inject(DOCUMENT) private document, @@ -62,6 +64,7 @@ export class SettingsService { settings$.pipe(first()).subscribe((uisettings) => { Object.assign(this.settings, uisettings.settings) this.maybeMigrateSettings() + this.displayName = uisettings.display_name.trim() }) return settings$ } diff --git a/src/documents/templates/index.html b/src/documents/templates/index.html index 2778bce7a..fb817bfea 100644 --- a/src/documents/templates/index.html +++ b/src/documents/templates/index.html @@ -9,8 +9,6 @@ <title>Paperless-ngx - - diff --git a/src/documents/views.py b/src/documents/views.py index a47c7c74f..16bb28e15 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -729,12 +729,17 @@ class UiSettingsView(GenericAPIView): serializer.is_valid(raise_exception=True) user = User.objects.get(pk=request.user.id) + displayname = user.username + if user.first_name or user.last_name: + displayname = " ".join([user.first_name, user.last_name]) settings = [] if hasattr(user, "ui_settings"): settings = user.ui_settings.settings return Response( { "user_id": user.id, + "username": user.username, + "display_name": displayname, "settings": settings, }, ) From e8ead471a9f5bd3e5b0f1c705f2e4c4f701f9bd0 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 9 May 2022 16:31:20 -0700 Subject: [PATCH 063/291] Remove post_save receiver --- src/documents/models.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/documents/models.py b/src/documents/models.py index 208938509..6388cb5b0 100644 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -9,8 +9,6 @@ import pathvalidate from django.conf import settings from django.contrib.auth.models import User from django.db import models -from django.db.models.signals import post_save -from django.dispatch import receiver from django.utils import timezone from django.utils.translation import gettext_lazy as _ from documents.parsers import get_default_file_extension @@ -481,9 +479,3 @@ class UiSettings(models.Model): def __str__(self): return self.user.username - - -@receiver(post_save, sender=User) -def create_user_ui_settings(sender, instance, created, **kwargs): - if created: - UiSettings.objects.create(user=instance) From 8cda57588d30cb145a4e4974f914f8560d4492b9 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 9 May 2022 21:18:30 -0700 Subject: [PATCH 064/291] basic python tests --- src/documents/tests/test_api.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index b492181d8..1b88e6a3d 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -22,6 +22,7 @@ from documents.models import DocumentType from documents.models import MatchingModel from documents.models import SavedView from documents.models import Tag +from documents.models import UiSettings from documents.tests.utils import DirectoriesMixin from paperless import version from rest_framework.test import APITestCase @@ -1365,6 +1366,27 @@ class TestDocumentApiV2(DirectoriesMixin, APITestCase): "#000000", ) + def test_ui_settings(self): + test_user = User.objects.create_superuser(username="test") + self.client.force_login(user=test_user) + + response = self.client.get(f"/api/ui_settings/", format="json") + self.assertEqual(response.status_code, 200) + self.assertEqual( + response.data["settings"], + [], + ) + + UiSettings.objects.create( + user=test_user, + settings='{"dark_mode":[{"enabled":"true"}]}', + ) + response = self.client.get(f"/api/ui_settings/", format="json") + self.assertNotEqual( + response.data["settings"], + [], + ) + class TestBulkEdit(DirectoriesMixin, APITestCase): def setUp(self): From ec317941de25ce23247236605ecd239f61e1bbcb Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 9 May 2022 21:41:51 -0700 Subject: [PATCH 065/291] Update frontend strings --- src-ui/messages.xlf | 151 +++++++++++++++++++++++++------------------- 1 file changed, 86 insertions(+), 65 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 0c9ca23e0..ed06c39ed 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -256,21 +256,21 @@ Document added src/app/app.component.ts - 71 + 72 Document was added to paperless. src/app/app.component.ts - 73 + 74 Open document src/app/app.component.ts - 74 + 75 src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html @@ -281,28 +281,28 @@ Could not add : src/app/app.component.ts - 89 + 90 New document detected src/app/app.component.ts - 103 + 104 Document is being processed by paperless. src/app/app.component.ts - 105 + 106 Initiating upload... src/app/app.component.ts - 140 + 141 @@ -321,7 +321,7 @@ - Logged in as + Logged in as src/app/components/app-frame/app-frame.component.html 34 @@ -368,7 +368,7 @@ src/app/components/document-list/document-list.component.ts - 68 + 69 src/app/components/manage/management-list/management-list.component.html @@ -551,15 +551,15 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 217 + 215 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 255 + 253 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 291 + 289 @@ -942,17 +942,17 @@ - Hello , welcome to Paperless-ngx! + Hello , welcome to Paperless-ngx! src/app/components/dashboard/dashboard.component.ts - 27 + 20 Welcome to Paperless-ngx! src/app/components/dashboard/dashboard.component.ts - 29 + 22 @@ -1095,7 +1095,7 @@ src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 162 + 160 this string is used to separate processing, failed and added on the file upload widget @@ -1560,25 +1560,25 @@ )"/> src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 97,99 + 95,97 "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 154 + 152 src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 160 + 158 "" and "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 156 + 154 This is for messages like 'modify "tag1" and "tag2"' @@ -1586,7 +1586,7 @@ and "" src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 164,166 + 162,164 this is for messages like 'modify "tag1", "tag2" and "tag3"' @@ -1594,14 +1594,14 @@ Confirm tags assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 181 + 179 This operation will add the tag "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 187 + 185 @@ -1610,14 +1610,14 @@ )"/> to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 192,194 + 190,192 This operation will remove the tag "" from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 200 + 198 @@ -1626,7 +1626,7 @@ )"/> from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 205,207 + 203,205 @@ -1637,77 +1637,77 @@ )"/> on selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 209,213 + 207,211 Confirm correspondent assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 248 + 246 This operation will assign the correspondent "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 250 + 248 This operation will remove the correspondent from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 252 + 250 Confirm document type assignment src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 284 + 282 This operation will assign the document type "" to selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 286 + 284 This operation will remove the document type from selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 288 + 286 Delete confirm src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 309 + 307 This operation will permanently delete selected document(s). src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 310 + 308 This operation cannot be undone. src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 311 + 309 Delete document(s) src/app/components/document-list/bulk-editor/bulk-editor.component.ts - 313 + 311 @@ -1913,14 +1913,14 @@ View "" saved successfully. src/app/components/document-list/document-list.component.ts - 197 + 198 View "" created successfully. src/app/components/document-list/document-list.component.ts - 227 + 228 @@ -2512,21 +2512,28 @@ Settings saved successfully. src/app/components/manage/settings/settings.component.ts - 233 + 238 + + + + An error occurred while saving settings. + + src/app/components/manage/settings/settings.component.ts + 242 Use system language src/app/components/manage/settings/settings.component.ts - 237 + 250 Use date format of display language src/app/components/manage/settings/settings.component.ts - 244 + 257 @@ -2535,7 +2542,7 @@ )"/> src/app/components/manage/settings/settings.component.ts - 264,266 + 277,279 @@ -2853,154 +2860,168 @@ English (US) src/app/services/settings.service.ts - 184 + 136 Belarusian src/app/services/settings.service.ts - 190 + 142 Czech src/app/services/settings.service.ts - 196 + 148 Danish src/app/services/settings.service.ts - 202 + 154 German src/app/services/settings.service.ts - 208 + 160 English (GB) src/app/services/settings.service.ts - 214 + 166 Spanish src/app/services/settings.service.ts - 220 + 172 French src/app/services/settings.service.ts - 226 + 178 Italian src/app/services/settings.service.ts - 232 + 184 Luxembourgish src/app/services/settings.service.ts - 238 + 190 Dutch src/app/services/settings.service.ts - 244 + 196 Polish src/app/services/settings.service.ts - 250 + 202 Portuguese (Brazil) src/app/services/settings.service.ts - 256 + 208 Portuguese src/app/services/settings.service.ts - 262 + 214 Romanian src/app/services/settings.service.ts - 268 + 220 Russian src/app/services/settings.service.ts - 274 + 226 Slovenian src/app/services/settings.service.ts - 280 + 232 Serbian src/app/services/settings.service.ts - 286 + 238 Swedish src/app/services/settings.service.ts - 292 + 244 Turkish src/app/services/settings.service.ts - 298 + 250 Chinese Simplified src/app/services/settings.service.ts - 304 + 256 ISO 8601 src/app/services/settings.service.ts - 321 + 273 + + + + Successfully completed one-time migratration of settings to the database! + + src/app/services/settings.service.ts + 368 + + + + Unable to migrate settings to the database, please try saving manually. + + src/app/services/settings.service.ts + 369 From 6f402376ce35bf36b5c9c21f79fe87202b105c33 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 11 May 2022 10:39:21 -0700 Subject: [PATCH 066/291] Note JSON1 extension requirement on bare metal installs --- docs/setup.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/setup.rst b/docs/setup.rst index d3290b432..80874820d 100644 --- a/docs/setup.rst +++ b/docs/setup.rst @@ -332,6 +332,12 @@ writing. Windows is not and will never be supported. 3. Optional. Install ``postgresql`` and configure a database, user and password for paperless. If you do not wish to use PostgreSQL, SQLite is available as well. + .. note:: + + On bare-metal installations using SQLite, ensure the + `JSON1 extension `_ is enabled. This is + usually the case, but not always. + 4. Get the release archive from ``_. If you clone the git repo as it is, you also have to compile the front end by yourself. Extract the archive to a place from where you wish to execute it, such as ``/opt/paperless``. From b7b44bfb4e754797a72eb56c5889d41ab4252d77 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 11 May 2022 10:43:32 -0700 Subject: [PATCH 067/291] Code suggestions Co-Authored-By: Trenton Holmes <797416+stumpylog@users.noreply.github.com> --- src/documents/serialisers.py | 2 +- src/documents/tests/test_api.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index a26b67e43..3a765a805 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -511,7 +511,7 @@ class UiSettingsViewSerializer(serializers.ModelSerializer): ] def update(self, instance, validated_data): - super(UiSettingsViewSerializer, self).update(instance, validated_data) + super().update(instance, validated_data) return instance def create(self, validated_data): diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index 1b88e6a3d..38a377c15 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -1384,7 +1384,7 @@ class TestDocumentApiV2(DirectoriesMixin, APITestCase): response = self.client.get(f"/api/ui_settings/", format="json") self.assertNotEqual( response.data["settings"], - [], + "{}", ) From 78b721a81791460a3f94fe2712aea64321c02059 Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Wed, 11 May 2022 11:33:08 -0700 Subject: [PATCH 068/291] Makes minor improvements to ui_settings API testing --- src/documents/tests/test_api.py | 35 ++++++++++++++++++++++++--------- src/documents/views.py | 2 +- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index 38a377c15..2b3643136 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -1370,21 +1370,38 @@ class TestDocumentApiV2(DirectoriesMixin, APITestCase): test_user = User.objects.create_superuser(username="test") self.client.force_login(user=test_user) - response = self.client.get(f"/api/ui_settings/", format="json") + response = self.client.get("/api/ui_settings/", format="json") self.assertEqual(response.status_code, 200) - self.assertEqual( + self.assertDictEqual( response.data["settings"], - [], + {}, ) - UiSettings.objects.create( - user=test_user, - settings='{"dark_mode":[{"enabled":"true"}]}', + settings = { + "settings": { + "dark_mode": { + "enabled": True, + }, + }, + } + + response = self.client.post( + "/api/ui_settings/", + json.dumps(settings), + content_type="application/json", ) - response = self.client.get(f"/api/ui_settings/", format="json") - self.assertNotEqual( + + self.assertEqual(response.status_code, 200) + + response = self.client.get("/api/ui_settings/", format="json") + + print(response) + print(response.data) + + self.assertEqual(response.status_code, 200) + self.assertDictEqual( response.data["settings"], - "{}", + settings["settings"], ) diff --git a/src/documents/views.py b/src/documents/views.py index 16bb28e15..e718d5c43 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -732,7 +732,7 @@ class UiSettingsView(GenericAPIView): displayname = user.username if user.first_name or user.last_name: displayname = " ".join([user.first_name, user.last_name]) - settings = [] + settings = {} if hasattr(user, "ui_settings"): settings = user.ui_settings.settings return Response( From cb65c5e6d560a5c00ccb9d5b2b9e659b68adb58a Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Wed, 11 May 2022 12:35:12 -0700 Subject: [PATCH 069/291] Removes accidental printing left in testing --- src/documents/tests/test_api.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index 2b3643136..763070715 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -1395,9 +1395,6 @@ class TestDocumentApiV2(DirectoriesMixin, APITestCase): response = self.client.get("/api/ui_settings/", format="json") - print(response) - print(response.data) - self.assertEqual(response.status_code, 200) self.assertDictEqual( response.data["settings"], From 099fc21764ddc9d5cca8155cb3c62d1ffb3a7c57 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 11 May 2022 21:49:46 -0700 Subject: [PATCH 070/291] Add ui_settings to exporter --- src/documents/management/commands/document_exporter.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/documents/management/commands/document_exporter.py b/src/documents/management/commands/document_exporter.py index 27f1fd8a9..4bddd51b8 100644 --- a/src/documents/management/commands/document_exporter.py +++ b/src/documents/management/commands/document_exporter.py @@ -18,6 +18,7 @@ from documents.models import DocumentType from documents.models import SavedView from documents.models import SavedViewFilterRule from documents.models import Tag +from documents.models import UiSettings from documents.settings import EXPORTER_ARCHIVE_NAME from documents.settings import EXPORTER_FILE_NAME from documents.settings import EXPORTER_THUMBNAIL_NAME @@ -112,8 +113,8 @@ class Command(BaseCommand): map(lambda f: os.path.abspath(os.path.join(root, f)), files), ) - # 2. Create manifest, containing all correspondents, types, tags and - # documents + # 2. Create manifest, containing all correspondents, types, tags, + # documents and ui_settings with transaction.atomic(): manifest = json.loads( serializers.serialize("json", Correspondent.objects.all()), @@ -150,6 +151,10 @@ class Command(BaseCommand): manifest += json.loads(serializers.serialize("json", User.objects.all())) + manifest += json.loads( + serializers.serialize("json", UiSettings.objects.all()), + ) + # 3. Export files from each document for index, document_dict in tqdm.tqdm( enumerate(document_manifest), From 6852f24c8f871aec90f3eb216c64a42da6566ec7 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 13 May 2022 20:45:40 -0700 Subject: [PATCH 071/291] Correct translation string locations --- src-ui/messages.xlf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index ed06c39ed..ddd284ce4 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -945,14 +945,14 @@ Hello , welcome to Paperless-ngx! src/app/components/dashboard/dashboard.component.ts - 20 + 19 Welcome to Paperless-ngx! src/app/components/dashboard/dashboard.component.ts - 22 + 21 @@ -1458,7 +1458,7 @@ Confirm delete src/app/components/document-detail/document-detail.component.ts - 423 + 421 src/app/components/manage/management-list/management-list.component.ts @@ -1469,28 +1469,28 @@ Do you really want to delete document ""? src/app/components/document-detail/document-detail.component.ts - 424 + 422 The files for this document will be deleted permanently. This operation cannot be undone. src/app/components/document-detail/document-detail.component.ts - 425 + 423 Delete document src/app/components/document-detail/document-detail.component.ts - 427 + 425 Error deleting document: src/app/components/document-detail/document-detail.component.ts - 443 + 441 From 28a1c3e24919214af0849372c76fedf318d67334 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 13 May 2022 21:31:40 -0700 Subject: [PATCH 072/291] Update settings e2e fixture --- .../fixtures/ui_settings/settings.json | 57 ++++++++++--------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/src-ui/cypress/fixtures/ui_settings/settings.json b/src-ui/cypress/fixtures/ui_settings/settings.json index 9a92ba410..0e844b5e1 100644 --- a/src-ui/cypress/fixtures/ui_settings/settings.json +++ b/src-ui/cypress/fixtures/ui_settings/settings.json @@ -1,29 +1,34 @@ { - "bulk_edit": { - "apply_on_close": false, - "confirmation_dialogs": true - }, - "dark_mode": { - "enabled": "false", - "thumb_inverted": "true", - "use_system": true - }, - "date_display": { - "date_format": "mediumDate", - "date_locale": "" - }, - "documentListSize": 50, - "document_details": { - "native_pdf_viewer": false - }, - "language": "", - "notifications": { - "consumer_failed": true, - "consumer_new_documents": true, - "consumer_success": true, - "consumer_suppress_on_dashboard": true - }, - "theme": { - "color": "#cd42cf" + "user_id": 1, + "username": "admin", + "display_name": "Admin", + "settings": { + "language": "", + "bulk_edit": { + "confirmation_dialogs": true, + "apply_on_close": false + }, + "documentListSize": 50, + "dark_mode": { + "use_system": true, + "enabled": "false", + "thumb_inverted": "true" + }, + "theme": { + "color": "#b198e5" + }, + "document_details": { + "native_pdf_viewer": false + }, + "date_display": { + "date_locale": "", + "date_format": "mediumDate" + }, + "notifications": { + "consumer_new_documents": true, + "consumer_success": true, + "consumer_failed": true, + "consumer_suppress_on_dashboard": true + } } } From 097795bf0c13084724e5a7acb37c103c845ba582 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 17 May 2022 16:12:59 -0700 Subject: [PATCH 073/291] tap ui settings get to avoid dup --- src-ui/src/app/app.module.ts | 1 - src-ui/src/app/services/settings.service.ts | 17 +++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index 79bbe9700..0c9d628d0 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -87,7 +87,6 @@ import localeSr from '@angular/common/locales/sr' import localeSv from '@angular/common/locales/sv' import localeTr from '@angular/common/locales/tr' import localeZh from '@angular/common/locales/zh' -import { Observable } from 'rxjs' import { SettingsService } from './services/settings.service' registerLocaleData(localeBe) diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index 4aa125380..6ab52d086 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -10,7 +10,7 @@ import { } from '@angular/core' import { Meta } from '@angular/platform-browser' import { CookieService } from 'ngx-cookie-service' -import { first, Observable } from 'rxjs' +import { first, Observable, tap } from 'rxjs' import { BRIGHTNESS, estimateBrightnessForColor, @@ -60,13 +60,14 @@ export class SettingsService { // this is called by the app initializer in app.module public initializeSettings(): Observable { - let settings$ = this.http.get(this.baseUrl) - settings$.pipe(first()).subscribe((uisettings) => { - Object.assign(this.settings, uisettings.settings) - this.maybeMigrateSettings() - this.displayName = uisettings.display_name.trim() - }) - return settings$ + return this.http.get(this.baseUrl).pipe( + first(), + tap((uisettings) => { + Object.assign(this.settings, uisettings.settings) + this.maybeMigrateSettings() + this.displayName = uisettings.display_name.trim() + }) + ) } public updateAppearanceSettings( From 51b552168aa3d8f5b8400166335b55b7e0e303ba Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 18 May 2022 02:41:15 -0700 Subject: [PATCH 074/291] pull frontend lang setting from db if set --- src-ui/src/app/services/settings.service.ts | 3 +++ src/documents/views.py | 24 ++++++++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index 6ab52d086..14d261789 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -65,6 +65,9 @@ export class SettingsService { tap((uisettings) => { Object.assign(this.settings, uisettings.settings) this.maybeMigrateSettings() + // to update lang cookie + if (this.settings['language']?.length) + this.setLanguage(this.settings['language']) this.displayName = uisettings.display_name.trim() }) ) diff --git a/src/documents/views.py b/src/documents/views.py index e718d5c43..ebdb9f445 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -83,12 +83,18 @@ logger = logging.getLogger("paperless.api") class IndexView(TemplateView): template_name = "index.html" - def get_language(self): + def get_frontend_language(self): + if hasattr( + self.request.user, + "ui_settings", + ) and self.request.user.ui_settings.settings.get("language"): + lang = self.request.user.ui_settings.settings.get("language") + else: + lang = get_language() # This is here for the following reason: # Django identifies languages in the form "en-us" # However, angular generates locales as "en-US". # this translates between these two forms. - lang = get_language() if "-" in lang: first = lang[: lang.index("-")] second = lang[lang.index("-") + 1 :] @@ -101,16 +107,18 @@ class IndexView(TemplateView): context["cookie_prefix"] = settings.COOKIE_PREFIX context["username"] = self.request.user.username context["full_name"] = self.request.user.get_full_name() - context["styles_css"] = f"frontend/{self.get_language()}/styles.css" - context["runtime_js"] = f"frontend/{self.get_language()}/runtime.js" - context["polyfills_js"] = f"frontend/{self.get_language()}/polyfills.js" - context["main_js"] = f"frontend/{self.get_language()}/main.js" + context["styles_css"] = f"frontend/{self.get_frontend_language()}/styles.css" + context["runtime_js"] = f"frontend/{self.get_frontend_language()}/runtime.js" + context[ + "polyfills_js" + ] = f"frontend/{self.get_frontend_language()}/polyfills.js" + context["main_js"] = f"frontend/{self.get_frontend_language()}/main.js" context[ "webmanifest" - ] = f"frontend/{self.get_language()}/manifest.webmanifest" # noqa: E501 + ] = f"frontend/{self.get_frontend_language()}/manifest.webmanifest" # noqa: E501 context[ "apple_touch_icon" - ] = f"frontend/{self.get_language()}/apple-touch-icon.png" # noqa: E501 + ] = f"frontend/{self.get_frontend_language()}/apple-touch-icon.png" # noqa: E501 return context From 87866bcab0ccf67913e33fb208f0e1cfaab869c7 Mon Sep 17 00:00:00 2001 From: Philipp <151498+eingemaischt@users.noreply.github.com> Date: Wed, 18 May 2022 11:56:32 +0200 Subject: [PATCH 075/291] Add "Created" as additional (optional) parameter for post_documents (#965) * Added "created" as optional parameter for post_documents. * Fixed Conflict * After Black Reformatting * Run "add-trailing-comma" * The right order between black and trailing comma is important.... * Added required=False * Adds unit test for optional created in document api POST * Fixes adding of settings override * And a mis-added print, sigh Co-authored-by: Philipp Co-authored-by: Trenton Holmes --- docs/api.rst | 2 ++ src/documents/consumer.py | 10 +++++++++- src/documents/serialisers.py | 7 +++++++ src/documents/tasks.py | 2 ++ src/documents/tests/test_api.py | 33 +++++++++++++++++++++++++++++++++ src/documents/views.py | 2 ++ 6 files changed, 55 insertions(+), 1 deletion(-) diff --git a/docs/api.rst b/docs/api.rst index 7cbf08718..c23866b60 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -240,11 +240,13 @@ be instructed to consume the document from there. The endpoint supports the following optional form fields: * ``title``: Specify a title that the consumer should use for the document. +* ``created``: Specify a DateTime where the document was created (e.g. "2016-04-19" or "2016-04-19 06:15:00+02:00"). * ``correspondent``: Specify the ID of a correspondent that the consumer should use for the document. * ``document_type``: Similar to correspondent. * ``tags``: Similar to correspondent. Specify this multiple times to have multiple tags added to the document. + The endpoint will immediately return "OK" if the document consumption process was started successfully. No additional status information about the consumption process itself is available, since that happens in a different process. diff --git a/src/documents/consumer.py b/src/documents/consumer.py index 061f17ee1..5e3d01fbc 100644 --- a/src/documents/consumer.py +++ b/src/documents/consumer.py @@ -189,6 +189,7 @@ class Consumer(LoggingMixin): override_document_type_id=None, override_tag_ids=None, task_id=None, + override_created=None, ) -> Document: """ Return the document object if it was successfully created. @@ -201,6 +202,7 @@ class Consumer(LoggingMixin): self.override_document_type_id = override_document_type_id self.override_tag_ids = override_tag_ids self.task_id = task_id or str(uuid.uuid4()) + self.override_created = override_created self._send_progress(0, 100, "STARTING", MESSAGE_NEW_FILE) @@ -394,7 +396,13 @@ class Consumer(LoggingMixin): self.log("debug", "Saving record to database") - if file_info.created is not None: + if self.override_created is not None: + create_date = self.override_created + self.log( + "debug", + f"Creation date from post_documents parameter: {create_date}", + ) + elif file_info.created is not None: create_date = file_info.created self.log("debug", f"Creation date from FileInfo: {create_date}") elif date is not None: diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index a257a1dd6..1bdcbab9e 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -412,6 +412,13 @@ class BulkEditSerializer(DocumentListSerializer): class PostDocumentSerializer(serializers.Serializer): + created = serializers.DateTimeField( + label="Created", + allow_null=True, + write_only=True, + required=False, + ) + document = serializers.FileField( label="Document", write_only=True, diff --git a/src/documents/tasks.py b/src/documents/tasks.py index 7fd1f5672..029c207c3 100644 --- a/src/documents/tasks.py +++ b/src/documents/tasks.py @@ -238,6 +238,7 @@ def consume_file( override_document_type_id=None, override_tag_ids=None, task_id=None, + override_created=None, ): # check for separators in current document @@ -318,6 +319,7 @@ def consume_file( override_document_type_id=override_document_type_id, override_tag_ids=override_tag_ids, task_id=task_id, + override_created=override_created, ) if document: diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index b492181d8..d8dfcf455 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -9,6 +9,11 @@ import zipfile from unittest import mock from unittest.mock import MagicMock +try: + import zoneinfo +except ImportError: + import backports.zoneinfo as zoneinfo + import pytest from django.conf import settings from django.contrib.auth.models import User @@ -955,6 +960,34 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): async_task.assert_not_called() + @mock.patch("documents.views.async_task") + def test_upload_with_created(self, async_task): + created = datetime.datetime( + 2022, + 5, + 12, + 0, + 0, + 0, + 0, + tzinfo=zoneinfo.ZoneInfo("America/Los_Angeles"), + ) + with open( + os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"), + "rb", + ) as f: + response = self.client.post( + "/api/documents/post_document/", + {"document": f, "created": created}, + ) + self.assertEqual(response.status_code, 200) + + async_task.assert_called_once() + + args, kwargs = async_task.call_args + + self.assertEqual(kwargs["override_created"], created) + def test_get_metadata(self): doc = Document.objects.create( title="test", diff --git a/src/documents/views.py b/src/documents/views.py index 5d179da02..414ccf070 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -504,6 +504,7 @@ class PostDocumentView(GenericAPIView): document_type_id = serializer.validated_data.get("document_type") tag_ids = serializer.validated_data.get("tags") title = serializer.validated_data.get("title") + created = serializer.validated_data.get("created") t = int(mktime(datetime.now().timetuple())) @@ -530,6 +531,7 @@ class PostDocumentView(GenericAPIView): override_tag_ids=tag_ids, task_id=task_id, task_name=os.path.basename(doc_name)[:100], + override_created=created, ) return Response("OK") From caa9c49e0579d8431686cdf01976a67c9b1be370 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 15 May 2022 21:09:42 -0700 Subject: [PATCH 076/291] use created_date --- .../saved-view-widget.component.html | 2 +- .../document-detail.component.html | 2 +- .../document-detail.component.ts | 34 ++----------------- src-ui/src/app/data/paperless-document.ts | 4 +++ src-ui/src/app/pipes/custom-date.pipe.ts | 2 -- src-ui/src/app/utils/date.ts | 5 --- .../app/utils/ngb-iso-date-time-adapter.ts | 23 ++++++++----- src/documents/models.py | 4 +++ src/documents/serialisers.py | 15 ++++++++ 9 files changed, 43 insertions(+), 48 deletions(-) delete mode 100644 src-ui/src/app/utils/date.ts diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html index 50d064c37..84ee1aabe 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html @@ -12,7 +12,7 @@ - {{doc.created | customDate}} + {{doc.created_date | customDate}} {{doc.title | documentTitle}} diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html index a4203473f..ca4fb4275 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.html +++ b/src-ui/src/app/components/document-detail/document-detail.component.html @@ -68,7 +68,7 @@ - + { + .subscribe(() => { this.error = null - if (this.ogDate) { - try { - let newDate = new Date(normalizeDateStr(changes['created'])) - newDate.setHours( - this.ogDate.getHours(), - this.ogDate.getMinutes(), - this.ogDate.getSeconds(), - this.ogDate.getMilliseconds() - ) - this.documentForm.patchValue( - { created: newDate.toISOString() }, - { emitEvent: false } - ) - } catch (e) { - // catch this before we try to save and simulate an api error - this.error = { created: e.message } - } - } - Object.assign(this.document, this.documentForm.value) }) @@ -223,25 +203,17 @@ export class DocumentDetailComponent }, }) - this.ogDate = new Date(normalizeDateStr(doc.created.toString())) - // Initialize dirtyCheck this.store = new BehaviorSubject({ title: doc.title, content: doc.content, - created: this.ogDate.toISOString(), + created_date: doc.created_date, correspondent: doc.correspondent, document_type: doc.document_type, archive_serial_number: doc.archive_serial_number, tags: [...doc.tags], }) - // start with ISO8601 string - this.documentForm.patchValue( - { created: this.ogDate.toISOString() }, - { emitEvent: false } - ) - this.isDirty$ = dirtyCheck( this.documentForm, this.store.asObservable() diff --git a/src-ui/src/app/data/paperless-document.ts b/src-ui/src/app/data/paperless-document.ts index 92a5aee45..051fa0aaa 100644 --- a/src-ui/src/app/data/paperless-document.ts +++ b/src-ui/src/app/data/paperless-document.ts @@ -32,8 +32,12 @@ export interface PaperlessDocument extends ObjectWithId { checksum?: string + // UTC created?: Date + // localized date + created_date?: Date + modified?: Date added?: Date diff --git a/src-ui/src/app/pipes/custom-date.pipe.ts b/src-ui/src/app/pipes/custom-date.pipe.ts index bd4833d04..bf5ab1457 100644 --- a/src-ui/src/app/pipes/custom-date.pipe.ts +++ b/src-ui/src/app/pipes/custom-date.pipe.ts @@ -1,7 +1,6 @@ import { DatePipe } from '@angular/common' import { Inject, LOCALE_ID, Pipe, PipeTransform } from '@angular/core' import { SettingsService, SETTINGS_KEYS } from '../services/settings.service' -import { normalizeDateStr } from '../utils/date' const FORMAT_TO_ISO_FORMAT = { longDate: 'y-MM-dd', @@ -34,7 +33,6 @@ export class CustomDatePipe implements PipeTransform { this.settings.get(SETTINGS_KEYS.DATE_LOCALE) || this.defaultLocale let f = format || this.settings.get(SETTINGS_KEYS.DATE_FORMAT) - if (typeof value == 'string') value = normalizeDateStr(value) if (l == 'iso-8601') { return this.datePipe.transform(value, FORMAT_TO_ISO_FORMAT[f], timezone) } else { diff --git a/src-ui/src/app/utils/date.ts b/src-ui/src/app/utils/date.ts deleted file mode 100644 index b62ffc939..000000000 --- a/src-ui/src/app/utils/date.ts +++ /dev/null @@ -1,5 +0,0 @@ -// see https://github.com/dateutil/dateutil/issues/878 , JS Date does not -// seem to accept these strings as valid dates so we must normalize offset -export function normalizeDateStr(dateStr: string): string { - return dateStr.replace(/[\+-](\d\d):\d\d:\d\d/gm, `-$1:00`) -} diff --git a/src-ui/src/app/utils/ngb-iso-date-time-adapter.ts b/src-ui/src/app/utils/ngb-iso-date-time-adapter.ts index b9acc38ec..9d0ea4de6 100644 --- a/src-ui/src/app/utils/ngb-iso-date-time-adapter.ts +++ b/src-ui/src/app/utils/ngb-iso-date-time-adapter.ts @@ -5,11 +5,20 @@ import { NgbDateAdapter, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap' export class ISODateTimeAdapter extends NgbDateAdapter { fromModel(value: string | null): NgbDateStruct | null { if (value) { - let date = new Date(value) - return { - day: date.getDate(), - month: date.getMonth() + 1, - year: date.getFullYear(), + if (value.match(/\d\d\d\d\-\d\d\-\d\d/g)) { + const segs = value.split('-') + return { + year: parseInt(segs[0]), + month: parseInt(segs[1]), + day: parseInt(segs[2]), + } + } else { + let date = new Date(value) + return { + day: date.getDate(), + month: date.getMonth() + 1, + year: date.getFullYear(), + } } } else { return null @@ -17,8 +26,6 @@ export class ISODateTimeAdapter extends NgbDateAdapter { } toModel(date: NgbDateStruct | null): string | null { - return date - ? new Date(date.year, date.month - 1, date.day).toISOString() - : null + return date ? [date.year, date.month, date.day].join('-') : null } } diff --git a/src/documents/models.py b/src/documents/models.py index 206df4e8a..cc4cd0613 100644 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -279,6 +279,10 @@ class Document(models.Model): def thumbnail_file(self): return open(self.thumbnail_path, "rb") + @property + def created_date(self): + return timezone.localdate(self.created) + class Log(models.Model): diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 1bdcbab9e..564c0aae5 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -1,7 +1,10 @@ +import datetime import math import re import magic +from dateutil import tz +from django.conf import settings from django.utils.text import slugify from django.utils.translation import gettext as _ from rest_framework import serializers @@ -206,6 +209,7 @@ class DocumentSerializer(DynamicFieldsModelSerializer): original_file_name = SerializerMethodField() archived_file_name = SerializerMethodField() + created_date = serializers.DateField() def get_original_file_name(self, obj): return obj.get_public_filename() @@ -216,6 +220,16 @@ class DocumentSerializer(DynamicFieldsModelSerializer): else: return None + def update(self, instance, validated_data): + if "created_date" in validated_data and "created" not in validated_data: + new_datetime = datetime.datetime.combine( + validated_data.get("created_date"), + datetime.time(0, 0, 0, 0, tz.gettz(settings.TIME_ZONE)), + ) + instance.created = new_datetime + instance.save() + return instance + class Meta: model = Document depth = 1 @@ -227,6 +241,7 @@ class DocumentSerializer(DynamicFieldsModelSerializer): "content", "tags", "created", + "created_date", "modified", "added", "archive_serial_number", From ddbe733140e8f63312acb105145c24a4de884c80 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 16 May 2022 00:01:57 -0700 Subject: [PATCH 077/291] only pass created_date from frontend --- src-ui/src/app/services/rest/document.service.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts index 3b242543e..880d119dc 100644 --- a/src-ui/src/app/services/rest/document.service.ts +++ b/src-ui/src/app/services/rest/document.service.ts @@ -121,6 +121,12 @@ export class DocumentService extends AbstractPaperlessService return url } + update(o: PaperlessDocument): Observable { + // we want to only set created_date + o.created = undefined + return super.update(o) + } + uploadDocument(formData) { return this.http.post( this.getResourceUrl(null, 'post_document'), From bc7bf74bf81690a1cafb6829ffc138b94f854146 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 16 May 2022 00:13:25 -0700 Subject: [PATCH 078/291] fix docs update endpoint --- src/documents/serialisers.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 564c0aae5..eee4f0f9c 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -209,7 +209,7 @@ class DocumentSerializer(DynamicFieldsModelSerializer): original_file_name = SerializerMethodField() archived_file_name = SerializerMethodField() - created_date = serializers.DateField() + created_date = serializers.DateField(required=False) def get_original_file_name(self, obj): return obj.get_public_filename() @@ -228,6 +228,8 @@ class DocumentSerializer(DynamicFieldsModelSerializer): ) instance.created = new_datetime instance.save() + validated_data.pop("created_date") + super().update(instance, validated_data) return instance class Meta: From e6d419c7e11536351abd28e4a885dd2a75fd6f0e Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 16 May 2022 00:30:21 -0700 Subject: [PATCH 079/291] use created_date in all of frontend --- .../document-card-large/document-card-large.component.html | 2 +- .../document-card-small/document-card-small.component.html | 2 +- .../app/components/document-list/document-list.component.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html index 5eb4a97dd..43e5ad2a8 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html @@ -78,7 +78,7 @@ - {{document.created | customDate:'mediumDate'}} + {{document.created_date | customDate:'mediumDate'}}
    diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html index 6c68cc26f..2697a9425 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html @@ -51,7 +51,7 @@ - {{document.created | customDate:'mediumDate'}} + {{document.created_date | customDate:'mediumDate'}}
    diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html index aa43243fc..80ccdf01b 100644 --- a/src-ui/src/app/components/document-list/document-list.component.html +++ b/src-ui/src/app/components/document-list/document-list.component.html @@ -177,7 +177,7 @@ - {{d.created | customDate}} + {{d.created_date | customDate}} {{d.added | customDate}} From 554eb32b33d2a93a2ea60d4f0be1c3fc9d4ff2f4 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 16 May 2022 00:31:33 -0700 Subject: [PATCH 080/291] created_date error display --- .../components/document-detail/document-detail.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html index ca4fb4275..2225afa31 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.html +++ b/src-ui/src/app/components/document-detail/document-detail.component.html @@ -68,7 +68,7 @@ - + Date: Mon, 16 May 2022 00:29:49 -0700 Subject: [PATCH 081/291] Consolidate date adapter --- src-ui/src/app/app.module.ts | 4 +-- src-ui/src/app/utils/ngb-iso-date-adapter.ts | 19 +++++++++--- .../app/utils/ngb-iso-date-time-adapter.ts | 31 ------------------- 3 files changed, 16 insertions(+), 38 deletions(-) delete mode 100644 src-ui/src/app/utils/ngb-iso-date-time-adapter.ts diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index e891d217d..a705c83ec 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -61,7 +61,7 @@ import { SafeUrlPipe } from './pipes/safeurl.pipe' import { SafeHtmlPipe } from './pipes/safehtml.pipe' import { CustomDatePipe } from './pipes/custom-date.pipe' import { DateComponent } from './components/common/input/date/date.component' -import { ISODateTimeAdapter } from './utils/ngb-iso-date-time-adapter' +import { ISODateAdapter } from './utils/ngb-iso-date-adapter' import { LocalizedDateParserFormatter } from './utils/ngb-date-parser-formatter' import { ApiVersionInterceptor } from './interceptors/api-version.interceptor' import { ColorSliderModule } from 'ngx-color/slider' @@ -188,7 +188,7 @@ registerLocaleData(localeZh) }, FilterPipe, DocumentTitlePipe, - { provide: NgbDateAdapter, useClass: ISODateTimeAdapter }, + { provide: NgbDateAdapter, useClass: ISODateAdapter }, { provide: NgbDateParserFormatter, useClass: LocalizedDateParserFormatter }, ], bootstrap: [AppComponent], diff --git a/src-ui/src/app/utils/ngb-iso-date-adapter.ts b/src-ui/src/app/utils/ngb-iso-date-adapter.ts index 7aa2214b5..af2fff3f3 100644 --- a/src-ui/src/app/utils/ngb-iso-date-adapter.ts +++ b/src-ui/src/app/utils/ngb-iso-date-adapter.ts @@ -5,11 +5,20 @@ import { NgbDateAdapter, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap' export class ISODateAdapter extends NgbDateAdapter { fromModel(value: string | null): NgbDateStruct | null { if (value) { - let date = new Date(value) - return { - day: date.getDate(), - month: date.getMonth() + 1, - year: date.getFullYear(), + if (value.match(/\d\d\d\d\-\d\d\-\d\d/g)) { + const segs = value.split('-') + return { + year: parseInt(segs[0]), + month: parseInt(segs[1]), + day: parseInt(segs[2]), + } + } else { + let date = new Date(value) + return { + day: date.getDate(), + month: date.getMonth() + 1, + year: date.getFullYear(), + } } } else { return null diff --git a/src-ui/src/app/utils/ngb-iso-date-time-adapter.ts b/src-ui/src/app/utils/ngb-iso-date-time-adapter.ts deleted file mode 100644 index 9d0ea4de6..000000000 --- a/src-ui/src/app/utils/ngb-iso-date-time-adapter.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Injectable } from '@angular/core' -import { NgbDateAdapter, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap' - -@Injectable() -export class ISODateTimeAdapter extends NgbDateAdapter { - fromModel(value: string | null): NgbDateStruct | null { - if (value) { - if (value.match(/\d\d\d\d\-\d\d\-\d\d/g)) { - const segs = value.split('-') - return { - year: parseInt(segs[0]), - month: parseInt(segs[1]), - day: parseInt(segs[2]), - } - } else { - let date = new Date(value) - return { - day: date.getDate(), - month: date.getMonth() + 1, - year: date.getFullYear(), - } - } - } else { - return null - } - } - - toModel(date: NgbDateStruct | null): string | null { - return date ? [date.year, date.month, date.day].join('-') : null - } -} From 252df7bac58e1809c212163e6dffa8975e5e7e7c Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 16 May 2022 11:34:30 -0700 Subject: [PATCH 082/291] Update api.rst --- docs/api.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/api.rst b/docs/api.rst index c23866b60..1e70b19fa 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -31,7 +31,8 @@ The objects served by the document endpoint contain the following fields: * ``tags``: List of IDs of tags assigned to this document, or empty list. * ``document_type``: Document type of this document, or null. * ``correspondent``: Correspondent of this document or null. -* ``created``: The date at which this document was created. +* ``created``: The date time at which this document was created. +* ``created_date``: The date (YYYY-MM-DD) at which this document was created. Optional. If also passed with created, this is ignored. * ``modified``: The date at which this document was last edited in paperless. Read-only. * ``added``: The date at which this document was added to paperless. Read-only. * ``archive_serial_number``: The identifier of this document in a physical document archive. From e7c370b3eb237004d0c308c29ce6d38f444cb738 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 16 May 2022 21:39:10 -0700 Subject: [PATCH 083/291] Use zoneinfo instead of tz Co-Authored-By: Trenton Holmes <797416+stumpylog@users.noreply.github.com> --- src/documents/serialisers.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index eee4f0f9c..db55226e2 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -2,8 +2,11 @@ import datetime import math import re +try: + import zoneinfo +except ImportError: + import backports.zoneinfo as zoneinfo import magic -from dateutil import tz from django.conf import settings from django.utils.text import slugify from django.utils.translation import gettext as _ @@ -224,7 +227,7 @@ class DocumentSerializer(DynamicFieldsModelSerializer): if "created_date" in validated_data and "created" not in validated_data: new_datetime = datetime.datetime.combine( validated_data.get("created_date"), - datetime.time(0, 0, 0, 0, tz.gettz(settings.TIME_ZONE)), + datetime.time(0, 0, 0, 0, zoneinfo.ZoneInfo(settings.TIME_ZONE)), ) instance.created = new_datetime instance.save() From 45b0fda50fb5c3804209b0d9f791cbedc95bf4ba Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 18 May 2022 13:52:31 -0700 Subject: [PATCH 084/291] Update .gitignore [ci skip] --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c21ad4de0..bb0027b7f 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,8 @@ target/ # VS Code .vscode +/src-ui/.vscode +/docs/.vscode # Other stuff that doesn't belong .virtualenv @@ -84,8 +86,6 @@ scripts/nuke /paperless.conf /consume/ /export/ -/src-ui/.vscode # this is where the compiled frontend is moved to. /src/documents/static/frontend/ -/docs/.vscode/settings.json From 87ee185c54f447d3ea571a126db148a8761bf602 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 18 May 2022 14:01:19 -0700 Subject: [PATCH 085/291] Change npm --no-optional to --omit=optional --- Dockerfile | 2 +- docker-builders/Dockerfile.frontend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2c4bbefe5..b1ff73181 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ COPY ./src-ui /src/src-ui WORKDIR /src/src-ui RUN set -eux \ && npm update npm -g \ - && npm ci --no-optional + && npm ci --omit=optional RUN set -eux \ && ./node_modules/.bin/ng build --configuration production diff --git a/docker-builders/Dockerfile.frontend b/docker-builders/Dockerfile.frontend index 26f6c9e15..e552ee184 100644 --- a/docker-builders/Dockerfile.frontend +++ b/docker-builders/Dockerfile.frontend @@ -9,6 +9,6 @@ COPY ./src-ui /src/src-ui WORKDIR /src/src-ui RUN set -eux \ && npm update npm -g \ - && npm ci --no-optional + && npm ci --omit=optional RUN set -eux \ && ./node_modules/.bin/ng build --configuration production From de4b9bf627e58c5d1e737af6b2c34e7947808a9f Mon Sep 17 00:00:00 2001 From: Quinn Casey Date: Wed, 18 May 2022 14:30:16 -0700 Subject: [PATCH 086/291] Fix formatting --- docs/troubleshooting.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst index 08cc916b0..3db9a069e 100644 --- a/docs/troubleshooting.rst +++ b/docs/troubleshooting.rst @@ -237,11 +237,12 @@ open the affected documents in paperless for editing. Paperless will continue to show the invalid metadata. Consumer fails with a FileNotFoundError -############################ +####################################### You might find messages like these in your log files: .. code:: + [ERROR] [paperless.consumer] Error while consuming document SCN_0001.pdf: FileNotFoundError: [Errno 2] No such file or directory: '/tmp/ocrmypdf.io.yhk3zbv0/origin.pdf' Traceback (most recent call last): File "/app/paperless/src/paperless_tesseract/parsers.py", line 261, in parse @@ -266,11 +267,12 @@ check for documents, try adjusting the :ref:`inotify configuration `. Consumer fails waiting for file to remain unmodified. -############################ +##################################################### You might find messages like these in your log files: .. code:: + [ERROR] [paperless.management.consumer] Timeout while waiting on file /usr/src/paperless/src/../consume/SCN_0001.pdf to remain unmodified. This indicates paperless timed out while waiting for the file to be completely written to the consume folder. @@ -282,11 +284,12 @@ Adjusting :ref:`polling configuration ` values should res back in, for the initial failing file to be consumed. Consumer fails reporting "OS reports file as busy still". -############################ +######################################################### You might find messages like these in your log files: .. code:: + [WARNING] [paperless.management.consumer] Not consuming file /usr/src/paperless/src/../consume/SCN_0001.pdf: OS reports file as busy still This indicates paperless was unable to open the file, as the OS reported the file as still being in use. To prevent a From f21656f41f9358e06d7d60cd11a8b2d60827eb2b Mon Sep 17 00:00:00 2001 From: Quinn Casey Date: Wed, 18 May 2022 14:30:33 -0700 Subject: [PATCH 087/291] Add link to new config option --- docs/scanners.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/scanners.rst b/docs/scanners.rst index e8685fadc..27ba38e31 100644 --- a/docs/scanners.rst +++ b/docs/scanners.rst @@ -88,7 +88,7 @@ Physical scanners .. [1] Scanners with API Integration allow to push scanned documents directly to :ref:`Paperless API `, sometimes referred to as Webhook or Document POST. .. [2] Canon Multi Function Printers show strange behavior over SMB. They close and reopen the file after every page. It's recommended to tune the - :ref:`polling ` configuration values for your scanner. The scanner timeout is 3 minutes, so ``180`` is a good starting point. + :ref:`polling ` and :ref:`inotify ` configuration values for your scanner. The scanner timeout is 3 minutes, so ``180`` is a good starting point. Mobile phone software ===================== From dd3b5c129cbeaafd945199ff715cde71c41c2bf1 Mon Sep 17 00:00:00 2001 From: Markus <46903097+mskg@users.noreply.github.com> Date: Thu, 19 May 2022 23:42:25 +0200 Subject: [PATCH 088/291] Feature: Dynamic document storage pathes (#916) * Added devcontainer * Add feature storage pathes * Exclude tests and add versioning * Check escaping * Check escaping * Check quoting * Echo * Escape * Escape : * Double escape \ * Escaping * Remove if * Escape colon * Missing \ * Esacpe : * Escape all * test * Remove sed * Fix exclude * Remove SED command * Add LD_LIBRARY_PATH * Adjusted to v1.7 * Updated test-cases * Remove devcontainer * Removed internal build-file * Run pre-commit * Corrected flak8 error * Adjusted to v1.7 * Updated test-cases * Corrected flak8 error * Adjusted to new plural translations * Small adjustments due to code-review backend * Adjusted line-break * Removed PAPERLESS prefix from settings variables * Corrected style change due to search+replace * First documentation draft * Revert changes to Pipfile * Add sphinx-autobuild with keep-outdated * Revert merge error that results in wrong storage path is evaluated * Adjust styles of generated files ... * Adds additional testing to cover dynamic storage path functionality * Remove unnecessary condition * Add hint to edit storage path dialog * Correct spelling of pathes to paths * Minor documentation tweaks * Minor typo * improving wrapping of filter editor buttons with new storage path button * Update .gitignore * Fix select border radius in non input-groups * Better storage path edit hint * Add note to edit storage path dialog re document_renamer * Add note to bulk edit storage path re document_renamer * Rename FILTER_STORAGE_DIRECTORY to PATH * Fix broken filter rule parsing * Show default storage if unspecified * Remove note re storage path on bulk edit * Add basic validation of filename variables Co-authored-by: Markus Kling Co-authored-by: Trenton Holmes Co-authored-by: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Co-authored-by: Quinn Casey --- .gitignore | 3 + Pipfile | 1 + Pipfile.lock | 77 ++++++- docs/Makefile | 4 + docs/_static/js/darkmode.js | 52 ++--- docs/advanced_usage.rst | 124 +++++++--- docs/configuration.rst | 8 + paperless.conf.example | 1 + src-ui/cypress.json | 2 +- src-ui/src/app/app-routing.module.ts | 2 + src-ui/src/app/app.module.ts | 4 + .../app-frame/app-frame.component.html | 7 + .../confirm-dialog.component.html | 2 +- .../storage-path-edit-dialog.component.html | 24 ++ .../storage-path-edit-dialog.component.scss | 0 .../storage-path-edit-dialog.component.ts | 50 ++++ .../common/input/select/select.component.html | 3 +- .../common/input/select/select.component.ts | 3 + .../common/input/text/text.component.html | 2 +- .../common/toasts/toasts.component.scss | 2 +- .../document-detail.component.html | 2 + .../document-detail.component.ts | 34 +++ .../bulk-editor/bulk-editor.component.html | 9 + .../bulk-editor/bulk-editor.component.ts | 57 ++++- .../document-card-large.component.html | 7 + .../document-card-large.component.ts | 3 + .../document-card-small.component.html | 7 + .../document-card-small.component.ts | 3 + .../document-list.component.html | 15 +- .../document-list/document-list.component.ts | 7 + .../filter-editor.component.html | 83 ++++--- .../filter-editor/filter-editor.component.ts | 36 ++- .../storage-path-list.component.ts | 48 ++++ src-ui/src/app/data/filter-rule-type.ts | 10 +- .../data/paperless-document-suggestions.ts | 2 + src-ui/src/app/data/paperless-document.ts | 5 + src-ui/src/app/data/paperless-storage-path.ts | 5 + .../src/app/services/rest/document.service.ts | 8 +- .../app/services/rest/storage-path.service.ts | 13 ++ src-ui/src/styles.scss | 24 +- src/documents/admin.py | 12 + src/documents/apps.py | 2 + src/documents/bulk_edit.py | 19 ++ src/documents/classifier.py | 45 +++- src/documents/file_handling.py | 36 ++- src/documents/filters.py | 13 ++ src/documents/index.py | 11 + .../management/commands/document_archiver.py | 2 +- src/documents/matching.py | 17 ++ .../migrations/1012_fix_archive_files.py | 6 +- .../1019_storagepath_document_storage_path.py | 73 ++++++ .../migrations/1020_merge_20220518_1839.py | 13 ++ src/documents/models.py | 21 ++ src/documents/serialisers.py | 68 ++++++ src/documents/signals/handlers.py | 70 ++++++ src/documents/tasks.py | 2 + src/documents/tests/data/model.pickle | Bin 156607 -> 155972 bytes src/documents/tests/test_api.py | 112 ++++++++- src/documents/tests/test_classifier.py | 62 +++++ src/documents/tests/test_consumer.py | 12 +- src/documents/tests/test_file_handling.py | 216 ++++++++++++++---- src/documents/tests/test_management.py | 10 +- .../tests/test_management_exporter.py | 4 +- .../tests/test_migration_archive_files.py | 12 +- src/documents/views.py | 30 +++ src/paperless/settings.py | 11 +- src/paperless/urls.py | 2 + 67 files changed, 1427 insertions(+), 203 deletions(-) create mode 100644 src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html create mode 100644 src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.scss create mode 100644 src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.ts create mode 100644 src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.ts create mode 100644 src-ui/src/app/data/paperless-storage-path.ts create mode 100644 src-ui/src/app/services/rest/storage-path.service.ts create mode 100644 src/documents/migrations/1019_storagepath_document_storage_path.py create mode 100644 src/documents/migrations/1020_merge_20220518_1839.py diff --git a/.gitignore b/.gitignore index bb0027b7f..2ba27f9b5 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,6 @@ scripts/nuke # this is where the compiled frontend is moved to. /src/documents/static/frontend/ + +# mac os +.DS_Store diff --git a/Pipfile b/Pipfile index 6c2168b7d..7113f1cfd 100644 --- a/Pipfile +++ b/Pipfile @@ -69,4 +69,5 @@ sphinx_rtd_theme = "*" tox = "*" black = "*" pre-commit = "*" +sphinx-autobuild = "*" myst-parser = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 6215e7d0c..272cc4269 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "edaf53125fd5a0dc3aff5b75e188523ef3b7bc29bda792ee78ee67506e0b831d" + "sha256": "818f3513df4a757e6302baf5a17ce61e85c7d69a7666e7d49e7e50e78e064ae3" }, "pipfile-spec": 6, "requires": {}, @@ -466,7 +466,7 @@ "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff", "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" ], - "markers": "python_version >= '3'", + "markers": "python_version >= '3.5'", "version": "==3.3" }, "imap-tools": { @@ -1587,6 +1587,14 @@ "markers": "python_version >= '3.7'", "version": "==8.1.3" }, + "colorama": { + "hashes": [ + "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b", + "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==0.4.4" + }, "coverage": { "extras": [ "toml" @@ -1711,7 +1719,7 @@ "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff", "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" ], - "markers": "python_version >= '3'", + "markers": "python_version >= '3.5'", "version": "==3.3" }, "imagesize": { @@ -1745,6 +1753,12 @@ "markers": "python_version >= '3.7'", "version": "==3.1.2" }, + "livereload": { + "hashes": [ + "sha256:776f2f865e59fde56490a56bcc6773b6917366bce0c267c60ee8aaf1a0959869" + ], + "version": "==2.6.3" + }, "markdown-it-py": { "hashes": [ "sha256:93de681e5c021a432c63147656fe21790bc01231e0cd2da73626f1aa3ac0fe27", @@ -2046,6 +2060,14 @@ "index": "pypi", "version": "==4.5.0" }, + "sphinx-autobuild": { + "hashes": [ + "sha256:8fe8cbfdb75db04475232f05187c776f46f6e9e04cacf1e49ce81bdac649ccac", + "sha256:de1ca3b66e271d2b5b5140c35034c89e47f263f2cd5db302c9217065f7443f05" + ], + "index": "pypi", + "version": "==2021.3.14" + }, "sphinx-rtd-theme": { "hashes": [ "sha256:4d35a56f4508cfee4c4fb604373ede6feae2a306731d533f409ef5c3496fdbd8", @@ -2121,9 +2143,56 @@ "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f" ], - "markers": "python_version < '3.11'", + "markers": "python_version >= '3.7'", "version": "==2.0.1" }, + "tornado": { + "hashes": [ + "sha256:0a00ff4561e2929a2c37ce706cb8233b7907e0cdc22eab98888aca5dd3775feb", + "sha256:0d321a39c36e5f2c4ff12b4ed58d41390460f798422c4504e09eb5678e09998c", + "sha256:1e8225a1070cd8eec59a996c43229fe8f95689cb16e552d130b9793cb570a288", + "sha256:20241b3cb4f425e971cb0a8e4ffc9b0a861530ae3c52f2b0434e6c1b57e9fd95", + "sha256:25ad220258349a12ae87ede08a7b04aca51237721f63b1808d39bdb4b2164558", + "sha256:33892118b165401f291070100d6d09359ca74addda679b60390b09f8ef325ffe", + "sha256:33c6e81d7bd55b468d2e793517c909b139960b6c790a60b7991b9b6b76fb9791", + "sha256:3447475585bae2e77ecb832fc0300c3695516a47d46cefa0528181a34c5b9d3d", + "sha256:34ca2dac9e4d7afb0bed4677512e36a52f09caa6fded70b4e3e1c89dbd92c326", + "sha256:3e63498f680547ed24d2c71e6497f24bca791aca2fe116dbc2bd0ac7f191691b", + "sha256:548430be2740e327b3fe0201abe471f314741efcb0067ec4f2d7dcfb4825f3e4", + "sha256:6196a5c39286cc37c024cd78834fb9345e464525d8991c21e908cc046d1cc02c", + "sha256:61b32d06ae8a036a6607805e6720ef00a3c98207038444ba7fd3d169cd998910", + "sha256:6286efab1ed6e74b7028327365cf7346b1d777d63ab30e21a0f4d5b275fc17d5", + "sha256:65d98939f1a2e74b58839f8c4dab3b6b3c1ce84972ae712be02845e65391ac7c", + "sha256:66324e4e1beede9ac79e60f88de548da58b1f8ab4b2f1354d8375774f997e6c0", + "sha256:6c77c9937962577a6a76917845d06af6ab9197702a42e1346d8ae2e76b5e3675", + "sha256:70dec29e8ac485dbf57481baee40781c63e381bebea080991893cd297742b8fd", + "sha256:7250a3fa399f08ec9cb3f7b1b987955d17e044f1ade821b32e5f435130250d7f", + "sha256:748290bf9112b581c525e6e6d3820621ff020ed95af6f17fedef416b27ed564c", + "sha256:7da13da6f985aab7f6f28debab00c67ff9cbacd588e8477034c0652ac141feea", + "sha256:8f959b26f2634a091bb42241c3ed8d3cedb506e7c27b8dd5c7b9f745318ddbb6", + "sha256:9de9e5188a782be6b1ce866e8a51bc76a0fbaa0e16613823fc38e4fc2556ad05", + "sha256:a48900ecea1cbb71b8c71c620dee15b62f85f7c14189bdeee54966fbd9a0c5bd", + "sha256:b87936fd2c317b6ee08a5741ea06b9d11a6074ef4cc42e031bc6403f82a32575", + "sha256:c77da1263aa361938476f04c4b6c8916001b90b2c2fdd92d8d535e1af48fba5a", + "sha256:cb5ec8eead331e3bb4ce8066cf06d2dfef1bfb1b2a73082dfe8a161301b76e37", + "sha256:cc0ee35043162abbf717b7df924597ade8e5395e7b66d18270116f8745ceb795", + "sha256:d14d30e7f46a0476efb0deb5b61343b1526f73ebb5ed84f23dc794bdb88f9d9f", + "sha256:d371e811d6b156d82aa5f9a4e08b58debf97c302a35714f6f45e35139c332e32", + "sha256:d3d20ea5782ba63ed13bc2b8c291a053c8d807a8fa927d941bd718468f7b950c", + "sha256:d3f7594930c423fd9f5d1a76bee85a2c36fd8b4b16921cae7e965f22575e9c01", + "sha256:dcef026f608f678c118779cd6591c8af6e9b4155c44e0d1bc0c87c036fb8c8c4", + "sha256:e0791ac58d91ac58f694d8d2957884df8e4e2f6687cdf367ef7eb7497f79eaa2", + "sha256:e385b637ac3acaae8022e7e47dfa7b83d3620e432e3ecb9a3f7f58f150e50921", + "sha256:e519d64089b0876c7b467274468709dadf11e41d65f63bba207e04217f47c085", + "sha256:e7229e60ac41a1202444497ddde70a48d33909e484f96eb0da9baf8dc68541df", + "sha256:ed3ad863b1b40cd1d4bd21e7498329ccaece75db5a5bf58cd3c9f130843e7102", + "sha256:f0ba29bafd8e7e22920567ce0d232c26d4d47c8b5cf4ed7b562b5db39fa199c5", + "sha256:fa2ba70284fa42c2a5ecb35e322e68823288a4251f9ba9cc77be04ae15eada68", + "sha256:fba85b6cd9c39be262fcd23865652920832b61583de2a2ca907dbd8e8a8c81e5" + ], + "markers": "python_version >= '3.5'", + "version": "==6.1" + }, "tox": { "hashes": [ "sha256:0805727eb4d6b049de304977dfc9ce315a1938e6619c3ab9f38682bb04662a5a", diff --git a/docs/Makefile b/docs/Makefile index cf5dbff6a..7890f9828 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -24,6 +24,7 @@ I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . help: @echo "Please use \`make ' where is one of" @echo " html to make standalone HTML files" + @echo " livehtml to preview changes with live reload in your browser" @echo " dirhtml to make HTML files named index.html in directories" @echo " singlehtml to make a single large HTML file" @echo " pickle to make pickle files" @@ -54,6 +55,9 @@ html: @echo @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." +livehtml: + sphinx-autobuild "./" "$(BUILDDIR)" $(O) + dirhtml: $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml @echo diff --git a/docs/_static/js/darkmode.js b/docs/_static/js/darkmode.js index 49cf0eeec..909472587 100644 --- a/docs/_static/js/darkmode.js +++ b/docs/_static/js/darkmode.js @@ -1,47 +1,47 @@ -let toggleButton; -let icon; +let toggleButton +let icon function load() { - "use strict"; + 'use strict' - toggleButton = document.createElement("button"); - toggleButton.setAttribute("title", "Toggle dark mode"); - toggleButton.classList.add("dark-mode-toggle"); - icon = document.createElement("i"); - icon.classList.add("fa", darkModeState ? "fa-sun-o" : "fa-moon-o"); - toggleButton.appendChild(icon); - document.body.prepend(toggleButton); + toggleButton = document.createElement('button') + toggleButton.setAttribute('title', 'Toggle dark mode') + toggleButton.classList.add('dark-mode-toggle') + icon = document.createElement('i') + icon.classList.add('fa', darkModeState ? 'fa-sun-o' : 'fa-moon-o') + toggleButton.appendChild(icon) + document.body.prepend(toggleButton) // Listen for changes in the OS settings // addListener is used because older versions of Safari don't support addEventListener // prefersDarkQuery set in if (prefersDarkQuery) { prefersDarkQuery.addListener(function (evt) { - toggleDarkMode(evt.matches); - }); + toggleDarkMode(evt.matches) + }) } // Initial setting depending on the prefers-color-mode or localstorage // darkModeState should be set in the document to prevent flash - if (darkModeState == undefined) darkModeState = false; - toggleDarkMode(darkModeState); + if (darkModeState == undefined) darkModeState = false + toggleDarkMode(darkModeState) // Toggles the "dark-mode" class on click and sets localStorage state - toggleButton.addEventListener("click", () => { - darkModeState = !darkModeState; + toggleButton.addEventListener('click', () => { + darkModeState = !darkModeState - toggleDarkMode(darkModeState); - localStorage.setItem("dark-mode", darkModeState); - }); + toggleDarkMode(darkModeState) + localStorage.setItem('dark-mode', darkModeState) + }) } function toggleDarkMode(state) { - document.documentElement.classList.toggle("dark-mode", state); - document.documentElement.classList.toggle("light-mode", !state); - icon.classList.remove("fa-sun-o"); - icon.classList.remove("fa-moon-o"); - icon.classList.add(state ? "fa-sun-o" : "fa-moon-o"); - darkModeState = state; + document.documentElement.classList.toggle('dark-mode', state) + document.documentElement.classList.toggle('light-mode', !state) + icon.classList.remove('fa-sun-o') + icon.classList.remove('fa-moon-o') + icon.classList.add(state ? 'fa-sun-o' : 'fa-moon-o') + darkModeState = state } -document.addEventListener("DOMContentLoaded", load); +document.addEventListener('DOMContentLoaded', load) diff --git a/docs/advanced_usage.rst b/docs/advanced_usage.rst index 4dbb32f36..6449c478b 100644 --- a/docs/advanced_usage.rst +++ b/docs/advanced_usage.rst @@ -7,12 +7,12 @@ easier. .. _advanced-matching: -Matching tags, correspondents and document types -################################################ +Matching tags, correspondents, document types, and storage paths +################################################################ -Paperless will compare the matching algorithms defined by every tag and -correspondent already set in your database to see if they apply to the text in -a document. In other words, if you defined a tag called ``Home Utility`` +Paperless will compare the matching algorithms defined by every tag, correspondent, +document type, and storage path in your database to see if they apply to the text +in a document. In other words, if you define a tag called ``Home Utility`` that had a ``match`` property of ``bc hydro`` and a ``matching_algorithm`` of ``literal``, Paperless will automatically tag your newly-consumed document with your ``Home Utility`` tag so long as the text ``bc hydro`` appears in the body @@ -22,10 +22,10 @@ The matching logic is quite powerful. It supports searching the text of your document with different algorithms, and as such, some experimentation may be necessary to get things right. -In order to have a tag, correspondent, or type assigned automatically to newly -consumed documents, assign a match and matching algorithm using the web -interface. These settings define when to assign correspondents, tags, and types -to documents. +In order to have a tag, correspondent, document type, or storage path assigned +automatically to newly consumed documents, assign a match and matching algorithm +using the web interface. These settings define when to assign tags, correspondents, +document types, and storage paths to documents. The following algorithms are available: @@ -37,7 +37,7 @@ The following algorithms are available: * **Literal:** Matches only if the match appears exactly as provided (i.e. preserve ordering) in the PDF. * **Regular expression:** Parses the match as a regular expression and tries to find a match within the document. -* **Fuzzy match:** I dont know. Look at the source. +* **Fuzzy match:** I don't know. Look at the source. * **Auto:** Tries to automatically match new documents. This does not require you to set a match. See the notes below. @@ -47,9 +47,9 @@ defining a match text of ``"Bank of America" BofA`` using the *any* algorithm, will match documents that contain either "Bank of America" or "BofA", but will not match documents containing "Bank of South America". -Then just save your tag/correspondent and run another document through the -consumer. Once complete, you should see the newly-created document, -automatically tagged with the appropriate data. +Then just save your tag, correspondent, document type, or storage path and run +another document through the consumer. Once complete, you should see the +newly-created document, automatically tagged with the appropriate data. .. _advanced-automatic_matching: @@ -58,9 +58,9 @@ Automatic matching ================== Paperless-ngx comes with a new matching algorithm called *Auto*. This matching -algorithm tries to assign tags, correspondents, and document types to your -documents based on how you have already assigned these on existing documents. It -uses a neural network under the hood. +algorithm tries to assign tags, correspondents, document types, and storage paths +to your documents based on how you have already assigned these on existing documents. +It uses a neural network under the hood. If, for example, all your bank statements of your account 123 at the Bank of America are tagged with the tag "bofa_123" and the matching algorithm of this @@ -80,20 +80,21 @@ feature: that the neural network only learns from documents which you have correctly tagged before. * The matching algorithm can only work if there is a correlation between the - tag, correspondent, or document type and the document itself. Your bank - statements usually contain your bank account number and the name of the bank, - so this works reasonably well, However, tags such as "TODO" cannot be - automatically assigned. + tag, correspondent, document type, or storage path and the document itself. + Your bank statements usually contain your bank account number and the name + of the bank, so this works reasonably well, However, tags such as "TODO" + cannot be automatically assigned. * The matching algorithm needs a reasonable number of documents to identify when - to assign tags, correspondents, and types. If one out of a thousand documents - has the correspondent "Very obscure web shop I bought something five years - ago", it will probably not assign this correspondent automatically if you buy - something from them again. The more documents, the better. + to assign tags, correspondents, storage paths, and types. If one out of a + thousand documents has the correspondent "Very obscure web shop I bought + something five years ago", it will probably not assign this correspondent + automatically if you buy something from them again. The more documents, the better. * Paperless also needs a reasonable amount of negative examples to decide when - not to assign a certain tag, correspondent or type. This will usually be the - case as you start filling up paperless with documents. Example: If all your - documents are either from "Webshop" and "Bank", paperless will assign one of - these correspondents to ANY new document, if both are set to automatic matching. + not to assign a certain tag, correspondent, document type, or storage path. This will + usually be the case as you start filling up paperless with documents. + Example: If all your documents are either from "Webshop" and "Bank", paperless + will assign one of these correspondents to ANY new document, if both are set + to automatic matching. Hooking into the consumption process #################################### @@ -268,6 +269,17 @@ If paperless detects that two documents share the same filename, paperless will append ``_01``, ``_02``, etc to the filename. This happens if all the placeholders in a filename evaluate to the same value. +.. hint:: + You can affect how empty placeholders are treated by changing the following setting to + `true`. + + .. code:: + + PAPERLESS_FILENAME_FORMAT_REMOVE_NONE=True + + Doing this results in all empty placeholders resolving to "" instead of "none" as stated above. + Spaces before empty placeholders are removed as well, empty directories are omitted. + .. hint:: Paperless checks the filename of a document whenever it is saved. Therefore, @@ -290,3 +302,59 @@ evaluate to the same value. However, keep in mind that inside docker, if files get stored outside of the predefined volumes, they will be lost after a restart of paperless. + + +Storage paths +############# + +One of the best things in Paperless is that you can not only access the documents via the +web interface, but also via the file system. + +When as single storage layout is not sufficient for your use case, storage paths come to +the rescue. Storage paths allow you to configure more precisely where each document is stored +in the file system. + +- Each storage path is a `PAPERLESS_FILENAME_FORMAT` and follows the rules described above +- Each document is assigned a storage path using the matching algorithms described above, but + can be overwritten at any time + +For example, you could define the following two storage paths: + +1. Normal communications are put into a folder structure sorted by `year/correspondent` +2. Communications with insurance companies are stored in a flat structure with longer file names, + but containing the full date of the correspondence. + +.. code:: + + By Year = {created_year}/{correspondent}/{title} + Insurances = Insurances/{correspondent}/{created_year}-{created_month}-{created_day} {title} + + +If you then map these storage paths to the documents, you might get the following result. +For simplicity, `By Year` defines the same structure as in the previous example above. + +.. code:: text + + 2019/ # By Year + My bank/ + Statement January.pdf + Statement February.pdf + + Insurances/ # Insurances + Healthcare 123/ + 2022-01-01 Statement January.pdf + 2022-02-02 Letter.pdf + 2022-02-03 Letter.pdf + Dental 456/ + 2021-12-01 New Conditions.pdf + + +.. hint:: + + Defining a storage path is optional. If no storage path is defined for a document, the global + `PAPERLESS_FILENAME_FORMAT` is applied. + +.. caution:: + + If you adjust the format of an existing storage path, old documents don't get relocated automatically. + You need to run the :ref:`document renamer ` to adjust their pathes. diff --git a/docs/configuration.rst b/docs/configuration.rst index 3d57236e1..2068a4238 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -111,6 +111,14 @@ PAPERLESS_FILENAME_FORMAT= Default is none, which disables this feature. +PAPERLESS_FILENAME_FORMAT_REMOVE_NONE= + Tells paperless to replace placeholders in `PAPERLESS_FILENAME_FORMAT` that would resolve + to 'none' to be omitted from the resulting filename. This also holds true for directory + names. + See :ref:`advanced-file_name_handling` for details. + + Defaults to `false` which disables this feature. + PAPERLESS_LOGGING_DIR= This is where paperless will store log files. diff --git a/paperless.conf.example b/paperless.conf.example index be5071636..97e907e1f 100644 --- a/paperless.conf.example +++ b/paperless.conf.example @@ -23,6 +23,7 @@ #PAPERLESS_MEDIA_ROOT=../media #PAPERLESS_STATICDIR=../static #PAPERLESS_FILENAME_FORMAT= +#PAPERLESS_FILENAME_FORMAT_REMOVE_NONE= # Security and hosting diff --git a/src-ui/cypress.json b/src-ui/cypress.json index bd321dcbf..3a58fab3f 100644 --- a/src-ui/cypress.json +++ b/src-ui/cypress.json @@ -6,4 +6,4 @@ "pluginsFile": "cypress/plugins/index.ts", "fixturesFolder": "cypress/fixtures", "baseUrl": "http://localhost:4200" -} \ No newline at end of file +} diff --git a/src-ui/src/app/app-routing.module.ts b/src-ui/src/app/app-routing.module.ts index 436d2fad4..3eb13177f 100644 --- a/src-ui/src/app/app-routing.module.ts +++ b/src-ui/src/app/app-routing.module.ts @@ -12,6 +12,7 @@ import { TagListComponent } from './components/manage/tag-list/tag-list.componen import { NotFoundComponent } from './components/not-found/not-found.component' import { DocumentAsnComponent } from './components/document-asn/document-asn.component' import { DirtyFormGuard } from './guards/dirty-form.guard' +import { StoragePathListComponent } from './components/manage/storage-path-list/storage-path-list.component' const routes: Routes = [ { path: '', redirectTo: 'dashboard', pathMatch: 'full' }, @@ -27,6 +28,7 @@ const routes: Routes = [ { path: 'tags', component: TagListComponent }, { path: 'documenttypes', component: DocumentTypeListComponent }, { path: 'correspondents', component: CorrespondentListComponent }, + { path: 'storagepaths', component: StoragePathListComponent }, { path: 'logs', component: LogsComponent }, { path: 'settings', diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index 0c9d628d0..9701aeb18 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -87,6 +87,8 @@ import localeSr from '@angular/common/locales/sr' import localeSv from '@angular/common/locales/sv' import localeTr from '@angular/common/locales/tr' import localeZh from '@angular/common/locales/zh' +import { StoragePathListComponent } from './components/manage/storage-path-list/storage-path-list.component' +import { StoragePathEditDialogComponent } from './components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component' import { SettingsService } from './services/settings.service' registerLocaleData(localeBe) @@ -125,6 +127,7 @@ function initializeApp(settings: SettingsService) { TagListComponent, DocumentTypeListComponent, CorrespondentListComponent, + StoragePathListComponent, LogsComponent, SettingsComponent, NotFoundComponent, @@ -132,6 +135,7 @@ function initializeApp(settings: SettingsService) { ConfirmDialogComponent, TagEditDialogComponent, DocumentTypeEditDialogComponent, + StoragePathEditDialogComponent, TagComponent, PageHeaderComponent, AppFrameComponent, diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index ce9c8993b..8ec2bf8aa 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -134,6 +134,13 @@  Document types
    • +
  • + + + +  Storage paths + +
  • diff --git a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html index 19d907c82..92e27e370 100644 --- a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html +++ b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html @@ -5,7 +5,7 @@

{{messageBold}}

-

{{message}}

+

+
+
+ +

+ Note that editing a path does not apply changes to stored files until you have run the 'document_renamer' utility. See the documentation. +

+ + + + + + + +
+
+ + +
+ diff --git a/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.scss b/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.ts new file mode 100644 index 000000000..2ec0821e6 --- /dev/null +++ b/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.ts @@ -0,0 +1,50 @@ +import { Component } from '@angular/core' +import { FormControl, FormGroup } from '@angular/forms' +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' +import { EditDialogComponent } from 'src/app/components/common/edit-dialog/edit-dialog.component' +import { PaperlessStoragePath } from 'src/app/data/paperless-storage-path' +import { StoragePathService } from 'src/app/services/rest/storage-path.service' +import { ToastService } from 'src/app/services/toast.service' + +@Component({ + selector: 'app-storage-path-edit-dialog', + templateUrl: './storage-path-edit-dialog.component.html', + styleUrls: ['./storage-path-edit-dialog.component.scss'], +}) +export class StoragePathEditDialogComponent extends EditDialogComponent { + constructor( + service: StoragePathService, + activeModal: NgbActiveModal, + toastService: ToastService + ) { + super(service, activeModal, toastService) + } + + get pathHint() { + return ( + $localize`e.g.` + + ' {created_year}-{title} ' + + $localize`or use slashes to add directories e.g.` + + ' {created_year}/{correspondent}/{title}. ' + + $localize`See documentation for full list.` + ) + } + + getCreateTitle() { + return $localize`Create new storage path` + } + + getEditTitle() { + return $localize`Edit storage path` + } + + getForm(): FormGroup { + return new FormGroup({ + name: new FormControl(''), + path: new FormControl(''), + matching_algorithm: new FormControl(1), + match: new FormControl(''), + is_insensitive: new FormControl(true), + }) + } +} diff --git a/src-ui/src/app/components/common/input/select/select.component.html b/src-ui/src/app/components/common/input/select/select.component.html index afb551c46..b111e1656 100644 --- a/src-ui/src/app/components/common/input/select/select.component.html +++ b/src-ui/src/app/components/common/input/select/select.component.html @@ -9,7 +9,8 @@ [items]="items" [addTag]="allowCreateNew && addItemRef" addTagText="Add item" - i18n-addTagText="Used for both types and correspondents" + i18n-addTagText="Used for both types, correspondents, storage paths" + [placeholder]="placeholder" bindLabel="name" bindValue="id" (change)="onChange(value)" diff --git a/src-ui/src/app/components/common/input/select/select.component.ts b/src-ui/src/app/components/common/input/select/select.component.ts index 98aef8d94..d1a3d6e5c 100644 --- a/src-ui/src/app/components/common/input/select/select.component.ts +++ b/src-ui/src/app/components/common/input/select/select.component.ts @@ -41,6 +41,9 @@ export class SelectComponent extends AbstractInputComponent { @Input() suggestions: number[] + @Input() + placeholder: string + @Output() createNew = new EventEmitter() diff --git a/src-ui/src/app/components/common/input/text/text.component.html b/src-ui/src/app/components/common/input/text/text.component.html index 3f4136c11..41f02df64 100644 --- a/src-ui/src/app/components/common/input/text/text.component.html +++ b/src-ui/src/app/components/common/input/text/text.component.html @@ -1,7 +1,7 @@
- {{hint}} +
{{error}}
diff --git a/src-ui/src/app/components/common/toasts/toasts.component.scss b/src-ui/src/app/components/common/toasts/toasts.component.scss index d2aaf20b0..e6dcb7a57 100644 --- a/src-ui/src/app/components/common/toasts/toasts.component.scss +++ b/src-ui/src/app/components/common/toasts/toasts.component.scss @@ -8,4 +8,4 @@ .toast:not(.show) { display: block; // this corrects an ng-bootstrap bug that prevented animations -} \ No newline at end of file +} diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html index a4203473f..0f355eb06 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.html +++ b/src-ui/src/app/components/document-detail/document-detail.component.html @@ -73,6 +73,8 @@ (createNew)="createCorrespondent($event)" [suggestions]="suggestions?.correspondents"> + diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts index f76e91e4d..6728f746d 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.ts @@ -33,6 +33,9 @@ import { PaperlessDocumentSuggestions } from 'src/app/data/paperless-document-su import { FILTER_FULLTEXT_MORELIKE } from 'src/app/data/filter-rule-type' import { normalizeDateStr } from 'src/app/utils/date' import { QueryParamsService } from 'src/app/services/query-params.service' +import { StoragePathService } from 'src/app/services/rest/storage-path.service' +import { PaperlessStoragePath } from 'src/app/data/paperless-storage-path' +import { StoragePathEditDialogComponent } from '../common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component' import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings' @Component({ @@ -66,6 +69,7 @@ export class DocumentDetailComponent correspondents: PaperlessCorrespondent[] documentTypes: PaperlessDocumentType[] + storagePaths: PaperlessStoragePath[] documentForm: FormGroup = new FormGroup({ title: new FormControl(''), @@ -73,6 +77,7 @@ export class DocumentDetailComponent created: new FormControl(), correspondent: new FormControl(), document_type: new FormControl(), + storage_path: new FormControl(), archive_serial_number: new FormControl(), tags: new FormControl([]), }) @@ -115,6 +120,7 @@ export class DocumentDetailComponent private documentTitlePipe: DocumentTitlePipe, private toastService: ToastService, private settings: SettingsService, + private storagePathService: StoragePathService, private queryParamsService: QueryParamsService ) {} @@ -163,11 +169,17 @@ export class DocumentDetailComponent .listAll() .pipe(first()) .subscribe((result) => (this.correspondents = result.results)) + this.documentTypeService .listAll() .pipe(first()) .subscribe((result) => (this.documentTypes = result.results)) + this.storagePathService + .listAll() + .pipe(first()) + .subscribe((result) => (this.storagePaths = result.results)) + this.route.paramMap .pipe( takeUntil(this.unsubscribeNotifier), @@ -230,6 +242,7 @@ export class DocumentDetailComponent created: this.ogDate.toISOString(), correspondent: doc.correspondent, document_type: doc.document_type, + storage_path: doc.storage_path, archive_serial_number: doc.archive_serial_number, tags: [...doc.tags], }) @@ -336,6 +349,27 @@ export class DocumentDetailComponent }) } + createStoragePath(newName: string) { + var modal = this.modalService.open(StoragePathEditDialogComponent, { + backdrop: 'static', + }) + modal.componentInstance.dialogMode = 'create' + if (newName) modal.componentInstance.object = { name: newName } + modal.componentInstance.success + .pipe( + switchMap((newStoragePath) => { + return this.storagePathService + .listAll() + .pipe(map((storagePaths) => ({ newStoragePath, storagePaths }))) + }) + ) + .pipe(takeUntil(this.unsubscribeNotifier)) + .subscribe(({ newStoragePath, documentTypes: storagePaths }) => { + this.storagePaths = storagePaths.results + this.documentForm.get('storage_path').setValue(newStoragePath.id) + }) + } + discard() { this.documentsService .get(this.documentId) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index 631b558d0..8d9389df3 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -53,6 +53,15 @@ [(selectionModel)]="documentTypeSelectionModel" (apply)="setDocumentTypes($event)"> + +
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index b17af67eb..b9ab00fe6 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -22,6 +22,8 @@ import { MatchingModel } from 'src/app/data/matching-model' import { SettingsService } from 'src/app/services/settings.service' import { ToastService } from 'src/app/services/toast.service' import { saveAs } from 'file-saver' +import { StoragePathService } from 'src/app/services/rest/storage-path.service' +import { PaperlessStoragePath } from 'src/app/data/paperless-storage-path' import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings' @Component({ @@ -33,10 +35,12 @@ export class BulkEditorComponent { tags: PaperlessTag[] correspondents: PaperlessCorrespondent[] documentTypes: PaperlessDocumentType[] + storagePaths: PaperlessStoragePath[] tagSelectionModel = new FilterableDropdownSelectionModel() correspondentSelectionModel = new FilterableDropdownSelectionModel() documentTypeSelectionModel = new FilterableDropdownSelectionModel() + storagePathsSelectionModel = new FilterableDropdownSelectionModel() awaitingDownload: boolean constructor( @@ -48,7 +52,8 @@ export class BulkEditorComponent { private modalService: NgbModal, private openDocumentService: OpenDocumentsService, private settings: SettingsService, - private toastService: ToastService + private toastService: ToastService, + private storagePathService: StoragePathService ) {} applyOnClose: boolean = this.settings.get( @@ -68,6 +73,9 @@ export class BulkEditorComponent { this.documentTypeService .listAll() .subscribe((result) => (this.documentTypes = result.results)) + this.storagePathService + .listAll() + .subscribe((result) => (this.storagePaths = result.results)) } private executeBulkOperation(modal, method: string, args) { @@ -145,6 +153,17 @@ export class BulkEditorComponent { }) } + openStoragePathDropdown() { + this.documentService + .getSelectionData(Array.from(this.list.selected)) + .subscribe((s) => { + this.applySelectionData( + s.selected_storage_paths, + this.storagePathsSelectionModel + ) + }) + } + private _localizeList(items: MatchingModel[]) { if (items.length == 0) { return '' @@ -299,6 +318,42 @@ export class BulkEditorComponent { } } + setStoragePaths(changedDocumentPaths: ChangedItems) { + if ( + changedDocumentPaths.itemsToAdd.length == 0 && + changedDocumentPaths.itemsToRemove.length == 0 + ) + return + + let storagePath = + changedDocumentPaths.itemsToAdd.length > 0 + ? changedDocumentPaths.itemsToAdd[0] + : null + + if (this.showConfirmationDialogs) { + let modal = this.modalService.open(ConfirmDialogComponent, { + backdrop: 'static', + }) + modal.componentInstance.title = $localize`Confirm storage path assignment` + if (storagePath) { + modal.componentInstance.message = $localize`This operation will assign the storage path "${storagePath.name}" to ${this.list.selected.size} selected document(s).` + } else { + modal.componentInstance.message = $localize`This operation will remove the storage path from ${this.list.selected.size} selected document(s).` + } + modal.componentInstance.btnClass = 'btn-warning' + modal.componentInstance.btnCaption = $localize`Confirm` + modal.componentInstance.confirmClicked.subscribe(() => { + this.executeBulkOperation(modal, 'set_storage_path', { + storage_path: storagePath ? storagePath.id : null, + }) + }) + } else { + this.executeBulkOperation(null, 'set_storage_path', { + storage_path: storagePath ? storagePath.id : null, + }) + } + } + applyDelete() { let modal = this.modalService.open(ConfirmDialogComponent, { backdrop: 'static', diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html index 5eb4a97dd..cbc507de4 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html @@ -67,6 +67,13 @@ {{(document.document_type$ | async)?.name}} +
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts index 9b9e20b8c..de6b94032 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts @@ -52,6 +52,9 @@ export class DocumentCardLargeComponent implements OnInit { @Output() clickDocumentType = new EventEmitter() + @Output() + clickStoragePath = new EventEmitter() + @Output() clickMoreLike = new EventEmitter() diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html index 6c68cc26f..339d04e96 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html @@ -37,6 +37,13 @@ {{(document.document_type$ | async)?.name}} +
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts index 06e2fe967..3f7fc7982 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts @@ -47,6 +47,9 @@ export class DocumentCardSmallComponent implements OnInit { @Output() clickDocumentType = new EventEmitter() + @Output() + clickStoragePath = new EventEmitter() + moreTags: number = null @ViewChild('popover') popover: NgbPopover diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html index aa43243fc..d0aaf5890 100644 --- a/src-ui/src/app/components/document-list/document-list.component.html +++ b/src-ui/src/app/components/document-list/document-list.component.html @@ -107,7 +107,7 @@
- +
@@ -138,6 +138,12 @@ [currentSortReverse]="list.sortReverse" (sort)="onSort($event)" i18n>Document type + Storage path {{(d.document_type$ | async)?.name}} + + + {{(d.storage_path$ | async)?.name}} + + {{d.created | customDate}} @@ -187,7 +198,7 @@
- +
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index 8cf6c3848..d9355902f 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -265,6 +265,13 @@ export class DocumentListComponent implements OnInit, OnDestroy, AfterViewInit { }) } + clickStoragePath(storagePathID: number) { + this.list.selectNone() + setTimeout(() => { + this.filterEditor.addStoragePath(storagePathID) + }) + } + clickMoreLike(documentID: number) { this.queryParamsService.navigateWithFilterRules([ { rule_type: FILTER_FULLTEXT_MORELIKE, value: documentID.toString() }, diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html index 40c62d779..b02d6cc7a 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html @@ -1,7 +1,7 @@ -
+
-
+
@@ -18,43 +18,54 @@
- - - - - +
+ + + + +
+
+ + +
-
-
- -
-
+ +
+ Created: {{ document.created | customDate }} + Added: {{ document.added | customDate }} + Modified: {{ document.modified | customDate }} +
+ +
{{document.created | customDate:'mediumDate'}}
-
Score: diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html index 339d04e96..431454fe5 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html @@ -30,14 +30,14 @@
- -
-
-
- -
+
+
+ {{moreTags}}
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss index 4d03d0a4d..6ccbba0c2 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.scss @@ -78,3 +78,11 @@ a { cursor: pointer; } + +.tags { + top: 0; + right: 0; + max-width: 80%; + row-gap: .2rem; + line-height: 1; +} From fbb4e1bb65f78a63d849ae89787af955db722e74 Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Mon, 23 May 2022 15:53:47 -0700 Subject: [PATCH 107/291] Also output the exception when the Redis ping fails --- docker/wait-for-redis.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/wait-for-redis.py b/docker/wait-for-redis.py index 292450352..8ceae1ba9 100755 --- a/docker/wait-for-redis.py +++ b/docker/wait-for-redis.py @@ -26,9 +26,11 @@ if __name__ == "__main__": try: client.ping() break - except Exception: + except Exception as e: print( - f"Redis ping #{attempt} failed, waiting {RETRY_SLEEP_SECONDS}s", + f"Redis ping #{attempt} failed.\n" + f"Error: {str(e)}.\n" + f"Waiting {RETRY_SLEEP_SECONDS}s", flush=True, ) time.sleep(RETRY_SLEEP_SECONDS) From 1b868d5e8d7c2aa24c0f2f2e6cec83f4b8489c95 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 23 May 2022 20:25:26 -0700 Subject: [PATCH 108/291] Alphabetize tags by default --- src-ui/src/app/services/rest/document.service.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts index 8d5f80c04..8b5248b86 100644 --- a/src-ui/src/app/services/rest/document.service.ts +++ b/src-ui/src/app/services/rest/document.service.ts @@ -6,7 +6,7 @@ import { HttpClient, HttpParams } from '@angular/common/http' import { Observable } from 'rxjs' import { Results } from 'src/app/data/results' import { FilterRule } from 'src/app/data/filter-rule' -import { map } from 'rxjs/operators' +import { map, tap } from 'rxjs/operators' import { CorrespondentService } from './correspondent.service' import { DocumentTypeService } from './document-type.service' import { TagService } from './tag.service' @@ -70,7 +70,13 @@ export class DocumentService extends AbstractPaperlessService doc.document_type$ = this.documentTypeService.getCached(doc.document_type) } if (doc.tags) { - doc.tags$ = this.tagService.getCachedMany(doc.tags) + doc.tags$ = this.tagService + .getCachedMany(doc.tags) + .pipe( + tap((tags) => + tags.sort((tagA, tagB) => tagA.name.localeCompare(tagB.name)) + ) + ) } if (doc.storage_path) { doc.storage_path$ = this.storagePathService.getCached(doc.storage_path) From f6aeb12a952608836d3620d04e1127221dd3ae4d Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 23 May 2022 23:07:49 -0700 Subject: [PATCH 109/291] use force_authenticate in api tests --- src/documents/tests/test_api.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index 1f6e012d1..24bdc3a50 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -41,7 +41,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): super().setUp() self.user = User.objects.create_superuser(username="temp_admin") - self.client.force_login(user=self.user) + self.client.force_authenticate(user=self.user) def testDocuments(self): @@ -1176,7 +1176,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): self.assertEqual(self.client.get(f"/api/saved_views/{v1.id}/").status_code, 404) - self.client.force_login(user=u1) + self.client.force_authenticate(user=u1) response = self.client.get("/api/saved_views/") self.assertEqual(response.status_code, 200) @@ -1184,7 +1184,7 @@ class TestDocumentApi(DirectoriesMixin, APITestCase): self.assertEqual(self.client.get(f"/api/saved_views/{v1.id}/").status_code, 200) - self.client.force_login(user=u2) + self.client.force_authenticate(user=u2) response = self.client.get("/api/saved_views/") self.assertEqual(response.status_code, 200) @@ -1358,7 +1358,7 @@ class TestDocumentApiV2(DirectoriesMixin, APITestCase): self.user = User.objects.create_superuser(username="temp_admin") - self.client.force_login(user=self.user) + self.client.force_authenticate(user=self.user) self.client.defaults["HTTP_ACCEPT"] = "application/json; version=2" def test_tag_validate_color(self): @@ -1434,7 +1434,7 @@ class TestDocumentApiV2(DirectoriesMixin, APITestCase): def test_ui_settings(self): test_user = User.objects.create_superuser(username="test") - self.client.force_login(user=test_user) + self.client.force_authenticate(user=test_user) response = self.client.get("/api/ui_settings/", format="json") self.assertEqual(response.status_code, 200) @@ -1473,7 +1473,7 @@ class TestBulkEdit(DirectoriesMixin, APITestCase): super().setUp() user = User.objects.create_superuser(username="temp_admin") - self.client.force_login(user=user) + self.client.force_authenticate(user=user) patcher = mock.patch("documents.bulk_edit.async_task") self.async_task = patcher.start() @@ -2049,7 +2049,7 @@ class TestBulkDownload(DirectoriesMixin, APITestCase): super().setUp() user = User.objects.create_superuser(username="temp_admin") - self.client.force_login(user=user) + self.client.force_authenticate(user=user) self.doc1 = Document.objects.create(title="unrelated", checksum="A") self.doc2 = Document.objects.create( @@ -2250,7 +2250,7 @@ class TestApiAuth(APITestCase): def test_api_version_with_auth(self): user = User.objects.create_superuser(username="test") - self.client.force_login(user) + self.client.force_authenticate(user) response = self.client.get("/api/") self.assertIn("X-Api-Version", response) self.assertIn("X-Version", response) From 211427586a2a08c8e6254b24faef3652a711ef4e Mon Sep 17 00:00:00 2001 From: tooomm Date: Thu, 19 May 2022 22:05:43 +0200 Subject: [PATCH 110/291] update heading levels for v1.7.0 --- docs/changelog.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index 9ba2f9aa0..9d35ee050 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -70,12 +70,12 @@ ## paperless-ngx 1.7.0 -Breaking Changes +### Breaking Changes - `PAPERLESS_URL` is now required when using a reverse proxy. See [\#674](https://github.com/paperless-ngx/paperless-ngx/pull/674). -Features +### Features - Allow setting more than one tag in mail rules [\@jonasc](https://github.com/jonasc) (\#270) @@ -107,7 +107,7 @@ Features - Parse dates when entered without separators [\@GruberViktor](https://github.com/gruberviktor) (\#250). -Bug Fixes +### Bug Fixes - add \"localhost\" to ALLOWED_HOSTS [\@gador](https://github.com/gador) (\#700). @@ -155,7 +155,7 @@ Bug Fixes - Fix: Include excluded items in dropdown count [\@shamoon](https://github.com/shamoon) (\#263). -Translation +### Translation - [\@miku323](https://github.com/miku323) contributed to Slovenian translation. @@ -168,7 +168,7 @@ Translation - [\@Prominence](https://github.com/Prominence) contributed to Belarusian translation. -Documentation +### Documentation - Fix: scanners table [\@qcasey](https://github.com/qcasey) (\#690). - Add [PAPERLESS\_URL]{.title-ref} env variable & CSRF var @@ -180,7 +180,7 @@ Documentation - Fix minor sphinx errors [\@shamoon](https://github.com/shamoon) (\#322). -Maintenance +### Maintenance - Add `PAPERLESS_URL` env variable & CSRF var [\@shamoon](https://github.com/shamoon) (\#674). From fc9c83996451c8b4b86e976d0855a0c6713b95ae Mon Sep 17 00:00:00 2001 From: tooomm Date: Thu, 19 May 2022 23:12:40 +0200 Subject: [PATCH 111/291] Link issues, capitalization and minor fixes --- docs/changelog.md | 174 +++++++++++++++++++++++----------------------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index 9d35ee050..319592b5d 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -17,7 +17,7 @@ ### Bug Fixes - Feature / fix saved view \& sort field query params [\@shamoon](https://github.com/shamoon) ([\#881](https://github.com/paperless-ngx/paperless-ngx/pull/881)) -- mobile friendlier manage pages [\@shamoon](https://github.com/shamoon) ([\#873](https://github.com/paperless-ngx/paperless-ngx/pull/873)) +- Mobile friendlier manage pages [\@shamoon](https://github.com/shamoon) ([\#873](https://github.com/paperless-ngx/paperless-ngx/pull/873)) - Add timeout to healthcheck [\@shamoon](https://github.com/shamoon) ([\#880](https://github.com/paperless-ngx/paperless-ngx/pull/880)) - Always accept yyyy-mm-dd date inputs [\@shamoon](https://github.com/shamoon) ([\#864](https://github.com/paperless-ngx/paperless-ngx/pull/864)) - Fix local Docker image building [\@stumpylog](https://github.com/stumpylog) ([\#849](https://github.com/paperless-ngx/paperless-ngx/pull/849)) @@ -78,129 +78,129 @@ ### Features - Allow setting more than one tag in mail rules - [\@jonasc](https://github.com/jonasc) (\#270) -- global drag\'n\'drop [\@shamoon](https://github.com/shamoon) - (\#283). + [\@jonasc](https://github.com/jonasc) ([\#270](https://github.com/paperless-ngx/paperless-ngx/pull/270)) +- Global drag\'n\'drop [\@shamoon](https://github.com/shamoon) + ([\#283](https://github.com/paperless-ngx/paperless-ngx/pull/283)) - Fix: download buttons should disable while waiting - [\@shamoon](https://github.com/shamoon) (\#630). -- Update checker [\@shamoon](https://github.com/shamoon) (\#591). + [\@shamoon](https://github.com/shamoon) ([\#630](https://github.com/paperless-ngx/paperless-ngx/pull/630)) +- Update checker [\@shamoon](https://github.com/shamoon) ([\#591](https://github.com/paperless-ngx/paperless-ngx/pull/591)) - Show prompt on password-protected pdfs - [\@shamoon](https://github.com/shamoon) (\#564). + [\@shamoon](https://github.com/shamoon) ([\#564](https://github.com/paperless-ngx/paperless-ngx/pull/564)) - Filtering query params aka browser navigation for filtering - [\@shamoon](https://github.com/shamoon) (\#540). + [\@shamoon](https://github.com/shamoon) ([\#540](https://github.com/paperless-ngx/paperless-ngx/pull/540)) - Clickable tags in dashboard widgets - [\@shamoon](https://github.com/shamoon) (\#515). + [\@shamoon](https://github.com/shamoon) ([\#515](https://github.com/paperless-ngx/paperless-ngx/pull/515)) - Add bottom pagination [\@shamoon](https://github.com/shamoon) - (\#372). + ([\#372](https://github.com/paperless-ngx/paperless-ngx/pull/372)) - Feature barcode splitter [\@gador](https://github.com/gador) - (\#532). -- App loading screen [\@shamoon](https://github.com/shamoon) (\#298). + ([\#532](https://github.com/paperless-ngx/paperless-ngx/pull/532)) +- App loading screen [\@shamoon](https://github.com/shamoon) ([\#298](https://github.com/paperless-ngx/paperless-ngx/pull/298)) - Use progress bar for delayed buttons - [\@shamoon](https://github.com/shamoon) (\#415). + [\@shamoon](https://github.com/shamoon) ([\#415](https://github.com/paperless-ngx/paperless-ngx/pull/415)) - Add minimum length for documents text filter - [\@shamoon](https://github.com/shamoon) (\#401). + [\@shamoon](https://github.com/shamoon) ([\#401](https://github.com/paperless-ngx/paperless-ngx/pull/401)) - Added nav buttons in the document detail view - [\@GruberViktor](https://github.com/gruberviktor) (\#273). + [\@GruberViktor](https://github.com/gruberviktor) ([\#273](https://github.com/paperless-ngx/paperless-ngx/pull/273)) - Improve date keyboard input [\@shamoon](https://github.com/shamoon) - (\#253). -- Color theming [\@shamoon](https://github.com/shamoon) (\#243). + ([\#253](https://github.com/paperless-ngx/paperless-ngx/pull/253)) +- Color theming [\@shamoon](https://github.com/shamoon) ([\#243](https://github.com/paperless-ngx/paperless-ngx/pull/243)) - Parse dates when entered without separators - [\@GruberViktor](https://github.com/gruberviktor) (\#250). + [\@GruberViktor](https://github.com/gruberviktor) ([\#250](https://github.com/paperless-ngx/paperless-ngx/pull/250)) ### Bug Fixes -- add \"localhost\" to ALLOWED_HOSTS - [\@gador](https://github.com/gador) (\#700). -- Fix: scanners table [\@qcasey](https://github.com/qcasey) (\#690). +- Add \"localhost\" to ALLOWED_HOSTS + [\@gador](https://github.com/gador) ([\#700](https://github.com/paperless-ngx/paperless-ngx/pull/700)) +- Fix: scanners table [\@qcasey](https://github.com/qcasey) ([\#690](https://github.com/paperless-ngx/paperless-ngx/pull/690)) - Adds wait for file before consuming - [\@stumpylog](https://github.com/stumpylog) (\#483). + [\@stumpylog](https://github.com/stumpylog) ([\#483](https://github.com/paperless-ngx/paperless-ngx/pull/483)) - Fix: frontend document editing erases time data - [\@shamoon](https://github.com/shamoon) (\#654). + [\@shamoon](https://github.com/shamoon) ([\#654](https://github.com/paperless-ngx/paperless-ngx/pull/654)) - Increase length of SavedViewFilterRule - [\@stumpylog](https://github.com/stumpylog) (\#612). + [\@stumpylog](https://github.com/stumpylog) ([\#612](https://github.com/paperless-ngx/paperless-ngx/pull/612)) - Fixes attachment filename matching during mail fetching - [\@stumpylog](https://github.com/stumpylog) (\#680). + [\@stumpylog](https://github.com/stumpylog) ([\#680](https://github.com/paperless-ngx/paperless-ngx/pull/680)) - Add `PAPERLESS_URL` env variable & CSRF var - [\@shamoon](https://github.com/shamoon) (\#674). + [\@shamoon](https://github.com/shamoon) ([\#674](https://github.com/paperless-ngx/paperless-ngx/discussions/674)) - Fix: download buttons should disable while waiting - [\@shamoon](https://github.com/shamoon) (\#630). + [\@shamoon](https://github.com/shamoon) ([\#630](https://github.com/paperless-ngx/paperless-ngx/pull/630)) - Fixes downloaded filename, add more consumer ignore settings - [\@stumpylog](https://github.com/stumpylog) (\#599). + [\@stumpylog](https://github.com/stumpylog) ([\#599](https://github.com/paperless-ngx/paperless-ngx/pull/599)) - FIX BUG: case-sensitive matching was not possible - [\@danielBreitlauch](https://github.com/danielbreitlauch) (\#594). -- uses shutil.move instead of rename - [\@gador](https://github.com/gador) (\#617). + [\@danielBreitlauch](https://github.com/danielbreitlauch) ([\#594](https://github.com/paperless-ngx/paperless-ngx/pull/594)) +- Uses shutil.move instead of rename + [\@gador](https://github.com/gador) ([\#617](https://github.com/paperless-ngx/paperless-ngx/pull/617)) - Fix npm deps 01.02.22 2 [\@shamoon](https://github.com/shamoon) - (\#610). + ([\#610](https://github.com/paperless-ngx/paperless-ngx/discussions/610)) - Fix npm dependencies 01.02.22 - [\@shamoon](https://github.com/shamoon) (\#600). -- fix issue 416: implement PAPERLESS_OCR_MAX_IMAGE_PIXELS - [\@hacker-h](https://github.com/hacker-h) (\#441). -- fix: exclude cypress from build in Dockerfile - [\@FrankStrieter](https://github.com/FrankStrieter) (\#526). + [\@shamoon](https://github.com/shamoon) ([\#600](https://github.com/paperless-ngx/paperless-ngx/pull/600)) +- Fix issue 416: implement `PAPERLESS_OCR_MAX_IMAGE_PIXELS` + [\@hacker-h](https://github.com/hacker-h) ([\#441](https://github.com/paperless-ngx/paperless-ngx/pull/441)) +- Fix: exclude cypress from build in Dockerfile + [\@FrankStrieter](https://github.com/FrankStrieter) ([\#526](https://github.com/paperless-ngx/paperless-ngx/pull/526)) - Corrections to pass pre-commit hooks - [\@schnuffle](https://github.com/schnuffle) (\#454). + [\@schnuffle](https://github.com/schnuffle) ([\#454](https://github.com/paperless-ngx/paperless-ngx/pull/454)) - Fix 311 unable to click checkboxes in document list - [\@shamoon](https://github.com/shamoon) (\#313). + [\@shamoon](https://github.com/shamoon) ([\#313](https://github.com/paperless-ngx/paperless-ngx/pull/313)) - Fix imap tools bug [\@stumpylog](https://github.com/stumpylog) - (\#393). + ([\#393](https://github.com/paperless-ngx/paperless-ngx/pull/393)) - Fix filterable dropdown buttons arent translated - [\@shamoon](https://github.com/shamoon) (\#366). + [\@shamoon](https://github.com/shamoon) ([\#366](https://github.com/paperless-ngx/paperless-ngx/pull/366)) - Fix 224: \"Auto-detected date is day before receipt date\" - [\@a17t](https://github.com/a17t) (\#246). + [\@a17t](https://github.com/a17t) ([\#246](https://github.com/paperless-ngx/paperless-ngx/pull/246)) - Fix minor sphinx errors [\@shamoon](https://github.com/shamoon) - (\#322). + ([\#322](https://github.com/paperless-ngx/paperless-ngx/pull/322)) - Fix page links hidden [\@shamoon](https://github.com/shamoon) - (\#314). + ([\#314](https://github.com/paperless-ngx/paperless-ngx/pull/314)) - Fix: Include excluded items in dropdown count - [\@shamoon](https://github.com/shamoon) (\#263). + [\@shamoon](https://github.com/shamoon) ([\#263](https://github.com/paperless-ngx/paperless-ngx/pull/263)) ### Translation - [\@miku323](https://github.com/miku323) contributed to Slovenian - translation. + translation - [\@FaintGhost](https://github.com/FaintGhost) contributed to Chinese - Simplified translation. + Simplified translation - [\@DarkoBG79](https://github.com/DarkoBG79) contributed to Serbian - translation. + translation - [Kemal Secer](https://crowdin.com/profile/kemal.secer) contributed - to Turkish translation. + to Turkish translation - [\@Prominence](https://github.com/Prominence) contributed to - Belarusian translation. + Belarusian translation ### Documentation -- Fix: scanners table [\@qcasey](https://github.com/qcasey) (\#690). -- Add [PAPERLESS\_URL]{.title-ref} env variable & CSRF var - [\@shamoon](https://github.com/shamoon) (\#674). +- Fix: scanners table [\@qcasey](https://github.com/qcasey) ([\#690](https://github.com/paperless-ngx/paperless-ngx/pull/690)) +- Add `PAPERLESS_URL` env variable & CSRF var + [\@shamoon](https://github.com/shamoon) ([\#674](https://github.com/paperless-ngx/paperless-ngx/pull/674)) - Fixes downloaded filename, add more consumer ignore settings - [\@stumpylog](https://github.com/stumpylog) (\#599). -- fix issue 416: implement `PAPERLESS_OCR_MAX_IMAGE_PIXELS` - [\@hacker-h](https://github.com/hacker-h) (\#441). + [\@stumpylog](https://github.com/stumpylog) ([\#599](https://github.com/paperless-ngx/paperless-ngx/pull/599)) +- Fix issue 416: implement `PAPERLESS_OCR_MAX_IMAGE_PIXELS` + [\@hacker-h](https://github.com/hacker-h) ([\#441](https://github.com/paperless-ngx/paperless-ngx/pull/441)) - Fix minor sphinx errors [\@shamoon](https://github.com/shamoon) - (\#322). + ([\#322](https://github.com/paperless-ngx/paperless-ngx/pull/322)) ### Maintenance - Add `PAPERLESS_URL` env variable & CSRF var - [\@shamoon](https://github.com/shamoon) (\#674). + [\@shamoon](https://github.com/shamoon) ([\#674](https://github.com/paperless-ngx/paperless-ngx/pull/674)) - Chore: Implement release-drafter action for Changelogs - [\@qcasey](https://github.com/qcasey) (\#669). -- Chore: Add CODEOWNERS [\@qcasey](https://github.com/qcasey) (\#667). + [\@qcasey](https://github.com/qcasey) ([\#669](https://github.com/paperless-ngx/paperless-ngx/pull/669)) +- Chore: Add CODEOWNERS [\@qcasey](https://github.com/qcasey) ([\#667](https://github.com/paperless-ngx/paperless-ngx/pull/667)) - Support docker-compose v2 in install - [\@stumpylog](https://github.com/stumpylog) (\#611). + [\@stumpylog](https://github.com/stumpylog) ([\#611](https://github.com/paperless-ngx/paperless-ngx/pull/611)) - Add Belarusian localization [\@shamoon](https://github.com/shamoon) - (\#588). + ([\#588](https://github.com/paperless-ngx/paperless-ngx/pull/588)) - Add Turkish localization [\@shamoon](https://github.com/shamoon) - (\#536). + ([\#536](https://github.com/paperless-ngx/paperless-ngx/pull/536)) - Add Serbian localization [\@shamoon](https://github.com/shamoon) - (\#504). + ([\#504](https://github.com/paperless-ngx/paperless-ngx/pull/504)) - Create PULL_REQUEST_TEMPLATE.md - [\@shamoon](https://github.com/shamoon) (\#304). + [\@shamoon](https://github.com/shamoon) ([\#304](https://github.com/paperless-ngx/paperless-ngx/pull/304)) - Add Chinese localization [\@shamoon](https://github.com/shamoon) - (\#247). + ([\#247](https://github.com/paperless-ngx/paperless-ngx/pull/247)) - Add Slovenian language for frontend - [\@shamoon](https://github.com/shamoon) (\#315). + [\@shamoon](https://github.com/shamoon) ([\#315](https://github.com/paperless-ngx/paperless-ngx/pull/315)) ## paperless-ngx 1.6.0 @@ -216,46 +216,46 @@ include: - Updated Python and Angular dependencies. - Dropped support for Python 3.7. - Dropped support for Ansible playbooks (thanks - [\@slankes](https://github.com/slankes) \#109). If someone would - like to continue supporting them, please see the [ansible + [\@slankes](https://github.com/slankes) [\#109](https://github.com/paperless-ngx/paperless-ngx/pull/109)). If someone would + like to continue supporting them, please see our [ansible repo](https://github.com/paperless-ngx/paperless-ngx-ansible). - Python code is now required to use Black formatting (thanks - [\@kpj](https://github.com/kpj) \#168). + [\@kpj](https://github.com/kpj) [\#168](https://github.com/paperless-ngx/paperless-ngx/pull/168)). - [\@tribut](https://github.com/tribut) added support for a custom SSO - logout redirect (jonaswinkler\#1258). See + logout redirect ([jonaswinkler\#1258](https://github.com/jonaswinkler/paperless-ng/pull/1258)). See `PAPERLESS_LOGOUT_REDIRECT_URL`. - [\@shamoon](https://github.com/shamoon) added a loading indicator - when document list is reloading (jonaswinkler\#1297). + when document list is reloading ([jonaswinkler\#1297](https://github.com/jonaswinkler/paperless-ng/pull/1297)). - [\@shamoon](https://github.com/shamoon) improved the PDF viewer on - mobile (\#2). + mobile ([\#2](https://github.com/paperless-ngx/paperless-ngx/pull/2)). - [\@shamoon](https://github.com/shamoon) added \'any\' / \'all\' and - \'not\' filtering with tags (\#10). + \'not\' filtering with tags ([\#10](https://github.com/paperless-ngx/paperless-ngx/pull/10)). - [\@shamoon](https://github.com/shamoon) added warnings for unsaved - changes, with smart edit buttons (\#13). + changes, with smart edit buttons ([\#13](https://github.com/paperless-ngx/paperless-ngx/pull/13)). - [\@benjaminfrank](https://github.com/benjaminfrank) enabled a - non-root access to port 80 via systemd (\#18). + non-root access to port 80 via systemd ([\#18](https://github.com/paperless-ngx/paperless-ngx/pull/18)). - [\@tribut](https://github.com/tribut) added simple \"delete to - trash\" functionality (\#24). See `PAPERLESS_TRASH_DIR`. + trash\" functionality ([\#24](https://github.com/paperless-ngx/paperless-ngx/pull/24)). See `PAPERLESS_TRASH_DIR`. - [\@amenk](https://github.com/amenk) fixed the search box overlay - menu on mobile (\#32). + menu on mobile ([\#32](https://github.com/paperless-ngx/paperless-ngx/pull/32)). - [\@dblitt](https://github.com/dblitt) updated the login form to not - auto-capitalize usernames (\#36). + auto-capitalize usernames ([\#36](https://github.com/paperless-ngx/paperless-ngx/pull/36)). - [\@evilsidekick293](https://github.com/evilsidekick293) made the - worker timeout configurable (\#37). See `PAPERLESS_WORKER_TIMEOUT`. + worker timeout configurable ([\#37](https://github.com/paperless-ngx/paperless-ngx/pull/37)). See `PAPERLESS_WORKER_TIMEOUT`. - [\@Nicarim](https://github.com/Nicarim) fixed downloads of UTF-8 - formatted documents in Firefox (\#56). + formatted documents in Firefox ([\#56](https://github.com/paperless-ngx/paperless-ngx/pull/56)). - [\@mweimerskirch](https://github.com/mweimerskirch) sorted the - language dropdown by locale (\#78). + language dropdown by locale ([\#78](https://github.com/paperless-ngx/paperless-ngx/issues/78)). - [\@mweimerskirch](https://github.com/mweimerskirch) enabled the - Czech (\#83) and Danish (\#84) translations. + Czech ([\#83](https://github.com/paperless-ngx/paperless-ngx/pull/83)) and Danish ([\#84](https://github.com/paperless-ngx/paperless-ngx/pull/84)) translations. - [\@cschmatzler](https://github.com/cschmatzler) enabled specifying - the webserver port (\#124). See `PAPERLESS_PORT`. + the webserver port ([\#124](https://github.com/paperless-ngx/paperless-ngx/pull/124)). See `PAPERLESS_PORT`. - [\@muellermartin](https://github.com/muellermartin) fixed an error - when uploading transparent PNGs (\#133). + when uploading transparent PNGs ([\#133](https://github.com/paperless-ngx/paperless-ngx/pull/133)). - [\@shamoon](https://github.com/shamoon) created a slick new logo - (\#165). + ([\#165](https://github.com/paperless-ngx/paperless-ngx/pull/165)). - [\@tim-vogel](https://github.com/tim-vogel) fixed exports missing - groups (\#193). + groups ([\#193](https://github.com/paperless-ngx/paperless-ngx/pull/193)). Known issues: From cbb36e89417fe86b5701ff0c3aa6aaf3e9e60d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Wed, 25 May 2022 19:22:50 +0200 Subject: [PATCH 112/291] Add first draft implementation, test broken. --- src/paperless_mail/mail.py | 13 ++++++++ src/paperless_mail/models.py | 1 + src/paperless_mail/tests/test_mail.py | 43 ++++++++++++++++++++++++++- 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/src/paperless_mail/mail.py b/src/paperless_mail/mail.py index 67cc22130..fefcbda5e 100644 --- a/src/paperless_mail/mail.py +++ b/src/paperless_mail/mail.py @@ -62,6 +62,17 @@ class FlagMailAction(BaseMailAction): M.flag(message_uids, [MailMessageFlags.FLAGGED], True) +class TagMailAction(BaseMailAction): + def __init__(self, parameter): + self.keyword = parameter + + def get_criteria(self): + return {"no_keyword": self.keyword} + + def post_consume(self, M: MailBox, message_uids, parameter): + M.flag(message_uids, [self.keyword], True) + + def get_rule_action(rule): if rule.action == MailRule.MailAction.FLAG: return FlagMailAction() @@ -71,6 +82,8 @@ def get_rule_action(rule): return MoveMailAction() elif rule.action == MailRule.MailAction.MARK_READ: return MarkReadMailAction() + elif rule.action == MailRule.MailAction.TAG: + return TagMailAction(rule.action_parameter) else: raise NotImplementedError("Unknown action.") # pragma: nocover diff --git a/src/paperless_mail/models.py b/src/paperless_mail/models.py index 4e90197b7..4c0a1a557 100644 --- a/src/paperless_mail/models.py +++ b/src/paperless_mail/models.py @@ -65,6 +65,7 @@ class MailRule(models.Model): MOVE = 2, _("Move to specified folder") MARK_READ = 3, _("Mark as read, don't process read mails") FLAG = 4, _("Flag the mail, don't process flagged mails") + TAG = 5, _("Tag the mail with specified tag, don't process tagged mails") class TitleSource(models.IntegerChoices): FROM_SUBJECT = 1, _("Use subject as title") diff --git a/src/paperless_mail/tests/test_mail.py b/src/paperless_mail/tests/test_mail.py index 24014b4dc..b275be360 100644 --- a/src/paperless_mail/tests/test_mail.py +++ b/src/paperless_mail/tests/test_mail.py @@ -4,7 +4,7 @@ import os import random import uuid from collections import namedtuple -from typing import ContextManager +from typing import ContextManager, Callable from typing import List from typing import Union from unittest import mock @@ -96,6 +96,18 @@ class BogusMailBox(ContextManager): if "UNFLAGGED" in criteria: msg = filter(lambda m: not m.flagged, msg) + if "NO_KEYWORD" in criteria: + tag: str = criteria[criteria.index("NO_KEYWORD") + 1].strip('"') + print(f"selected tag is {tag}.") + for m in msg: + print(f"Message with id {m.uid} has tags {','.join(m.flags)}") + msg = filter(lambda m: tag not in m.flags, msg) + + if "KEYWORD" in criteria: + tag = criteria[criteria.index("KEYWORD") + 1].strip('"') + print(f"selected tag is {tag}.") + msg = filter(lambda m: tag in m.flags, msg) + return list(msg) def delete(self, uid_list): @@ -130,6 +142,7 @@ def create_message( from_: str = "noone@mail.com", seen: bool = False, flagged: bool = False, + processed: bool = False, ) -> MailMessage: email_msg = email.message.EmailMessage() # TODO: This does NOT set the UID @@ -176,6 +189,10 @@ def create_message( imap_msg.seen = seen imap_msg.flagged = flagged + # Allows to test for both unset tags, and explicitly 'false' ones. + if processed: + imap_msg._raw_flag_data.append("+FLAGS (processed)".encode()) + return imap_msg @@ -225,6 +242,7 @@ class TestMail(DirectoriesMixin, TestCase): body="from my favorite electronic store", seen=False, flagged=True, + processed=True ), ) self.bogus_mailbox.messages.append( @@ -571,6 +589,29 @@ class TestMail(DirectoriesMixin, TestCase): self.assertEqual(len(self.bogus_mailbox.messages), 2) self.assertEqual(len(self.bogus_mailbox.messages_spam), 1) + def test_handle_mail_account_tag(self): + account = MailAccount.objects.create( + name="test", + imap_server="", + username="admin", + password="secret", + ) + + _ = MailRule.objects.create( + name="testrule", + account=account, + action=MailRule.MailAction.TAG, + action_parameter="processed", + ) + + self.assertEqual(len(self.bogus_mailbox.messages), 3) + self.assertEqual(self.async_task.call_count, 0) + self.assertEqual(len(self.bogus_mailbox.fetch("NO_KEYWORD processed", False)), 2) + self.mail_account_handler.handle_mail_account(account) + self.assertEqual(self.async_task.call_count, 2) + self.assertEqual(len(self.bogus_mailbox.fetch("NO_KEYWORD processed", False)), 0) + self.assertEqual(len(self.bogus_mailbox.messages), 3) + def test_error_login(self): account = MailAccount.objects.create( name="test", From 164cd1929650b77cf5ddf2a7ff2e44b5efe13279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Wed, 25 May 2022 20:47:43 +0200 Subject: [PATCH 113/291] Revert all changes to tests, will need a more structured approach. --- src/paperless_mail/tests/test_mail.py | 43 +-------------------------- 1 file changed, 1 insertion(+), 42 deletions(-) diff --git a/src/paperless_mail/tests/test_mail.py b/src/paperless_mail/tests/test_mail.py index b275be360..24014b4dc 100644 --- a/src/paperless_mail/tests/test_mail.py +++ b/src/paperless_mail/tests/test_mail.py @@ -4,7 +4,7 @@ import os import random import uuid from collections import namedtuple -from typing import ContextManager, Callable +from typing import ContextManager from typing import List from typing import Union from unittest import mock @@ -96,18 +96,6 @@ class BogusMailBox(ContextManager): if "UNFLAGGED" in criteria: msg = filter(lambda m: not m.flagged, msg) - if "NO_KEYWORD" in criteria: - tag: str = criteria[criteria.index("NO_KEYWORD") + 1].strip('"') - print(f"selected tag is {tag}.") - for m in msg: - print(f"Message with id {m.uid} has tags {','.join(m.flags)}") - msg = filter(lambda m: tag not in m.flags, msg) - - if "KEYWORD" in criteria: - tag = criteria[criteria.index("KEYWORD") + 1].strip('"') - print(f"selected tag is {tag}.") - msg = filter(lambda m: tag in m.flags, msg) - return list(msg) def delete(self, uid_list): @@ -142,7 +130,6 @@ def create_message( from_: str = "noone@mail.com", seen: bool = False, flagged: bool = False, - processed: bool = False, ) -> MailMessage: email_msg = email.message.EmailMessage() # TODO: This does NOT set the UID @@ -189,10 +176,6 @@ def create_message( imap_msg.seen = seen imap_msg.flagged = flagged - # Allows to test for both unset tags, and explicitly 'false' ones. - if processed: - imap_msg._raw_flag_data.append("+FLAGS (processed)".encode()) - return imap_msg @@ -242,7 +225,6 @@ class TestMail(DirectoriesMixin, TestCase): body="from my favorite electronic store", seen=False, flagged=True, - processed=True ), ) self.bogus_mailbox.messages.append( @@ -589,29 +571,6 @@ class TestMail(DirectoriesMixin, TestCase): self.assertEqual(len(self.bogus_mailbox.messages), 2) self.assertEqual(len(self.bogus_mailbox.messages_spam), 1) - def test_handle_mail_account_tag(self): - account = MailAccount.objects.create( - name="test", - imap_server="", - username="admin", - password="secret", - ) - - _ = MailRule.objects.create( - name="testrule", - account=account, - action=MailRule.MailAction.TAG, - action_parameter="processed", - ) - - self.assertEqual(len(self.bogus_mailbox.messages), 3) - self.assertEqual(self.async_task.call_count, 0) - self.assertEqual(len(self.bogus_mailbox.fetch("NO_KEYWORD processed", False)), 2) - self.mail_account_handler.handle_mail_account(account) - self.assertEqual(self.async_task.call_count, 2) - self.assertEqual(len(self.bogus_mailbox.fetch("NO_KEYWORD processed", False)), 0) - self.assertEqual(len(self.bogus_mailbox.messages), 3) - def test_error_login(self): account = MailAccount.objects.create( name="test", From 5bab76e4ee98da62b2c71d7a61cb1bf12d044b7a Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 25 May 2022 14:47:05 -0700 Subject: [PATCH 114/291] fix global overlay color --- src-ui/src/styles.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss index 7a566fbb9..4b78e9d21 100644 --- a/src-ui/src/styles.scss +++ b/src-ui/src/styles.scss @@ -425,13 +425,17 @@ table.table { right: 0; bottom: 0; left: 0; - background-color: rgba(23, 84, 31, .8); + background-color: hsla(var(--pngx-primary), var(--pngx-primary-lightness), .8); z-index: 1055; // $zindex-modal pointer-events: none !important; user-select: none !important; text-align: center; padding-top: 25%; + h2 { + color: var(--pngx-primary-text-contrast) + } + &.show { opacity: 1 !important; } From 2966c4a1022801c2d431f8261e9efa45ef9fd153 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 25 May 2022 16:06:59 -0700 Subject: [PATCH 115/291] Show note on language change and offer reload --- src-ui/messages.xlf | 55 +++++++++++++------ .../common/toasts/toasts.component.html | 2 +- .../manage/settings/settings.component.html | 2 +- .../manage/settings/settings.component.ts | 25 ++++++++- src-ui/src/styles.scss | 4 ++ src-ui/src/theme.scss | 3 +- 6 files changed, 69 insertions(+), 22 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 9ab7e46a2..f4c0d6598 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -1340,7 +1340,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.html - 88 + 86 @@ -1884,7 +1884,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.html - 26 + 24 src/app/components/document-list/document-list.component.html @@ -1899,7 +1899,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.html - 15 + 14 src/app/components/document-list/document-list.component.html @@ -1914,7 +1914,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.html - 72 + 70 src/app/components/manage/management-list/management-list.component.html @@ -1964,7 +1964,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.html - 33 + 31 src/app/components/document-list/document-list.component.html @@ -1979,7 +1979,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.html - 40 + 38 src/app/components/document-list/document-list.component.html @@ -1994,7 +1994,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.html - 50 + 48 @@ -2005,7 +2005,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.html - 51 + 49 @@ -2016,7 +2016,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.html - 52 + 50 @@ -2764,35 +2764,56 @@ Saved view "" deleted. src/app/components/manage/settings/settings.component.ts - 167 + 174 - - Settings saved successfully. + + Settings saved src/app/components/manage/settings/settings.component.ts - 238 + 247 + + + + Settings were saved successfully. + + src/app/components/manage/settings/settings.component.ts + 248 + + + + Settings were saved successfully. Reload is required to apply some changes. + + src/app/components/manage/settings/settings.component.ts + 252 + + + + Reload now + + src/app/components/manage/settings/settings.component.ts + 253 An error occurred while saving settings. src/app/components/manage/settings/settings.component.ts - 242 + 263 Use system language src/app/components/manage/settings/settings.component.ts - 250 + 271 Use date format of display language src/app/components/manage/settings/settings.component.ts - 257 + 278 @@ -2801,7 +2822,7 @@ )"/> src/app/components/manage/settings/settings.component.ts - 277,279 + 298,300 diff --git a/src-ui/src/app/components/common/toasts/toasts.component.html b/src-ui/src/app/components/common/toasts/toasts.component.html index b79208ebf..03715a440 100644 --- a/src-ui/src/app/components/common/toasts/toasts.component.html +++ b/src-ui/src/app/components/common/toasts/toasts.component.html @@ -4,5 +4,5 @@ [class]="toast.classname" (hidden)="toastService.closeToast(toast)">

{{toast.content}}

-

+

diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html index 7e52db59e..002cc4eed 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.html +++ b/src-ui/src/app/components/manage/settings/settings.component.html @@ -22,7 +22,7 @@ - You need to reload the page after applying a new language. + You need to reload the page after applying a new language.
diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts index d9877d281..22ecfe9bb 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.ts +++ b/src-ui/src/app/components/manage/settings/settings.component.ts @@ -14,7 +14,7 @@ import { LanguageOption, SettingsService, } from 'src/app/services/settings.service' -import { ToastService } from 'src/app/services/toast.service' +import { Toast, ToastService } from 'src/app/services/toast.service' import { dirtyCheck, DirtyComponent } from '@ngneat/dirty-check-forms' import { Observable, Subscription, BehaviorSubject, first } from 'rxjs' import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings' @@ -61,6 +61,13 @@ export class SettingsComponent implements OnInit, OnDestroy, DirtyComponent { ) } + get displayLanguageIsDirty(): boolean { + return ( + this.settingsForm.get('displayLanguage').value != + this.store?.getValue()['displayLanguage'] + ) + } + constructor( public savedViewService: SavedViewService, private documentListViewService: DocumentListViewService, @@ -170,6 +177,7 @@ export class SettingsComponent implements OnInit, OnDestroy, DirtyComponent { } private saveLocalSettings() { + const reloadRequired = this.displayLanguageIsDirty // just this one, for now this.settings.set( SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE, this.settingsForm.value.bulkEditApplyOnClose @@ -235,7 +243,20 @@ export class SettingsComponent implements OnInit, OnDestroy, DirtyComponent { this.store.next(this.settingsForm.value) this.documentListViewService.updatePageSize() this.settings.updateAppearanceSettings() - this.toastService.showInfo($localize`Settings saved successfully.`) + let savedToast: Toast = { + title: $localize`Settings saved`, + content: $localize`Settings were saved successfully.`, + delay: 500000, + } + if (reloadRequired) { + ;(savedToast.content = $localize`Settings were saved successfully. Reload is required to apply some changes.`), + (savedToast.actionName = $localize`Reload now`) + savedToast.action = () => { + location.reload() + } + } + + this.toastService.show(savedToast) }, error: (error) => { this.toastService.showError( diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss index 4b78e9d21..e0934b84c 100644 --- a/src-ui/src/styles.scss +++ b/src-ui/src/styles.scss @@ -84,6 +84,10 @@ svg.logo { } } +.text-primary { + color: var(--bs-primary) !important; +} + .btn-outline-primary { border-color: var(--bs-primary) !important; color: var(--bs-primary) !important; diff --git a/src-ui/src/theme.scss b/src-ui/src/theme.scss index 732ac47d9..bf9be6662 100644 --- a/src-ui/src/theme.scss +++ b/src-ui/src/theme.scss @@ -186,7 +186,8 @@ $form-check-radio-checked-bg-image-dark: url("data:image/svg+xml, MailMessage: email_msg = email.message.EmailMessage() # TODO: This does NOT set the UID @@ -175,6 +184,8 @@ def create_message( imap_msg.seen = seen imap_msg.flagged = flagged + if processed: + imap_msg._raw_flag_data.append(f"+FLAGS (processed)".encode()) return imap_msg @@ -189,6 +200,13 @@ def fake_magic_from_buffer(buffer, mime=False): return "Some verbose file description" +def parse_raw_tags_omit_cache(m: MailMessage) -> List[str]: + raw_result: list[bytes] = [] + for rf in m._raw_flag_data: + raw_result.extend(imaplib.ParseFlags(rf)) + return [f.decode().strip() for f in raw_result] + + @mock.patch("paperless_mail.mail.magic.from_buffer", fake_magic_from_buffer) class TestMail(DirectoriesMixin, TestCase): def setUp(self): @@ -217,6 +235,7 @@ class TestMail(DirectoriesMixin, TestCase): body="cables", seen=True, flagged=False, + processed=False, ), ) self.bogus_mailbox.messages.append( @@ -225,6 +244,7 @@ class TestMail(DirectoriesMixin, TestCase): body="from my favorite electronic store", seen=False, flagged=True, + processed=True, ), ) self.bogus_mailbox.messages.append( @@ -571,6 +591,29 @@ class TestMail(DirectoriesMixin, TestCase): self.assertEqual(len(self.bogus_mailbox.messages), 2) self.assertEqual(len(self.bogus_mailbox.messages_spam), 1) + def test_handle_mail_account_tag(self): + account = MailAccount.objects.create( + name="test", + imap_server="", + username="admin", + password="secret", + ) + + _ = MailRule.objects.create( + name="testrule", + account=account, + action=MailRule.MailAction.TAG, + action_parameter="processed", + ) + + self.assertEqual(len(self.bogus_mailbox.messages), 3) + self.assertEqual(self.async_task.call_count, 0) + self.assertEqual(len(self.bogus_mailbox.fetch("UNKEYWORD processed", False)), 2) + self.mail_account_handler.handle_mail_account(account) + self.assertEqual(self.async_task.call_count, 2) + self.assertEqual(len(self.bogus_mailbox.fetch("UNKEYWORD processed", False)), 0) + self.assertEqual(len(self.bogus_mailbox.messages), 3) + def test_error_login(self): account = MailAccount.objects.create( name="test", From c54c252271af3cade3b850b4b63d9511e205b12a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Thu, 26 May 2022 12:42:29 +0200 Subject: [PATCH 117/291] Update docs. --- docs/usage_overview.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/usage_overview.rst b/docs/usage_overview.rst index d7cfb8250..a321afb93 100644 --- a/docs/usage_overview.rst +++ b/docs/usage_overview.rst @@ -161,6 +161,9 @@ These are as follows: will not consume flagged mails. * **Move to folder:** Moves consumed mails out of the way so that paperless wont consume them again. +* **Add custom Tag:** Adds a custom tag to mails with consumed documents (the IMAP + standard calls these "keywords"). Paperless will not consume mails already tagged. + Not all mail servers support this feature! .. caution:: From d91e09b0f52c4d8cec51db6465d9e0004412b4ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Thu, 26 May 2022 17:40:11 +0200 Subject: [PATCH 118/291] Revert accidentally included changes. --- docs/changelog.md | 186 +++++++++++++++++++++++----------------------- 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index 319592b5d..9ba2f9aa0 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -17,7 +17,7 @@ ### Bug Fixes - Feature / fix saved view \& sort field query params [\@shamoon](https://github.com/shamoon) ([\#881](https://github.com/paperless-ngx/paperless-ngx/pull/881)) -- Mobile friendlier manage pages [\@shamoon](https://github.com/shamoon) ([\#873](https://github.com/paperless-ngx/paperless-ngx/pull/873)) +- mobile friendlier manage pages [\@shamoon](https://github.com/shamoon) ([\#873](https://github.com/paperless-ngx/paperless-ngx/pull/873)) - Add timeout to healthcheck [\@shamoon](https://github.com/shamoon) ([\#880](https://github.com/paperless-ngx/paperless-ngx/pull/880)) - Always accept yyyy-mm-dd date inputs [\@shamoon](https://github.com/shamoon) ([\#864](https://github.com/paperless-ngx/paperless-ngx/pull/864)) - Fix local Docker image building [\@stumpylog](https://github.com/stumpylog) ([\#849](https://github.com/paperless-ngx/paperless-ngx/pull/849)) @@ -70,137 +70,137 @@ ## paperless-ngx 1.7.0 -### Breaking Changes +Breaking Changes - `PAPERLESS_URL` is now required when using a reverse proxy. See [\#674](https://github.com/paperless-ngx/paperless-ngx/pull/674). -### Features +Features - Allow setting more than one tag in mail rules - [\@jonasc](https://github.com/jonasc) ([\#270](https://github.com/paperless-ngx/paperless-ngx/pull/270)) -- Global drag\'n\'drop [\@shamoon](https://github.com/shamoon) - ([\#283](https://github.com/paperless-ngx/paperless-ngx/pull/283)) + [\@jonasc](https://github.com/jonasc) (\#270) +- global drag\'n\'drop [\@shamoon](https://github.com/shamoon) + (\#283). - Fix: download buttons should disable while waiting - [\@shamoon](https://github.com/shamoon) ([\#630](https://github.com/paperless-ngx/paperless-ngx/pull/630)) -- Update checker [\@shamoon](https://github.com/shamoon) ([\#591](https://github.com/paperless-ngx/paperless-ngx/pull/591)) + [\@shamoon](https://github.com/shamoon) (\#630). +- Update checker [\@shamoon](https://github.com/shamoon) (\#591). - Show prompt on password-protected pdfs - [\@shamoon](https://github.com/shamoon) ([\#564](https://github.com/paperless-ngx/paperless-ngx/pull/564)) + [\@shamoon](https://github.com/shamoon) (\#564). - Filtering query params aka browser navigation for filtering - [\@shamoon](https://github.com/shamoon) ([\#540](https://github.com/paperless-ngx/paperless-ngx/pull/540)) + [\@shamoon](https://github.com/shamoon) (\#540). - Clickable tags in dashboard widgets - [\@shamoon](https://github.com/shamoon) ([\#515](https://github.com/paperless-ngx/paperless-ngx/pull/515)) + [\@shamoon](https://github.com/shamoon) (\#515). - Add bottom pagination [\@shamoon](https://github.com/shamoon) - ([\#372](https://github.com/paperless-ngx/paperless-ngx/pull/372)) + (\#372). - Feature barcode splitter [\@gador](https://github.com/gador) - ([\#532](https://github.com/paperless-ngx/paperless-ngx/pull/532)) -- App loading screen [\@shamoon](https://github.com/shamoon) ([\#298](https://github.com/paperless-ngx/paperless-ngx/pull/298)) + (\#532). +- App loading screen [\@shamoon](https://github.com/shamoon) (\#298). - Use progress bar for delayed buttons - [\@shamoon](https://github.com/shamoon) ([\#415](https://github.com/paperless-ngx/paperless-ngx/pull/415)) + [\@shamoon](https://github.com/shamoon) (\#415). - Add minimum length for documents text filter - [\@shamoon](https://github.com/shamoon) ([\#401](https://github.com/paperless-ngx/paperless-ngx/pull/401)) + [\@shamoon](https://github.com/shamoon) (\#401). - Added nav buttons in the document detail view - [\@GruberViktor](https://github.com/gruberviktor) ([\#273](https://github.com/paperless-ngx/paperless-ngx/pull/273)) + [\@GruberViktor](https://github.com/gruberviktor) (\#273). - Improve date keyboard input [\@shamoon](https://github.com/shamoon) - ([\#253](https://github.com/paperless-ngx/paperless-ngx/pull/253)) -- Color theming [\@shamoon](https://github.com/shamoon) ([\#243](https://github.com/paperless-ngx/paperless-ngx/pull/243)) + (\#253). +- Color theming [\@shamoon](https://github.com/shamoon) (\#243). - Parse dates when entered without separators - [\@GruberViktor](https://github.com/gruberviktor) ([\#250](https://github.com/paperless-ngx/paperless-ngx/pull/250)) + [\@GruberViktor](https://github.com/gruberviktor) (\#250). -### Bug Fixes +Bug Fixes -- Add \"localhost\" to ALLOWED_HOSTS - [\@gador](https://github.com/gador) ([\#700](https://github.com/paperless-ngx/paperless-ngx/pull/700)) -- Fix: scanners table [\@qcasey](https://github.com/qcasey) ([\#690](https://github.com/paperless-ngx/paperless-ngx/pull/690)) +- add \"localhost\" to ALLOWED_HOSTS + [\@gador](https://github.com/gador) (\#700). +- Fix: scanners table [\@qcasey](https://github.com/qcasey) (\#690). - Adds wait for file before consuming - [\@stumpylog](https://github.com/stumpylog) ([\#483](https://github.com/paperless-ngx/paperless-ngx/pull/483)) + [\@stumpylog](https://github.com/stumpylog) (\#483). - Fix: frontend document editing erases time data - [\@shamoon](https://github.com/shamoon) ([\#654](https://github.com/paperless-ngx/paperless-ngx/pull/654)) + [\@shamoon](https://github.com/shamoon) (\#654). - Increase length of SavedViewFilterRule - [\@stumpylog](https://github.com/stumpylog) ([\#612](https://github.com/paperless-ngx/paperless-ngx/pull/612)) + [\@stumpylog](https://github.com/stumpylog) (\#612). - Fixes attachment filename matching during mail fetching - [\@stumpylog](https://github.com/stumpylog) ([\#680](https://github.com/paperless-ngx/paperless-ngx/pull/680)) + [\@stumpylog](https://github.com/stumpylog) (\#680). - Add `PAPERLESS_URL` env variable & CSRF var - [\@shamoon](https://github.com/shamoon) ([\#674](https://github.com/paperless-ngx/paperless-ngx/discussions/674)) + [\@shamoon](https://github.com/shamoon) (\#674). - Fix: download buttons should disable while waiting - [\@shamoon](https://github.com/shamoon) ([\#630](https://github.com/paperless-ngx/paperless-ngx/pull/630)) + [\@shamoon](https://github.com/shamoon) (\#630). - Fixes downloaded filename, add more consumer ignore settings - [\@stumpylog](https://github.com/stumpylog) ([\#599](https://github.com/paperless-ngx/paperless-ngx/pull/599)) + [\@stumpylog](https://github.com/stumpylog) (\#599). - FIX BUG: case-sensitive matching was not possible - [\@danielBreitlauch](https://github.com/danielbreitlauch) ([\#594](https://github.com/paperless-ngx/paperless-ngx/pull/594)) -- Uses shutil.move instead of rename - [\@gador](https://github.com/gador) ([\#617](https://github.com/paperless-ngx/paperless-ngx/pull/617)) + [\@danielBreitlauch](https://github.com/danielbreitlauch) (\#594). +- uses shutil.move instead of rename + [\@gador](https://github.com/gador) (\#617). - Fix npm deps 01.02.22 2 [\@shamoon](https://github.com/shamoon) - ([\#610](https://github.com/paperless-ngx/paperless-ngx/discussions/610)) + (\#610). - Fix npm dependencies 01.02.22 - [\@shamoon](https://github.com/shamoon) ([\#600](https://github.com/paperless-ngx/paperless-ngx/pull/600)) -- Fix issue 416: implement `PAPERLESS_OCR_MAX_IMAGE_PIXELS` - [\@hacker-h](https://github.com/hacker-h) ([\#441](https://github.com/paperless-ngx/paperless-ngx/pull/441)) -- Fix: exclude cypress from build in Dockerfile - [\@FrankStrieter](https://github.com/FrankStrieter) ([\#526](https://github.com/paperless-ngx/paperless-ngx/pull/526)) + [\@shamoon](https://github.com/shamoon) (\#600). +- fix issue 416: implement PAPERLESS_OCR_MAX_IMAGE_PIXELS + [\@hacker-h](https://github.com/hacker-h) (\#441). +- fix: exclude cypress from build in Dockerfile + [\@FrankStrieter](https://github.com/FrankStrieter) (\#526). - Corrections to pass pre-commit hooks - [\@schnuffle](https://github.com/schnuffle) ([\#454](https://github.com/paperless-ngx/paperless-ngx/pull/454)) + [\@schnuffle](https://github.com/schnuffle) (\#454). - Fix 311 unable to click checkboxes in document list - [\@shamoon](https://github.com/shamoon) ([\#313](https://github.com/paperless-ngx/paperless-ngx/pull/313)) + [\@shamoon](https://github.com/shamoon) (\#313). - Fix imap tools bug [\@stumpylog](https://github.com/stumpylog) - ([\#393](https://github.com/paperless-ngx/paperless-ngx/pull/393)) + (\#393). - Fix filterable dropdown buttons arent translated - [\@shamoon](https://github.com/shamoon) ([\#366](https://github.com/paperless-ngx/paperless-ngx/pull/366)) + [\@shamoon](https://github.com/shamoon) (\#366). - Fix 224: \"Auto-detected date is day before receipt date\" - [\@a17t](https://github.com/a17t) ([\#246](https://github.com/paperless-ngx/paperless-ngx/pull/246)) + [\@a17t](https://github.com/a17t) (\#246). - Fix minor sphinx errors [\@shamoon](https://github.com/shamoon) - ([\#322](https://github.com/paperless-ngx/paperless-ngx/pull/322)) + (\#322). - Fix page links hidden [\@shamoon](https://github.com/shamoon) - ([\#314](https://github.com/paperless-ngx/paperless-ngx/pull/314)) + (\#314). - Fix: Include excluded items in dropdown count - [\@shamoon](https://github.com/shamoon) ([\#263](https://github.com/paperless-ngx/paperless-ngx/pull/263)) + [\@shamoon](https://github.com/shamoon) (\#263). -### Translation +Translation - [\@miku323](https://github.com/miku323) contributed to Slovenian - translation + translation. - [\@FaintGhost](https://github.com/FaintGhost) contributed to Chinese - Simplified translation + Simplified translation. - [\@DarkoBG79](https://github.com/DarkoBG79) contributed to Serbian - translation + translation. - [Kemal Secer](https://crowdin.com/profile/kemal.secer) contributed - to Turkish translation + to Turkish translation. - [\@Prominence](https://github.com/Prominence) contributed to - Belarusian translation + Belarusian translation. -### Documentation +Documentation -- Fix: scanners table [\@qcasey](https://github.com/qcasey) ([\#690](https://github.com/paperless-ngx/paperless-ngx/pull/690)) -- Add `PAPERLESS_URL` env variable & CSRF var - [\@shamoon](https://github.com/shamoon) ([\#674](https://github.com/paperless-ngx/paperless-ngx/pull/674)) +- Fix: scanners table [\@qcasey](https://github.com/qcasey) (\#690). +- Add [PAPERLESS\_URL]{.title-ref} env variable & CSRF var + [\@shamoon](https://github.com/shamoon) (\#674). - Fixes downloaded filename, add more consumer ignore settings - [\@stumpylog](https://github.com/stumpylog) ([\#599](https://github.com/paperless-ngx/paperless-ngx/pull/599)) -- Fix issue 416: implement `PAPERLESS_OCR_MAX_IMAGE_PIXELS` - [\@hacker-h](https://github.com/hacker-h) ([\#441](https://github.com/paperless-ngx/paperless-ngx/pull/441)) + [\@stumpylog](https://github.com/stumpylog) (\#599). +- fix issue 416: implement `PAPERLESS_OCR_MAX_IMAGE_PIXELS` + [\@hacker-h](https://github.com/hacker-h) (\#441). - Fix minor sphinx errors [\@shamoon](https://github.com/shamoon) - ([\#322](https://github.com/paperless-ngx/paperless-ngx/pull/322)) + (\#322). -### Maintenance +Maintenance - Add `PAPERLESS_URL` env variable & CSRF var - [\@shamoon](https://github.com/shamoon) ([\#674](https://github.com/paperless-ngx/paperless-ngx/pull/674)) + [\@shamoon](https://github.com/shamoon) (\#674). - Chore: Implement release-drafter action for Changelogs - [\@qcasey](https://github.com/qcasey) ([\#669](https://github.com/paperless-ngx/paperless-ngx/pull/669)) -- Chore: Add CODEOWNERS [\@qcasey](https://github.com/qcasey) ([\#667](https://github.com/paperless-ngx/paperless-ngx/pull/667)) + [\@qcasey](https://github.com/qcasey) (\#669). +- Chore: Add CODEOWNERS [\@qcasey](https://github.com/qcasey) (\#667). - Support docker-compose v2 in install - [\@stumpylog](https://github.com/stumpylog) ([\#611](https://github.com/paperless-ngx/paperless-ngx/pull/611)) + [\@stumpylog](https://github.com/stumpylog) (\#611). - Add Belarusian localization [\@shamoon](https://github.com/shamoon) - ([\#588](https://github.com/paperless-ngx/paperless-ngx/pull/588)) + (\#588). - Add Turkish localization [\@shamoon](https://github.com/shamoon) - ([\#536](https://github.com/paperless-ngx/paperless-ngx/pull/536)) + (\#536). - Add Serbian localization [\@shamoon](https://github.com/shamoon) - ([\#504](https://github.com/paperless-ngx/paperless-ngx/pull/504)) + (\#504). - Create PULL_REQUEST_TEMPLATE.md - [\@shamoon](https://github.com/shamoon) ([\#304](https://github.com/paperless-ngx/paperless-ngx/pull/304)) + [\@shamoon](https://github.com/shamoon) (\#304). - Add Chinese localization [\@shamoon](https://github.com/shamoon) - ([\#247](https://github.com/paperless-ngx/paperless-ngx/pull/247)) + (\#247). - Add Slovenian language for frontend - [\@shamoon](https://github.com/shamoon) ([\#315](https://github.com/paperless-ngx/paperless-ngx/pull/315)) + [\@shamoon](https://github.com/shamoon) (\#315). ## paperless-ngx 1.6.0 @@ -216,46 +216,46 @@ include: - Updated Python and Angular dependencies. - Dropped support for Python 3.7. - Dropped support for Ansible playbooks (thanks - [\@slankes](https://github.com/slankes) [\#109](https://github.com/paperless-ngx/paperless-ngx/pull/109)). If someone would - like to continue supporting them, please see our [ansible + [\@slankes](https://github.com/slankes) \#109). If someone would + like to continue supporting them, please see the [ansible repo](https://github.com/paperless-ngx/paperless-ngx-ansible). - Python code is now required to use Black formatting (thanks - [\@kpj](https://github.com/kpj) [\#168](https://github.com/paperless-ngx/paperless-ngx/pull/168)). + [\@kpj](https://github.com/kpj) \#168). - [\@tribut](https://github.com/tribut) added support for a custom SSO - logout redirect ([jonaswinkler\#1258](https://github.com/jonaswinkler/paperless-ng/pull/1258)). See + logout redirect (jonaswinkler\#1258). See `PAPERLESS_LOGOUT_REDIRECT_URL`. - [\@shamoon](https://github.com/shamoon) added a loading indicator - when document list is reloading ([jonaswinkler\#1297](https://github.com/jonaswinkler/paperless-ng/pull/1297)). + when document list is reloading (jonaswinkler\#1297). - [\@shamoon](https://github.com/shamoon) improved the PDF viewer on - mobile ([\#2](https://github.com/paperless-ngx/paperless-ngx/pull/2)). + mobile (\#2). - [\@shamoon](https://github.com/shamoon) added \'any\' / \'all\' and - \'not\' filtering with tags ([\#10](https://github.com/paperless-ngx/paperless-ngx/pull/10)). + \'not\' filtering with tags (\#10). - [\@shamoon](https://github.com/shamoon) added warnings for unsaved - changes, with smart edit buttons ([\#13](https://github.com/paperless-ngx/paperless-ngx/pull/13)). + changes, with smart edit buttons (\#13). - [\@benjaminfrank](https://github.com/benjaminfrank) enabled a - non-root access to port 80 via systemd ([\#18](https://github.com/paperless-ngx/paperless-ngx/pull/18)). + non-root access to port 80 via systemd (\#18). - [\@tribut](https://github.com/tribut) added simple \"delete to - trash\" functionality ([\#24](https://github.com/paperless-ngx/paperless-ngx/pull/24)). See `PAPERLESS_TRASH_DIR`. + trash\" functionality (\#24). See `PAPERLESS_TRASH_DIR`. - [\@amenk](https://github.com/amenk) fixed the search box overlay - menu on mobile ([\#32](https://github.com/paperless-ngx/paperless-ngx/pull/32)). + menu on mobile (\#32). - [\@dblitt](https://github.com/dblitt) updated the login form to not - auto-capitalize usernames ([\#36](https://github.com/paperless-ngx/paperless-ngx/pull/36)). + auto-capitalize usernames (\#36). - [\@evilsidekick293](https://github.com/evilsidekick293) made the - worker timeout configurable ([\#37](https://github.com/paperless-ngx/paperless-ngx/pull/37)). See `PAPERLESS_WORKER_TIMEOUT`. + worker timeout configurable (\#37). See `PAPERLESS_WORKER_TIMEOUT`. - [\@Nicarim](https://github.com/Nicarim) fixed downloads of UTF-8 - formatted documents in Firefox ([\#56](https://github.com/paperless-ngx/paperless-ngx/pull/56)). + formatted documents in Firefox (\#56). - [\@mweimerskirch](https://github.com/mweimerskirch) sorted the - language dropdown by locale ([\#78](https://github.com/paperless-ngx/paperless-ngx/issues/78)). + language dropdown by locale (\#78). - [\@mweimerskirch](https://github.com/mweimerskirch) enabled the - Czech ([\#83](https://github.com/paperless-ngx/paperless-ngx/pull/83)) and Danish ([\#84](https://github.com/paperless-ngx/paperless-ngx/pull/84)) translations. + Czech (\#83) and Danish (\#84) translations. - [\@cschmatzler](https://github.com/cschmatzler) enabled specifying - the webserver port ([\#124](https://github.com/paperless-ngx/paperless-ngx/pull/124)). See `PAPERLESS_PORT`. + the webserver port (\#124). See `PAPERLESS_PORT`. - [\@muellermartin](https://github.com/muellermartin) fixed an error - when uploading transparent PNGs ([\#133](https://github.com/paperless-ngx/paperless-ngx/pull/133)). + when uploading transparent PNGs (\#133). - [\@shamoon](https://github.com/shamoon) created a slick new logo - ([\#165](https://github.com/paperless-ngx/paperless-ngx/pull/165)). + (\#165). - [\@tim-vogel](https://github.com/tim-vogel) fixed exports missing - groups ([\#193](https://github.com/paperless-ngx/paperless-ngx/pull/193)). + groups (\#193). Known issues: From 60ddd4a5296ed6d7f7b3fce03170337f996fee06 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 23 May 2022 00:24:52 -0700 Subject: [PATCH 119/291] PaperlessTask and consumption_tasks endpoint --- .../migrations/1021_paperlesstask.py | 66 +++++++++++++++++++ src/documents/models.py | 16 +++++ src/documents/serialisers.py | 8 +++ src/documents/signals/handlers.py | 21 ++++++ src/documents/tasks.py | 14 ++++ src/documents/views.py | 49 ++++++++++++++ src/paperless/urls.py | 6 ++ 7 files changed, 180 insertions(+) create mode 100644 src/documents/migrations/1021_paperlesstask.py diff --git a/src/documents/migrations/1021_paperlesstask.py b/src/documents/migrations/1021_paperlesstask.py new file mode 100644 index 000000000..f827a892a --- /dev/null +++ b/src/documents/migrations/1021_paperlesstask.py @@ -0,0 +1,66 @@ +# Generated by Django 4.0.4 on 2022-05-23 07:14 + +from django.db import migrations, models +import django.db.models.deletion + + +def init_paperless_tasks(apps, schema_editor): + PaperlessTask = apps.get_model("documents", "PaperlessTask") + Task = apps.get_model("django_q", "Task") + + for task in Task.objects.all(): + if not hasattr(task, "paperlesstask"): + paperlesstask = PaperlessTask.objects.create( + task=task, + q_task_id=task.id, + name=task.name, + created=task.started, + acknowledged=False, + ) + task.paperlesstask = paperlesstask + task.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ("django_q", "0014_schedule_cluster"), + ("documents", "1020_merge_20220518_1839"), + ] + + operations = [ + migrations.CreateModel( + name="PaperlessTask", + fields=[ + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("q_task_id", models.CharField(max_length=128)), + ("name", models.CharField(max_length=256)), + ( + "created", + models.DateTimeField( + auto_now=True, db_index=True, verbose_name="created" + ), + ), + ("acknowledged", models.BooleanField(default=False)), + ( + "task", + models.OneToOneField( + blank=True, + null=True, + on_delete=django.db.models.deletion.CASCADE, + related_name="task", + to="django_q.task", + ), + ), + ], + ), + migrations.RunPython(init_paperless_tasks, migrations.RunPython.noop), + ] diff --git a/src/documents/models.py b/src/documents/models.py index b85c56037..f7ce9ae95 100644 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -11,6 +11,7 @@ from django.contrib.auth.models import User from django.db import models from django.utils import timezone from django.utils.translation import gettext_lazy as _ +from django_q.tasks import Task from documents.parsers import get_default_file_extension @@ -500,3 +501,18 @@ class UiSettings(models.Model): def __str__(self): return self.user.username + + +class PaperlessTask(models.Model): + + q_task_id = models.CharField(max_length=128) + name = models.CharField(max_length=256) + created = models.DateTimeField(_("created"), auto_now=True, db_index=True) + task = models.OneToOneField( + Task, + on_delete=models.CASCADE, + related_name="task", + null=True, + blank=True, + ) + acknowledged = models.BooleanField(default=False) diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 8459cd037..e89c5d686 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -595,3 +595,11 @@ class UiSettingsViewSerializer(serializers.ModelSerializer): defaults={"settings": validated_data.get("settings", None)}, ) return ui_settings + + +class ConsupmtionTasksViewSerializer(serializers.Serializer): + + type = serializers.ChoiceField( + choices=["all", "incomplete", "complete", "failed"], + default="all", + ) diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py index 34710af78..2e763cee0 100644 --- a/src/documents/signals/handlers.py +++ b/src/documents/signals/handlers.py @@ -13,6 +13,9 @@ from django.db.models import Q from django.dispatch import receiver from django.utils import termcolors from django.utils import timezone +from django_q.signals import post_save +from django_q.signals import pre_enqueue +from django_q.tasks import Task from filelock import FileLock from .. import matching @@ -21,6 +24,7 @@ from ..file_handling import delete_empty_directories from ..file_handling import generate_unique_filename from ..models import Document from ..models import MatchingModel +from ..models import PaperlessTask from ..models import Tag @@ -499,3 +503,20 @@ def add_to_index(sender, document, **kwargs): from documents import index index.add_or_update_document(document) + + +@receiver(pre_enqueue) +def init_paperless_task(sender, task, **kwargs): + if task["func"] == "documents.tasks.consume_file": + paperless_task = PaperlessTask.objects.get_or_create(q_task_id=task["id"]) + paperless_task.name = task["name"] + paperless_task.created = task["started"] + + +@receiver(post_save, sender=Task) +def update_paperless_task(sender, instance, **kwargs): + logger.debug(sender, instance) + papeless_task = PaperlessTask.objects.find(q_task_id=instance.id) + if papeless_task: + papeless_task.task = instance + papeless_task.save() diff --git a/src/documents/tasks.py b/src/documents/tasks.py index 208f74f1d..241ec9766 100644 --- a/src/documents/tasks.py +++ b/src/documents/tasks.py @@ -10,6 +10,7 @@ from asgiref.sync import async_to_sync from channels.layers import get_channel_layer from django.conf import settings from django.db.models.signals import post_save +from django_q.tasks import Task from documents import index from documents import sanity_checker from documents.classifier import DocumentClassifier @@ -359,3 +360,16 @@ def bulk_update_documents(document_ids): with AsyncWriter(ix) as writer: for doc in documents: index.update_document(writer, doc) + + +def create_paperless_task(sender, instance, created, **kwargs): + if created: + Task.objects.create(thing=instance) + + +post_save.connect( + create_paperless_task, + sender=Task, + weak=False, + dispatch_uid="models.create_paperless_task", +) diff --git a/src/documents/views.py b/src/documents/views.py index cdd38180b..d7f8bf10b 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -64,12 +64,14 @@ from .matching import match_tags from .models import Correspondent from .models import Document from .models import DocumentType +from .models import PaperlessTask from .models import SavedView from .models import StoragePath from .models import Tag from .parsers import get_parser_class_for_mime_type from .serialisers import BulkDownloadSerializer from .serialisers import BulkEditSerializer +from .serialisers import ConsupmtionTasksViewSerializer from .serialisers import CorrespondentSerializer from .serialisers import DocumentListSerializer from .serialisers import DocumentSerializer @@ -795,3 +797,50 @@ class UiSettingsView(GenericAPIView): "success": True, }, ) + + +class ConsupmtionTasksView(GenericAPIView): + + permission_classes = (IsAuthenticated,) + serializer_class = ConsupmtionTasksViewSerializer + + def get(self, request, format=None): + serializer = self.get_serializer(data=request.data) + serializer.is_valid(raise_exception=True) + + consumption_tasks = ( + PaperlessTask.objects.filter( + acknowledged=False, + ) + .order_by("task__started") + .reverse() + ) + incomplete_tasks = consumption_tasks.filter(task=None).values( + "id", + "q_task_id", + "name", + "created", + "acknowledged", + ) + failed_tasks = consumption_tasks.filter(task__success=0).values( + "id", + "q_task_id", + "name", + "created", + "acknowledged", + ) + completed_tasks = consumption_tasks.filter(task__success=1).values( + "id", + "q_task_id", + "name", + "created", + "acknowledged", + ) + return Response( + { + "total": consumption_tasks.count(), + "incomplete": incomplete_tasks, + "failed": failed_tasks, + "completed": completed_tasks, + }, + ) diff --git a/src/paperless/urls.py b/src/paperless/urls.py index 003d79f2d..6cea1b9e4 100644 --- a/src/paperless/urls.py +++ b/src/paperless/urls.py @@ -9,6 +9,7 @@ from django.views.decorators.csrf import csrf_exempt from django.views.generic import RedirectView from documents.views import BulkDownloadView from documents.views import BulkEditView +from documents.views import ConsupmtionTasksView from documents.views import CorrespondentViewSet from documents.views import DocumentTypeViewSet from documents.views import IndexView @@ -86,6 +87,11 @@ urlpatterns = [ UiSettingsView.as_view(), name="ui_settings", ), + re_path( + r"^consumption_tasks/", + ConsupmtionTasksView.as_view(), + name="consumption_tasks", + ), path("token/", views.obtain_auth_token), ] + api_router.urls, From 0ae6da20a9d5de1cfed7460fe7bb47710c1f26ee Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 23 May 2022 01:21:06 -0700 Subject: [PATCH 120/291] Toggle functionality for tasks list --- .../manage/tasks/tasks.component.html | 83 +++++++++++++++++ .../manage/tasks/tasks.component.ts | 75 ++++++++++++++++ src-ui/src/app/services/tasks.service.ts | 89 +++++++++++++++++++ 3 files changed, 247 insertions(+) create mode 100644 src-ui/src/app/components/manage/tasks/tasks.component.html create mode 100644 src-ui/src/app/components/manage/tasks/tasks.component.ts create mode 100644 src-ui/src/app/services/tasks.service.ts diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.html b/src-ui/src/app/components/manage/tasks/tasks.component.html new file mode 100644 index 000000000..edbfa126a --- /dev/null +++ b/src-ui/src/app/components/manage/tasks/tasks.component.html @@ -0,0 +1,83 @@ + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+ 		NameCreatedActions
+
+ + +
+ 		{{ task.name }}{{ task.created | customDate:'medium' }} + +
+ + + +
diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.ts b/src-ui/src/app/components/manage/tasks/tasks.component.ts new file mode 100644 index 000000000..e0e7c3466 --- /dev/null +++ b/src-ui/src/app/components/manage/tasks/tasks.component.ts @@ -0,0 +1,75 @@ +import { Component, OnInit, OnDestroy } from '@angular/core' +import { takeUntil, Subject } from 'rxjs' +import { PaperlessTask } from 'src/app/data/paperless-task' +import { TasksService } from 'src/app/services/tasks.service' + +@Component({ + selector: 'app-tasks', + templateUrl: './tasks.component.html', + styleUrls: ['./tasks.component.scss'], +}) +export class TasksComponent implements OnInit, OnDestroy { + public activeTab: string + public selectedTasks: Set = new Set() + private unsubscribeNotifer = new Subject() + + get dismissButtonText(): string { + return this.selectedTasks.size > 0 + ? $localize`Dismiss selected` + : $localize`Dismiss all` + } + + constructor(public tasksService: TasksService) {} + + ngOnInit() { + this.tasksService.reload() + } + + ngOnDestroy() { + this.unsubscribeNotifer.next(true) + } + + dismissTask(task: PaperlessTask) { + throw new Error('Not implemented' + task) + } + + dismissMany() { + throw new Error('Not implemented') + } + + toggleSelected(task: PaperlessTask) { + this.selectedTasks.has(task.id) + ? this.selectedTasks.delete(task.id) + : this.selectedTasks.add(task.id) + } + + get currentTasks(): PaperlessTask[] { + let tasks: PaperlessTask[] + switch (this.activeTab) { + case 'incomplete': + tasks = this.tasksService.incomplete + break + case 'completed': + tasks = this.tasksService.completed + break + case 'failed': + tasks = this.tasksService.failed + break + default: + break + } + return tasks + } + + toggleAll(event: PointerEvent) { + if ((event.target as HTMLInputElement).checked) { + this.selectedTasks = new Set(this.currentTasks.map((t) => t.id)) + } else { + this.clearSelection() + } + } + + clearSelection() { + this.selectedTasks = new Set() + } +} diff --git a/src-ui/src/app/services/tasks.service.ts b/src-ui/src/app/services/tasks.service.ts new file mode 100644 index 000000000..3560122a9 --- /dev/null +++ b/src-ui/src/app/services/tasks.service.ts @@ -0,0 +1,89 @@ +import { HttpClient } from '@angular/common/http' +import { Injectable } from '@angular/core' +import { Observable } from 'rxjs' +import { first, map } from 'rxjs/operators' +import { PaperlessTask } from 'src/app/data/paperless-task' +import { environment } from 'src/environments/environment' + +interface TasksAPIResponse { + total: number + incomplete: Array + completed: Array + failed: Array +} + +@Injectable({ + providedIn: 'root', +}) +export class TasksService { + private baseUrl: string = environment.apiBaseUrl + + loading: boolean + + public total: number + + private incompleteTasks: PaperlessTask[] = [] + public get incomplete(): PaperlessTask[] { + return this.incompleteTasks + } + + private completedTasks: PaperlessTask[] = [] + public get completed(): PaperlessTask[] { + return this.completedTasks + } + + private failedTasks: PaperlessTask[] = [] + public get failed(): PaperlessTask[] { + return this.failedTasks + } + + constructor(private http: HttpClient) {} + + public reload() { + this.loading = true + + this.http + .get(`${this.baseUrl}consumption_tasks/`) + .pipe(first()) + .subscribe((r) => { + this.total = r.total + this.incompleteTasks = r.incomplete + this.completedTasks = r.completed + this.failedTasks = r.failed + this.loading = false + return true + }) + } + + // private savedViews: PaperlessSavedView[] = [] + + // get allViews() { + // return this.savedViews + // } + + // get sidebarViews() { + // return this.savedViews.filter((v) => v.show_in_sidebar) + // } + + // get dashboardViews() { + // return this.savedViews.filter((v) => v.show_on_dashboard) + // } + + // create(o: PaperlessSavedView) { + // return super.create(o).pipe(tap(() => this.reload())) + // } + + // update(o: PaperlessSavedView) { + // return super.update(o).pipe(tap(() => this.reload())) + // } + + // patchMany(objects: PaperlessSavedView[]): Observable { + // return combineLatest(objects.map((o) => super.patch(o))).pipe( + // tap(() => this.reload()) + // ) + // } + + // delete(o: PaperlessSavedView) { + // return super.delete(o).pipe(tap(() => this.reload())) + // } +} From 90cd6950b2e194ec57973b826304c23ed21e9e3a Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 23 May 2022 01:52:46 -0700 Subject: [PATCH 121/291] update post_save signal receiver --- src-ui/src/app/data/paperless-task.ts | 11 ++++++++ .../migrations/1021_paperlesstask.py | 10 ++++---- src/documents/models.py | 6 ++--- src/documents/signals/handlers.py | 25 +++++++++++-------- src/documents/tasks.py | 14 ----------- src/documents/views.py | 12 ++++----- 6 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 src-ui/src/app/data/paperless-task.ts diff --git a/src-ui/src/app/data/paperless-task.ts b/src-ui/src/app/data/paperless-task.ts new file mode 100644 index 000000000..cc864710c --- /dev/null +++ b/src-ui/src/app/data/paperless-task.ts @@ -0,0 +1,11 @@ +import { ObjectWithId } from './object-with-id' + +export interface PaperlessTask extends ObjectWithId { + acknowledged: boolean + + task_id: string + + name: string + + created: Date +} diff --git a/src/documents/migrations/1021_paperlesstask.py b/src/documents/migrations/1021_paperlesstask.py index f827a892a..2c9a0a885 100644 --- a/src/documents/migrations/1021_paperlesstask.py +++ b/src/documents/migrations/1021_paperlesstask.py @@ -11,8 +11,8 @@ def init_paperless_tasks(apps, schema_editor): for task in Task.objects.all(): if not hasattr(task, "paperlesstask"): paperlesstask = PaperlessTask.objects.create( - task=task, - q_task_id=task.id, + attempted_task=task, + task_id=task.id, name=task.name, created=task.started, acknowledged=False, @@ -41,7 +41,7 @@ class Migration(migrations.Migration): verbose_name="ID", ), ), - ("q_task_id", models.CharField(max_length=128)), + ("task_id", models.CharField(max_length=128)), ("name", models.CharField(max_length=256)), ( "created", @@ -51,12 +51,12 @@ class Migration(migrations.Migration): ), ("acknowledged", models.BooleanField(default=False)), ( - "task", + "attempted_task", models.OneToOneField( blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, - related_name="task", + related_name="attempted_task", to="django_q.task", ), ), diff --git a/src/documents/models.py b/src/documents/models.py index f7ce9ae95..63c1c6e33 100644 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -505,13 +505,13 @@ class UiSettings(models.Model): class PaperlessTask(models.Model): - q_task_id = models.CharField(max_length=128) + task_id = models.CharField(max_length=128) name = models.CharField(max_length=256) created = models.DateTimeField(_("created"), auto_now=True, db_index=True) - task = models.OneToOneField( + attempted_task = models.OneToOneField( Task, on_delete=models.CASCADE, - related_name="task", + related_name="attempted_task", null=True, blank=True, ) diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py index 2e763cee0..2ae78ab80 100644 --- a/src/documents/signals/handlers.py +++ b/src/documents/signals/handlers.py @@ -2,6 +2,7 @@ import logging import os import shutil +import django_q from django.conf import settings from django.contrib.admin.models import ADDITION from django.contrib.admin.models import LogEntry @@ -13,9 +14,6 @@ from django.db.models import Q from django.dispatch import receiver from django.utils import termcolors from django.utils import timezone -from django_q.signals import post_save -from django_q.signals import pre_enqueue -from django_q.tasks import Task from filelock import FileLock from .. import matching @@ -505,18 +503,23 @@ def add_to_index(sender, document, **kwargs): index.add_or_update_document(document) -@receiver(pre_enqueue) +@receiver(django_q.signals.pre_enqueue) def init_paperless_task(sender, task, **kwargs): if task["func"] == "documents.tasks.consume_file": - paperless_task = PaperlessTask.objects.get_or_create(q_task_id=task["id"]) + paperless_task, created = PaperlessTask.objects.get_or_create( + task_id=task["id"], + ) paperless_task.name = task["name"] paperless_task.created = task["started"] + paperless_task.save() -@receiver(post_save, sender=Task) +@receiver(models.signals.post_save, sender=django_q.tasks.Task) def update_paperless_task(sender, instance, **kwargs): - logger.debug(sender, instance) - papeless_task = PaperlessTask.objects.find(q_task_id=instance.id) - if papeless_task: - papeless_task.task = instance - papeless_task.save() + try: + if instance.func == "documents.tasks.consume_file": + paperless_task = PaperlessTask.objects.get(task_id=instance.id) + paperless_task.attempted_task = instance + paperless_task.save() + except PaperlessTask.DoesNotExist: + pass diff --git a/src/documents/tasks.py b/src/documents/tasks.py index 241ec9766..208f74f1d 100644 --- a/src/documents/tasks.py +++ b/src/documents/tasks.py @@ -10,7 +10,6 @@ from asgiref.sync import async_to_sync from channels.layers import get_channel_layer from django.conf import settings from django.db.models.signals import post_save -from django_q.tasks import Task from documents import index from documents import sanity_checker from documents.classifier import DocumentClassifier @@ -360,16 +359,3 @@ def bulk_update_documents(document_ids): with AsyncWriter(ix) as writer: for doc in documents: index.update_document(writer, doc) - - -def create_paperless_task(sender, instance, created, **kwargs): - if created: - Task.objects.create(thing=instance) - - -post_save.connect( - create_paperless_task, - sender=Task, - weak=False, - dispatch_uid="models.create_paperless_task", -) diff --git a/src/documents/views.py b/src/documents/views.py index d7f8bf10b..5514d8d6c 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -812,26 +812,26 @@ class ConsupmtionTasksView(GenericAPIView): PaperlessTask.objects.filter( acknowledged=False, ) - .order_by("task__started") + .order_by("attempted_task__started") .reverse() ) incomplete_tasks = consumption_tasks.filter(task=None).values( "id", - "q_task_id", + "task_id", "name", "created", "acknowledged", ) - failed_tasks = consumption_tasks.filter(task__success=0).values( + failed_tasks = consumption_tasks.filter(attempted_task__success=0).values( "id", - "q_task_id", + "task_id", "name", "created", "acknowledged", ) - completed_tasks = consumption_tasks.filter(task__success=1).values( + completed_tasks = consumption_tasks.filter(attempted_task__success=1).values( "id", - "q_task_id", + "task_id", "name", "created", "acknowledged", From 635fee08efcec0657ba11e030e0ff863cff9ce68 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 23 May 2022 10:45:14 -0700 Subject: [PATCH 122/291] acknowledge_tasks endpoint & basic UI Update tasks.service.ts --- .../manage/tasks/tasks.component.html | 2 +- .../manage/tasks/tasks.component.ts | 8 ++-- src-ui/src/app/services/tasks.service.ts | 44 +++++-------------- src/documents/serialisers.py | 29 +++++++++++- src/documents/views.py | 39 ++++++++++++---- src/paperless/urls.py | 14 ++++-- 6 files changed, 86 insertions(+), 50 deletions(-) diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.html b/src-ui/src/app/components/manage/tasks/tasks.component.html index edbfa126a..e0249865d 100644 --- a/src-ui/src/app/components/manage/tasks/tasks.component.html +++ b/src-ui/src/app/components/manage/tasks/tasks.component.html @@ -5,7 +5,7 @@  Clear selection -
- + @@ -62,21 +62,21 @@ diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.ts b/src-ui/src/app/components/manage/tasks/tasks.component.ts index b9d394acc..873325b7d 100644 --- a/src-ui/src/app/components/manage/tasks/tasks.component.ts +++ b/src-ui/src/app/components/manage/tasks/tasks.component.ts @@ -34,9 +34,10 @@ export class TasksComponent implements OnInit, OnDestroy { } dismissTasks(task: PaperlessTask = undefined) { - this.tasksService.dismissTasks( - task ? new Set([task.id]) : this.selectedTasks - ) + let tasks = task ? new Set([task.id]) : this.selectedTasks + if (this.selectedTasks.size == 0) + tasks = new Set(this.currentTasks.map((t) => t.id)) + this.tasksService.dismissTasks(tasks) } toggleSelected(task: PaperlessTask) { @@ -49,13 +50,13 @@ export class TasksComponent implements OnInit, OnDestroy { let tasks: PaperlessTask[] switch (this.activeTab) { case 'incomplete': - tasks = this.tasksService.incomplete + tasks = this.tasksService.incompleteFileTasks break case 'completed': - tasks = this.tasksService.completed + tasks = this.tasksService.completedFileTasks break case 'failed': - tasks = this.tasksService.failed + tasks = this.tasksService.failedFileTasks break default: break diff --git a/src-ui/src/app/data/paperless-task.ts b/src-ui/src/app/data/paperless-task.ts index cc864710c..f906f9ae2 100644 --- a/src-ui/src/app/data/paperless-task.ts +++ b/src-ui/src/app/data/paperless-task.ts @@ -1,6 +1,22 @@ import { ObjectWithId } from './object-with-id' +export enum PaperlessTaskType { + // just file tasks, for now + File = 'file', +} + +export enum PaperlessTaskStatus { + Incomplete = 'incomplete', + Complete = 'complete', + Failed = 'failed', + Unknown = 'unknown', +} + export interface PaperlessTask extends ObjectWithId { + type: PaperlessTaskType + + status: PaperlessTaskStatus + acknowledged: boolean task_id: string diff --git a/src-ui/src/app/services/tasks.service.ts b/src-ui/src/app/services/tasks.service.ts index 82722e0ab..f6faccaa6 100644 --- a/src-ui/src/app/services/tasks.service.ts +++ b/src-ui/src/app/services/tasks.service.ts @@ -1,16 +1,13 @@ import { HttpClient } from '@angular/common/http' import { Injectable } from '@angular/core' import { first, map } from 'rxjs/operators' -import { PaperlessTask } from 'src/app/data/paperless-task' +import { + PaperlessTask, + PaperlessTaskStatus, + PaperlessTaskType, +} from 'src/app/data/paperless-task' import { environment } from 'src/environments/environment' -interface TasksAPIResponse { - total: number - incomplete: Array - completed: Array - failed: Array -} - @Injectable({ providedIn: 'root', }) @@ -19,21 +16,26 @@ export class TasksService { loading: boolean - public total: number + private fileTasks: PaperlessTask[] = [] - private incompleteTasks: PaperlessTask[] = [] - public get incomplete(): PaperlessTask[] { - return this.incompleteTasks + public get total(): number { + return this.fileTasks?.length } - private completedTasks: PaperlessTask[] = [] - public get completed(): PaperlessTask[] { - return this.completedTasks + public get incompleteFileTasks(): PaperlessTask[] { + return this.fileTasks.filter( + (t) => t.status == PaperlessTaskStatus.Incomplete + ) } - private failedTasks: PaperlessTask[] = [] - public get failed(): PaperlessTask[] { - return this.failedTasks + public get completedFileTasks(): PaperlessTask[] { + return this.fileTasks.filter( + (t) => t.status == PaperlessTaskStatus.Complete + ) + } + + public get failedFileTasks(): PaperlessTask[] { + return this.fileTasks.filter((t) => t.status == PaperlessTaskStatus.Failed) } constructor(private http: HttpClient) {} @@ -42,13 +44,10 @@ export class TasksService { this.loading = true this.http - .get(`${this.baseUrl}tasks/`) + .get(`${this.baseUrl}tasks/`) .pipe(first()) .subscribe((r) => { - this.total = r.total - this.incompleteTasks = r.incomplete - this.completedTasks = r.completed - this.failedTasks = r.failed + this.fileTasks = r.filter((t) => t.type == PaperlessTaskType.File) // they're all File tasks, for now this.loading = false return true }) From 09f637a4cbbacc7ac6f4824712bf5a3d6d3599f3 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 23 May 2022 15:22:14 -0700 Subject: [PATCH 124/291] Better tasks api endpoint --- .../migrations/1021_paperlesstask.py | 2 +- src/documents/serialisers.py | 27 ++++++++-- src/documents/views.py | 54 ++++--------------- src/paperless/urls.py | 8 +-- 4 files changed, 35 insertions(+), 56 deletions(-) diff --git a/src/documents/migrations/1021_paperlesstask.py b/src/documents/migrations/1021_paperlesstask.py index 2c9a0a885..560fec11d 100644 --- a/src/documents/migrations/1021_paperlesstask.py +++ b/src/documents/migrations/1021_paperlesstask.py @@ -8,7 +8,7 @@ def init_paperless_tasks(apps, schema_editor): PaperlessTask = apps.get_model("documents", "PaperlessTask") Task = apps.get_model("django_q", "Task") - for task in Task.objects.all(): + for task in Task.objects.filter(func="documents.tasks.consume_file"): if not hasattr(task, "paperlesstask"): paperlesstask = PaperlessTask.objects.create( attempted_task=task, diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 40fe687cc..17d37ae2a 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -598,12 +598,29 @@ class UiSettingsViewSerializer(serializers.ModelSerializer): return ui_settings -class TasksViewSerializer(serializers.Serializer): +class TasksViewSerializer(serializers.ModelSerializer): + class Meta: + model = PaperlessTask + depth = 1 + fields = "__all__" - type = serializers.ChoiceField( - choices=["all", "incomplete", "complete", "failed"], - default="all", - ) + type = serializers.SerializerMethodField() + + def get_type(self, obj): + # just file tasks, for now + return "file" + + status = serializers.SerializerMethodField() + + def get_status(self, obj): + if obj.attempted_task is None: + return "incomplete" + elif obj.attempted_task.success: + return "complete" + elif not obj.attempted_task.success: + return "failed" + else: + return "unknown" class AcknowledgeTasksViewSerializer(serializers.Serializer): diff --git a/src/documents/views.py b/src/documents/views.py index 23a57c76d..e83a126b3 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -46,6 +46,7 @@ from rest_framework.response import Response from rest_framework.views import APIView from rest_framework.viewsets import GenericViewSet from rest_framework.viewsets import ModelViewSet +from rest_framework.viewsets import ReadOnlyModelViewSet from rest_framework.viewsets import ViewSet from .bulk_download import ArchiveOnlyStrategy @@ -800,51 +801,18 @@ class UiSettingsView(GenericAPIView): ) -class TasksView(GenericAPIView): +class TasksViewSet(ReadOnlyModelViewSet): permission_classes = (IsAuthenticated,) serializer_class = TasksViewSerializer - def get(self, request, format=None): - serializer = self.get_serializer(data=request.data) - serializer.is_valid(raise_exception=True) - - tasks = ( - PaperlessTask.objects.filter( - acknowledged=False, - ) - .order_by("attempted_task__started") - .reverse() - ) - incomplete_tasks = tasks.filter(attempted_task=None).values( - "id", - "task_id", - "name", - "created", - "acknowledged", - ) - failed_tasks = tasks.filter(attempted_task__success=0).values( - "id", - "task_id", - "name", - "created", - "acknowledged", - ) - completed_tasks = tasks.filter(attempted_task__success=1).values( - "id", - "task_id", - "name", - "created", - "acknowledged", - ) - return Response( - { - "total": tasks.count(), - "incomplete": incomplete_tasks, - "failed": failed_tasks, - "completed": completed_tasks, - }, + queryset = ( + PaperlessTask.objects.filter( + acknowledged=False, ) + .order_by("created") + .reverse() + ) class AcknowledgeTasksView(GenericAPIView): @@ -859,11 +827,9 @@ class AcknowledgeTasksView(GenericAPIView): tasks = serializer.validated_data.get("tasks") try: - logger.debug(tasks) result = PaperlessTask.objects.filter(id__in=tasks).update( acknowledged=True, ) return Response({"result": result}) - pass - except Exception as e: - return HttpResponseBadRequest(str(e)) + except Exception: + return HttpResponseBadRequest() diff --git a/src/paperless/urls.py b/src/paperless/urls.py index fbabd1e6e..46309e1e6 100644 --- a/src/paperless/urls.py +++ b/src/paperless/urls.py @@ -22,7 +22,7 @@ from documents.views import SelectionDataView from documents.views import StatisticsView from documents.views import StoragePathViewSet from documents.views import TagViewSet -from documents.views import TasksView +from documents.views import TasksViewSet from documents.views import UiSettingsView from documents.views import UnifiedSearchViewSet from paperless.consumers import StatusConsumer @@ -38,6 +38,7 @@ api_router.register(r"logs", LogViewSet, basename="logs") api_router.register(r"tags", TagViewSet) api_router.register(r"saved_views", SavedViewViewSet) api_router.register(r"storage_paths", StoragePathViewSet) +api_router.register(r"tasks", TasksViewSet, basename="tasks") urlpatterns = [ @@ -88,11 +89,6 @@ urlpatterns = [ UiSettingsView.as_view(), name="ui_settings", ), - re_path( - r"^tasks/", - TasksView.as_view(), - name="tasks", - ), re_path( r"^acknowledge_tasks/", AcknowledgeTasksView.as_view(), From 1f50f3c46fae70ae213a2d1619f8d6602a3d9cd6 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 26 May 2022 15:41:30 -0700 Subject: [PATCH 125/291] Task results popover --- .../manage/tasks/tasks.component.html | 25 +++++++++++++------ .../manage/tasks/tasks.component.scss | 3 +++ src/documents/serialisers.py | 8 ++++++ 3 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 src-ui/src/app/components/manage/tasks/tasks.component.scss diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.html b/src-ui/src/app/components/manage/tasks/tasks.component.html index dff538f3a..c292a5c00 100644 --- a/src-ui/src/app/components/manage/tasks/tasks.component.html +++ b/src-ui/src/app/components/manage/tasks/tasks.component.html @@ -27,28 +27,37 @@ - - - - + + + + - + + + - - - - - - + + + + + @@ -47,20 +48,28 @@ - - - + + + - + - + + + + + +
+
NameCreatedActionsNameCreatedResultsActions
+
+ 		{{ task.name }}{{ task.created | customDate:'short' }} + {{ task.result | slice:0:50 }} +
{{ task.result }}
 		{{ task.name }}{{ task.created | customDate:'medium' }} + - - - + - + @@ -27,38 +15,32 @@ - - - - - + + + - - - - + +
+ +
- + +
NameCreatedResultsActionsNameStartedActions
+
- + +
- - 		{{ task.name }}{{ task.created | customDate:'short' }} - {{ task.result | slice:0:50 }} -
{{ task.result }}
 		- {{ task.name }}{{ task.created | customDate:'medium' }} +
-
    -
  • - Incomplete {{tasksService.incompleteFileTasks.length}} + diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.ts b/src-ui/src/app/components/manage/tasks/tasks.component.ts index 873325b7d..1e32be303 100644 --- a/src-ui/src/app/components/manage/tasks/tasks.component.ts +++ b/src-ui/src/app/components/manage/tasks/tasks.component.ts @@ -9,16 +9,8 @@ import { TasksService } from 'src/app/services/tasks.service' styleUrls: ['./tasks.component.scss'], }) export class TasksComponent implements OnInit, OnDestroy { - public activeTab: string - public selectedTasks: Set = new Set() private unsubscribeNotifer = new Subject() - get dismissButtonText(): string { - return this.selectedTasks.size > 0 - ? $localize`Dismiss selected` - : $localize`Dismiss all` - } - constructor(public tasksService: TasksService) {} ngOnInit() { @@ -29,50 +21,7 @@ export class TasksComponent implements OnInit, OnDestroy { this.unsubscribeNotifer.next(true) } - dismissTask(task: PaperlessTask) { - this.dismissTasks(task) - } - - dismissTasks(task: PaperlessTask = undefined) { - let tasks = task ? new Set([task.id]) : this.selectedTasks - if (this.selectedTasks.size == 0) - tasks = new Set(this.currentTasks.map((t) => t.id)) - this.tasksService.dismissTasks(tasks) - } - - toggleSelected(task: PaperlessTask) { - this.selectedTasks.has(task.id) - ? this.selectedTasks.delete(task.id) - : this.selectedTasks.add(task.id) - } - - get currentTasks(): PaperlessTask[] { - let tasks: PaperlessTask[] - switch (this.activeTab) { - case 'incomplete': - tasks = this.tasksService.incompleteFileTasks - break - case 'completed': - tasks = this.tasksService.completedFileTasks - break - case 'failed': - tasks = this.tasksService.failedFileTasks - break - default: - break - } - return tasks - } - - toggleAll(event: PointerEvent) { - if ((event.target as HTMLInputElement).checked) { - this.selectedTasks = new Set(this.currentTasks.map((t) => t.id)) - } else { - this.clearSelection() - } - } - - clearSelection() { - this.selectedTasks = new Set() + acknowledgeTask(task: PaperlessTask) { + throw new Error('Not implemented' + task) } } diff --git a/src-ui/src/app/data/paperless-task.ts b/src-ui/src/app/data/paperless-task.ts index f906f9ae2..e81368343 100644 --- a/src-ui/src/app/data/paperless-task.ts +++ b/src-ui/src/app/data/paperless-task.ts @@ -1,25 +1,9 @@ import { ObjectWithId } from './object-with-id' -export enum PaperlessTaskType { - // just file tasks, for now - File = 'file', -} - -export enum PaperlessTaskStatus { - Incomplete = 'incomplete', - Complete = 'complete', - Failed = 'failed', - Unknown = 'unknown', -} - export interface PaperlessTask extends ObjectWithId { - type: PaperlessTaskType - - status: PaperlessTaskStatus - acknowledged: boolean - task_id: string + q_task_id: string name: string diff --git a/src-ui/src/app/services/tasks.service.ts b/src-ui/src/app/services/tasks.service.ts index f6faccaa6..c657e6a30 100644 --- a/src-ui/src/app/services/tasks.service.ts +++ b/src-ui/src/app/services/tasks.service.ts @@ -1,13 +1,16 @@ import { HttpClient } from '@angular/common/http' import { Injectable } from '@angular/core' +import { Observable } from 'rxjs' import { first, map } from 'rxjs/operators' -import { - PaperlessTask, - PaperlessTaskStatus, - PaperlessTaskType, -} from 'src/app/data/paperless-task' +import { PaperlessTask } from 'src/app/data/paperless-task' import { environment } from 'src/environments/environment' +interface TasksAPIResponse { + incomplete: Array + completed: Array + failed: Array +} + @Injectable({ providedIn: 'root', }) @@ -16,26 +19,19 @@ export class TasksService { loading: boolean - private fileTasks: PaperlessTask[] = [] - - public get total(): number { - return this.fileTasks?.length + private incompleteTasks: PaperlessTask[] = [] + public get incomplete(): PaperlessTask[] { + return this.incompleteTasks } - public get incompleteFileTasks(): PaperlessTask[] { - return this.fileTasks.filter( - (t) => t.status == PaperlessTaskStatus.Incomplete - ) + private completedTasks: PaperlessTask[] = [] + public get completed(): PaperlessTask[] { + return this.completedTasks } - public get completedFileTasks(): PaperlessTask[] { - return this.fileTasks.filter( - (t) => t.status == PaperlessTaskStatus.Complete - ) - } - - public get failedFileTasks(): PaperlessTask[] { - return this.fileTasks.filter((t) => t.status == PaperlessTaskStatus.Failed) + private failedTasks: PaperlessTask[] = [] + public get failed(): PaperlessTask[] { + return this.failedTasks } constructor(private http: HttpClient) {} @@ -44,23 +40,46 @@ export class TasksService { this.loading = true this.http - .get(`${this.baseUrl}tasks/`) + .get(`${this.baseUrl}consumption_tasks/`) .pipe(first()) .subscribe((r) => { - this.fileTasks = r.filter((t) => t.type == PaperlessTaskType.File) // they're all File tasks, for now + this.incompleteTasks = r.incomplete + this.completedTasks = r.completed + this.failedTasks = r.failed this.loading = false return true }) } - public dismissTasks(task_ids: Set) { - this.http - .post(`${this.baseUrl}acknowledge_tasks/`, { - tasks: [...task_ids], - }) - .pipe(first()) - .subscribe((r) => { - this.reload() - }) - } + // private savedViews: PaperlessSavedView[] = [] + + // get allViews() { + // return this.savedViews + // } + + // get sidebarViews() { + // return this.savedViews.filter((v) => v.show_in_sidebar) + // } + + // get dashboardViews() { + // return this.savedViews.filter((v) => v.show_on_dashboard) + // } + + // create(o: PaperlessSavedView) { + // return super.create(o).pipe(tap(() => this.reload())) + // } + + // update(o: PaperlessSavedView) { + // return super.update(o).pipe(tap(() => this.reload())) + // } + + // patchMany(objects: PaperlessSavedView[]): Observable { + // return combineLatest(objects.map((o) => super.patch(o))).pipe( + // tap(() => this.reload()) + // ) + // } + + // delete(o: PaperlessSavedView) { + // return super.delete(o).pipe(tap(() => this.reload())) + // } } From 990fc5195a6c802abce4329f015588e0c01ecdf8 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 26 May 2022 15:41:30 -0700 Subject: [PATCH 127/291] Task results popover fix merge --- .../manage/tasks/tasks.component.html | 27 +++++++++++++------ .../manage/tasks/tasks.component.scss | 3 +++ src-ui/src/app/data/paperless-task.ts | 2 ++ src/documents/serialisers.py | 8 ++++++ 4 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 src-ui/src/app/components/manage/tasks/tasks.component.scss diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.html b/src-ui/src/app/components/manage/tasks/tasks.component.html index dff538f3a..45fc02666 100644 --- a/src-ui/src/app/components/manage/tasks/tasks.component.html +++ b/src-ui/src/app/components/manage/tasks/tasks.component.html @@ -27,29 +27,40 @@ - - - - + + + + - + + + - - @@ -32,8 +43,7 @@ @@ -61,23 +71,23 @@
    +
    		NameCreatedActionsNameCreatedResultsActions
    +
    +     		{{ task.name }}{{ task.created | customDate:'short' }} +
    + + + + {{ task.result | slice:0:50 }}… +
    + {{ task.result | slice:0:50 }} +
    {{ task.result }}
         		{{ task.name }}{{ task.created | customDate:'medium' }} - - - - + - + @@ -27,23 +15,25 @@ - - - - - + + + @@ -71,23 +61,23 @@
    + +
    - + +
    		NameCreatedResultsActionsNameStartedActions
    - + +
    -
      -
    • - Incomplete {{tasksService.incompleteFileTasks.length}} + diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.ts b/src-ui/src/app/components/manage/tasks/tasks.component.ts index 873325b7d..1e32be303 100644 --- a/src-ui/src/app/components/manage/tasks/tasks.component.ts +++ b/src-ui/src/app/components/manage/tasks/tasks.component.ts @@ -9,16 +9,8 @@ import { TasksService } from 'src/app/services/tasks.service' styleUrls: ['./tasks.component.scss'], }) export class TasksComponent implements OnInit, OnDestroy { - public activeTab: string - public selectedTasks: Set = new Set() private unsubscribeNotifer = new Subject() - get dismissButtonText(): string { - return this.selectedTasks.size > 0 - ? $localize`Dismiss selected` - : $localize`Dismiss all` - } - constructor(public tasksService: TasksService) {} ngOnInit() { @@ -29,50 +21,7 @@ export class TasksComponent implements OnInit, OnDestroy { this.unsubscribeNotifer.next(true) } - dismissTask(task: PaperlessTask) { - this.dismissTasks(task) - } - - dismissTasks(task: PaperlessTask = undefined) { - let tasks = task ? new Set([task.id]) : this.selectedTasks - if (this.selectedTasks.size == 0) - tasks = new Set(this.currentTasks.map((t) => t.id)) - this.tasksService.dismissTasks(tasks) - } - - toggleSelected(task: PaperlessTask) { - this.selectedTasks.has(task.id) - ? this.selectedTasks.delete(task.id) - : this.selectedTasks.add(task.id) - } - - get currentTasks(): PaperlessTask[] { - let tasks: PaperlessTask[] - switch (this.activeTab) { - case 'incomplete': - tasks = this.tasksService.incompleteFileTasks - break - case 'completed': - tasks = this.tasksService.completedFileTasks - break - case 'failed': - tasks = this.tasksService.failedFileTasks - break - default: - break - } - return tasks - } - - toggleAll(event: PointerEvent) { - if ((event.target as HTMLInputElement).checked) { - this.selectedTasks = new Set(this.currentTasks.map((t) => t.id)) - } else { - this.clearSelection() - } - } - - clearSelection() { - this.selectedTasks = new Set() + acknowledgeTask(task: PaperlessTask) { + throw new Error('Not implemented' + task) } } diff --git a/src-ui/src/app/data/paperless-task.ts b/src-ui/src/app/data/paperless-task.ts index 15582913c..35ec50a0b 100644 --- a/src-ui/src/app/data/paperless-task.ts +++ b/src-ui/src/app/data/paperless-task.ts @@ -1,25 +1,9 @@ import { ObjectWithId } from './object-with-id' -export enum PaperlessTaskType { - // just file tasks, for now - File = 'file', -} - -export enum PaperlessTaskStatus { - Incomplete = 'incomplete', - Complete = 'complete', - Failed = 'failed', - Unknown = 'unknown', -} - export interface PaperlessTask extends ObjectWithId { - type: PaperlessTaskType - - status: PaperlessTaskStatus - acknowledged: boolean - task_id: string + q_task_id: string name: string diff --git a/src-ui/src/app/services/tasks.service.ts b/src-ui/src/app/services/tasks.service.ts index f6faccaa6..c657e6a30 100644 --- a/src-ui/src/app/services/tasks.service.ts +++ b/src-ui/src/app/services/tasks.service.ts @@ -1,13 +1,16 @@ import { HttpClient } from '@angular/common/http' import { Injectable } from '@angular/core' +import { Observable } from 'rxjs' import { first, map } from 'rxjs/operators' -import { - PaperlessTask, - PaperlessTaskStatus, - PaperlessTaskType, -} from 'src/app/data/paperless-task' +import { PaperlessTask } from 'src/app/data/paperless-task' import { environment } from 'src/environments/environment' +interface TasksAPIResponse { + incomplete: Array + completed: Array + failed: Array +} + @Injectable({ providedIn: 'root', }) @@ -16,26 +19,19 @@ export class TasksService { loading: boolean - private fileTasks: PaperlessTask[] = [] - - public get total(): number { - return this.fileTasks?.length + private incompleteTasks: PaperlessTask[] = [] + public get incomplete(): PaperlessTask[] { + return this.incompleteTasks } - public get incompleteFileTasks(): PaperlessTask[] { - return this.fileTasks.filter( - (t) => t.status == PaperlessTaskStatus.Incomplete - ) + private completedTasks: PaperlessTask[] = [] + public get completed(): PaperlessTask[] { + return this.completedTasks } - public get completedFileTasks(): PaperlessTask[] { - return this.fileTasks.filter( - (t) => t.status == PaperlessTaskStatus.Complete - ) - } - - public get failedFileTasks(): PaperlessTask[] { - return this.fileTasks.filter((t) => t.status == PaperlessTaskStatus.Failed) + private failedTasks: PaperlessTask[] = [] + public get failed(): PaperlessTask[] { + return this.failedTasks } constructor(private http: HttpClient) {} @@ -44,23 +40,46 @@ export class TasksService { this.loading = true this.http - .get(`${this.baseUrl}tasks/`) + .get(`${this.baseUrl}consumption_tasks/`) .pipe(first()) .subscribe((r) => { - this.fileTasks = r.filter((t) => t.type == PaperlessTaskType.File) // they're all File tasks, for now + this.incompleteTasks = r.incomplete + this.completedTasks = r.completed + this.failedTasks = r.failed this.loading = false return true }) } - public dismissTasks(task_ids: Set) { - this.http - .post(`${this.baseUrl}acknowledge_tasks/`, { - tasks: [...task_ids], - }) - .pipe(first()) - .subscribe((r) => { - this.reload() - }) - } + // private savedViews: PaperlessSavedView[] = [] + + // get allViews() { + // return this.savedViews + // } + + // get sidebarViews() { + // return this.savedViews.filter((v) => v.show_in_sidebar) + // } + + // get dashboardViews() { + // return this.savedViews.filter((v) => v.show_on_dashboard) + // } + + // create(o: PaperlessSavedView) { + // return super.create(o).pipe(tap(() => this.reload())) + // } + + // update(o: PaperlessSavedView) { + // return super.update(o).pipe(tap(() => this.reload())) + // } + + // patchMany(objects: PaperlessSavedView[]): Observable { + // return combineLatest(objects.map((o) => super.patch(o))).pipe( + // tap(() => this.reload()) + // ) + // } + + // delete(o: PaperlessSavedView) { + // return super.delete(o).pipe(tap(() => this.reload())) + // } } From 5f39dbe7ffeb39886ac1dfd99e40f16e992e5178 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 26 May 2022 21:21:29 -0700 Subject: [PATCH 129/291] fix merge --- .../app-frame/app-frame.component.ts | 2 +- .../manage/tasks/tasks.component.html | 60 +++++++------ .../manage/tasks/tasks.component.ts | 55 +++++++++++- src-ui/src/app/data/paperless-task.ts | 18 +++- src-ui/src/app/services/tasks.service.ts | 85 +++++++------------ 5 files changed, 139 insertions(+), 81 deletions(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts index 04641be7e..6641d133d 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.ts @@ -15,13 +15,13 @@ import { SavedViewService } from 'src/app/services/rest/saved-view.service' import { SearchService } from 'src/app/services/rest/search.service' import { environment } from 'src/environments/environment' import { DocumentDetailComponent } from '../document-detail/document-detail.component' +import { DocumentListViewService } from 'src/app/services/document-list-view.service' import { FILTER_FULLTEXT_QUERY } from 'src/app/data/filter-rule-type' import { RemoteVersionService, AppRemoteVersion, } from 'src/app/services/rest/remote-version.service' import { SettingsService } from 'src/app/services/settings.service' -import { DocumentListViewService } from 'src/app/services/document-list-view.service' @Component({ selector: 'app-app-frame', diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.html b/src-ui/src/app/components/manage/tasks/tasks.component.html index 8c848a0d5..45fc02666 100644 --- a/src-ui/src/app/components/manage/tasks/tasks.component.html +++ b/src-ui/src/app/components/manage/tasks/tasks.component.html @@ -1,12 +1,24 @@ - +
      + + + +
      - + @@ -15,25 +27,23 @@ - - - - - + + + + @@ -61,23 +71,23 @@
      +
      - - +
      		NameStartedActionsNameCreatedResultsActions
      - - +
      -
        -
      • - Incomplete {{tasksService.incomplete.length}} + diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.ts b/src-ui/src/app/components/manage/tasks/tasks.component.ts index 1e32be303..873325b7d 100644 --- a/src-ui/src/app/components/manage/tasks/tasks.component.ts +++ b/src-ui/src/app/components/manage/tasks/tasks.component.ts @@ -9,8 +9,16 @@ import { TasksService } from 'src/app/services/tasks.service' styleUrls: ['./tasks.component.scss'], }) export class TasksComponent implements OnInit, OnDestroy { + public activeTab: string + public selectedTasks: Set = new Set() private unsubscribeNotifer = new Subject() + get dismissButtonText(): string { + return this.selectedTasks.size > 0 + ? $localize`Dismiss selected` + : $localize`Dismiss all` + } + constructor(public tasksService: TasksService) {} ngOnInit() { @@ -21,7 +29,50 @@ export class TasksComponent implements OnInit, OnDestroy { this.unsubscribeNotifer.next(true) } - acknowledgeTask(task: PaperlessTask) { - throw new Error('Not implemented' + task) + dismissTask(task: PaperlessTask) { + this.dismissTasks(task) + } + + dismissTasks(task: PaperlessTask = undefined) { + let tasks = task ? new Set([task.id]) : this.selectedTasks + if (this.selectedTasks.size == 0) + tasks = new Set(this.currentTasks.map((t) => t.id)) + this.tasksService.dismissTasks(tasks) + } + + toggleSelected(task: PaperlessTask) { + this.selectedTasks.has(task.id) + ? this.selectedTasks.delete(task.id) + : this.selectedTasks.add(task.id) + } + + get currentTasks(): PaperlessTask[] { + let tasks: PaperlessTask[] + switch (this.activeTab) { + case 'incomplete': + tasks = this.tasksService.incompleteFileTasks + break + case 'completed': + tasks = this.tasksService.completedFileTasks + break + case 'failed': + tasks = this.tasksService.failedFileTasks + break + default: + break + } + return tasks + } + + toggleAll(event: PointerEvent) { + if ((event.target as HTMLInputElement).checked) { + this.selectedTasks = new Set(this.currentTasks.map((t) => t.id)) + } else { + this.clearSelection() + } + } + + clearSelection() { + this.selectedTasks = new Set() } } diff --git a/src-ui/src/app/data/paperless-task.ts b/src-ui/src/app/data/paperless-task.ts index 35ec50a0b..15582913c 100644 --- a/src-ui/src/app/data/paperless-task.ts +++ b/src-ui/src/app/data/paperless-task.ts @@ -1,9 +1,25 @@ import { ObjectWithId } from './object-with-id' +export enum PaperlessTaskType { + // just file tasks, for now + File = 'file', +} + +export enum PaperlessTaskStatus { + Incomplete = 'incomplete', + Complete = 'complete', + Failed = 'failed', + Unknown = 'unknown', +} + export interface PaperlessTask extends ObjectWithId { + type: PaperlessTaskType + + status: PaperlessTaskStatus + acknowledged: boolean - q_task_id: string + task_id: string name: string diff --git a/src-ui/src/app/services/tasks.service.ts b/src-ui/src/app/services/tasks.service.ts index c657e6a30..f6faccaa6 100644 --- a/src-ui/src/app/services/tasks.service.ts +++ b/src-ui/src/app/services/tasks.service.ts @@ -1,16 +1,13 @@ import { HttpClient } from '@angular/common/http' import { Injectable } from '@angular/core' -import { Observable } from 'rxjs' import { first, map } from 'rxjs/operators' -import { PaperlessTask } from 'src/app/data/paperless-task' +import { + PaperlessTask, + PaperlessTaskStatus, + PaperlessTaskType, +} from 'src/app/data/paperless-task' import { environment } from 'src/environments/environment' -interface TasksAPIResponse { - incomplete: Array - completed: Array - failed: Array -} - @Injectable({ providedIn: 'root', }) @@ -19,19 +16,26 @@ export class TasksService { loading: boolean - private incompleteTasks: PaperlessTask[] = [] - public get incomplete(): PaperlessTask[] { - return this.incompleteTasks + private fileTasks: PaperlessTask[] = [] + + public get total(): number { + return this.fileTasks?.length } - private completedTasks: PaperlessTask[] = [] - public get completed(): PaperlessTask[] { - return this.completedTasks + public get incompleteFileTasks(): PaperlessTask[] { + return this.fileTasks.filter( + (t) => t.status == PaperlessTaskStatus.Incomplete + ) } - private failedTasks: PaperlessTask[] = [] - public get failed(): PaperlessTask[] { - return this.failedTasks + public get completedFileTasks(): PaperlessTask[] { + return this.fileTasks.filter( + (t) => t.status == PaperlessTaskStatus.Complete + ) + } + + public get failedFileTasks(): PaperlessTask[] { + return this.fileTasks.filter((t) => t.status == PaperlessTaskStatus.Failed) } constructor(private http: HttpClient) {} @@ -40,46 +44,23 @@ export class TasksService { this.loading = true this.http - .get(`${this.baseUrl}consumption_tasks/`) + .get(`${this.baseUrl}tasks/`) .pipe(first()) .subscribe((r) => { - this.incompleteTasks = r.incomplete - this.completedTasks = r.completed - this.failedTasks = r.failed + this.fileTasks = r.filter((t) => t.type == PaperlessTaskType.File) // they're all File tasks, for now this.loading = false return true }) } - // private savedViews: PaperlessSavedView[] = [] - - // get allViews() { - // return this.savedViews - // } - - // get sidebarViews() { - // return this.savedViews.filter((v) => v.show_in_sidebar) - // } - - // get dashboardViews() { - // return this.savedViews.filter((v) => v.show_on_dashboard) - // } - - // create(o: PaperlessSavedView) { - // return super.create(o).pipe(tap(() => this.reload())) - // } - - // update(o: PaperlessSavedView) { - // return super.update(o).pipe(tap(() => this.reload())) - // } - - // patchMany(objects: PaperlessSavedView[]): Observable { - // return combineLatest(objects.map((o) => super.patch(o))).pipe( - // tap(() => this.reload()) - // ) - // } - - // delete(o: PaperlessSavedView) { - // return super.delete(o).pipe(tap(() => this.reload())) - // } + public dismissTasks(task_ids: Set) { + this.http + .post(`${this.baseUrl}acknowledge_tasks/`, { + tasks: [...task_ids], + }) + .pipe(first()) + .subscribe((r) => { + this.reload() + }) + } } From fcc5522bf0b55e6628979a5aeb2b14f56a3182b7 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 26 May 2022 21:24:55 -0700 Subject: [PATCH 130/291] Revert "Merge branch 'feature-frontend-task-queue' of github.com:paperless-ngx/paperless-ngx into feature-frontend-task-queue" This reverts commit 011164bc32e639189bf9c7be0665199b61734e77, reversing changes made to 0a43ce9cedf5158f21bb6f9ecc6ba2fdab205a1e. --- .../manage/tasks/tasks.component.html | 50 ++++++----- .../manage/tasks/tasks.component.ts | 55 +++++++++++- src-ui/src/app/data/paperless-task.ts | 18 +++- src-ui/src/app/services/tasks.service.ts | 85 +++++++------------ 4 files changed, 133 insertions(+), 75 deletions(-) diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.html b/src-ui/src/app/components/manage/tasks/tasks.component.html index c9f64041c..45fc02666 100644 --- a/src-ui/src/app/components/manage/tasks/tasks.component.html +++ b/src-ui/src/app/components/manage/tasks/tasks.component.html @@ -1,12 +1,24 @@ - +
        + + + +
        - + @@ -17,8 +29,7 @@
    - - +
    - - +
    -
      -
    • - Incomplete {{tasksService.incomplete.length}} + diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.ts b/src-ui/src/app/components/manage/tasks/tasks.component.ts index 1e32be303..873325b7d 100644 --- a/src-ui/src/app/components/manage/tasks/tasks.component.ts +++ b/src-ui/src/app/components/manage/tasks/tasks.component.ts @@ -9,8 +9,16 @@ import { TasksService } from 'src/app/services/tasks.service' styleUrls: ['./tasks.component.scss'], }) export class TasksComponent implements OnInit, OnDestroy { + public activeTab: string + public selectedTasks: Set = new Set() private unsubscribeNotifer = new Subject() + get dismissButtonText(): string { + return this.selectedTasks.size > 0 + ? $localize`Dismiss selected` + : $localize`Dismiss all` + } + constructor(public tasksService: TasksService) {} ngOnInit() { @@ -21,7 +29,50 @@ export class TasksComponent implements OnInit, OnDestroy { this.unsubscribeNotifer.next(true) } - acknowledgeTask(task: PaperlessTask) { - throw new Error('Not implemented' + task) + dismissTask(task: PaperlessTask) { + this.dismissTasks(task) + } + + dismissTasks(task: PaperlessTask = undefined) { + let tasks = task ? new Set([task.id]) : this.selectedTasks + if (this.selectedTasks.size == 0) + tasks = new Set(this.currentTasks.map((t) => t.id)) + this.tasksService.dismissTasks(tasks) + } + + toggleSelected(task: PaperlessTask) { + this.selectedTasks.has(task.id) + ? this.selectedTasks.delete(task.id) + : this.selectedTasks.add(task.id) + } + + get currentTasks(): PaperlessTask[] { + let tasks: PaperlessTask[] + switch (this.activeTab) { + case 'incomplete': + tasks = this.tasksService.incompleteFileTasks + break + case 'completed': + tasks = this.tasksService.completedFileTasks + break + case 'failed': + tasks = this.tasksService.failedFileTasks + break + default: + break + } + return tasks + } + + toggleAll(event: PointerEvent) { + if ((event.target as HTMLInputElement).checked) { + this.selectedTasks = new Set(this.currentTasks.map((t) => t.id)) + } else { + this.clearSelection() + } + } + + clearSelection() { + this.selectedTasks = new Set() } } diff --git a/src-ui/src/app/data/paperless-task.ts b/src-ui/src/app/data/paperless-task.ts index 35ec50a0b..15582913c 100644 --- a/src-ui/src/app/data/paperless-task.ts +++ b/src-ui/src/app/data/paperless-task.ts @@ -1,9 +1,25 @@ import { ObjectWithId } from './object-with-id' +export enum PaperlessTaskType { + // just file tasks, for now + File = 'file', +} + +export enum PaperlessTaskStatus { + Incomplete = 'incomplete', + Complete = 'complete', + Failed = 'failed', + Unknown = 'unknown', +} + export interface PaperlessTask extends ObjectWithId { + type: PaperlessTaskType + + status: PaperlessTaskStatus + acknowledged: boolean - q_task_id: string + task_id: string name: string diff --git a/src-ui/src/app/services/tasks.service.ts b/src-ui/src/app/services/tasks.service.ts index c657e6a30..f6faccaa6 100644 --- a/src-ui/src/app/services/tasks.service.ts +++ b/src-ui/src/app/services/tasks.service.ts @@ -1,16 +1,13 @@ import { HttpClient } from '@angular/common/http' import { Injectable } from '@angular/core' -import { Observable } from 'rxjs' import { first, map } from 'rxjs/operators' -import { PaperlessTask } from 'src/app/data/paperless-task' +import { + PaperlessTask, + PaperlessTaskStatus, + PaperlessTaskType, +} from 'src/app/data/paperless-task' import { environment } from 'src/environments/environment' -interface TasksAPIResponse { - incomplete: Array - completed: Array - failed: Array -} - @Injectable({ providedIn: 'root', }) @@ -19,19 +16,26 @@ export class TasksService { loading: boolean - private incompleteTasks: PaperlessTask[] = [] - public get incomplete(): PaperlessTask[] { - return this.incompleteTasks + private fileTasks: PaperlessTask[] = [] + + public get total(): number { + return this.fileTasks?.length } - private completedTasks: PaperlessTask[] = [] - public get completed(): PaperlessTask[] { - return this.completedTasks + public get incompleteFileTasks(): PaperlessTask[] { + return this.fileTasks.filter( + (t) => t.status == PaperlessTaskStatus.Incomplete + ) } - private failedTasks: PaperlessTask[] = [] - public get failed(): PaperlessTask[] { - return this.failedTasks + public get completedFileTasks(): PaperlessTask[] { + return this.fileTasks.filter( + (t) => t.status == PaperlessTaskStatus.Complete + ) + } + + public get failedFileTasks(): PaperlessTask[] { + return this.fileTasks.filter((t) => t.status == PaperlessTaskStatus.Failed) } constructor(private http: HttpClient) {} @@ -40,46 +44,23 @@ export class TasksService { this.loading = true this.http - .get(`${this.baseUrl}consumption_tasks/`) + .get(`${this.baseUrl}tasks/`) .pipe(first()) .subscribe((r) => { - this.incompleteTasks = r.incomplete - this.completedTasks = r.completed - this.failedTasks = r.failed + this.fileTasks = r.filter((t) => t.type == PaperlessTaskType.File) // they're all File tasks, for now this.loading = false return true }) } - // private savedViews: PaperlessSavedView[] = [] - - // get allViews() { - // return this.savedViews - // } - - // get sidebarViews() { - // return this.savedViews.filter((v) => v.show_in_sidebar) - // } - - // get dashboardViews() { - // return this.savedViews.filter((v) => v.show_on_dashboard) - // } - - // create(o: PaperlessSavedView) { - // return super.create(o).pipe(tap(() => this.reload())) - // } - - // update(o: PaperlessSavedView) { - // return super.update(o).pipe(tap(() => this.reload())) - // } - - // patchMany(objects: PaperlessSavedView[]): Observable { - // return combineLatest(objects.map((o) => super.patch(o))).pipe( - // tap(() => this.reload()) - // ) - // } - - // delete(o: PaperlessSavedView) { - // return super.delete(o).pipe(tap(() => this.reload())) - // } + public dismissTasks(task_ids: Set) { + this.http + .post(`${this.baseUrl}acknowledge_tasks/`, { + tasks: [...task_ids], + }) + .pipe(first()) + .subscribe((r) => { + this.reload() + }) + } } From 401663eec1a5d5a3e7ea116899b9ce975096f2b4 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 26 May 2022 21:58:02 -0700 Subject: [PATCH 131/291] Update 1021_paperlesstask.py --- src/documents/migrations/1021_paperlesstask.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/documents/migrations/1021_paperlesstask.py b/src/documents/migrations/1021_paperlesstask.py index 560fec11d..8d38db802 100644 --- a/src/documents/migrations/1021_paperlesstask.py +++ b/src/documents/migrations/1021_paperlesstask.py @@ -15,7 +15,7 @@ def init_paperless_tasks(apps, schema_editor): task_id=task.id, name=task.name, created=task.started, - acknowledged=False, + acknowledged=True, ) task.paperlesstask = paperlesstask task.save() From 3653b499743c45cd8096dc915b2a595d394bfa0e Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 26 May 2022 22:15:56 -0700 Subject: [PATCH 132/291] mobile improvements, fix dismiss 1 task --- .../manage/tasks/tasks.component.html | 29 ++++++++++++------- .../manage/tasks/tasks.component.scss | 4 +++ .../manage/tasks/tasks.component.ts | 2 +- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.html b/src-ui/src/app/components/manage/tasks/tasks.component.html index 45fc02666..a9d66ce28 100644 --- a/src-ui/src/app/components/manage/tasks/tasks.component.html +++ b/src-ui/src/app/components/manage/tasks/tasks.component.html @@ -33,10 +33,11 @@ -
NameCreatedResultsActionsNameCreatedResultsInfoActions
{{ task.name }}{{ task.created | customDate:'short' }} + {{ task.name }}{{ task.created | customDate:'short' }}
{{ task.result | slice:0:50 }}… +
{{ task.result }}
{{ task.result | slice:0:50 }} -
{{ task.result }}
 + 		+ + + + + +
{{ task.created | customDate:'short' }}
{{ task.result }}
 		- @@ -41,7 +45,7 @@
@@ -56,7 +60,7 @@ {{ task.result | slice:0:50 }}… -
{{ task.result }}
 + 
{{ task.result }}
{{ task.result | slice:0:50 }} @@ -69,7 +73,7 @@
{{ task.created | customDate:'short' }}
{{ task.result }}
 		-
@@ -55,22 +56,22 @@
{{ task.name }} {{ task.created | customDate:'short' }} -
- - - +
{{ task.result | slice:0:50 }}… - 
{{ task.result }}
- {{ task.result | slice:0:50 }} + {{ task.result }} + + 
{{ task.result | slice:0:300 }}…
+
(click for full output) +
- - + -
{{ task.created | customDate:'short' }}
{{ task.result }}
 +
+ 
{{ task.result }}
+
diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.scss b/src-ui/src/app/components/manage/tasks/tasks.component.scss index 6a45ef191..3ca72d9cc 100644 --- a/src-ui/src/app/components/manage/tasks/tasks.component.scss +++ b/src-ui/src/app/components/manage/tasks/tasks.component.scss @@ -1,9 +1,19 @@ ::ng-deep .popover { - max-width: 50%; + max-width: 350px; + + pre { + white-space: pre-wrap; + word-break: break-word; + } } -::ng-deep .popover.mobile { - max-width: 75%; +pre { + white-space: pre-wrap; + word-break: break-word; +} + +.result { + cursor: pointer; } .btn .spinner-border-sm { diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.ts b/src-ui/src/app/components/manage/tasks/tasks.component.ts index 4c4bfc090..249fbce39 100644 --- a/src-ui/src/app/components/manage/tasks/tasks.component.ts +++ b/src-ui/src/app/components/manage/tasks/tasks.component.ts @@ -14,6 +14,7 @@ export class TasksComponent implements OnInit, OnDestroy { public activeTab: string public selectedTasks: Set = new Set() private unsubscribeNotifer = new Subject() + public expandedTask: number get dismissButtonText(): string { return this.selectedTasks.size > 0 @@ -63,6 +64,10 @@ export class TasksComponent implements OnInit, OnDestroy { } } + expandTask(task: PaperlessTask) { + this.expandedTask = this.expandedTask == task.id ? undefined : task.id + } + toggleSelected(task: PaperlessTask) { this.selectedTasks.has(task.id) ? this.selectedTasks.delete(task.id) diff --git a/src-ui/src/app/services/tasks.service.ts b/src-ui/src/app/services/tasks.service.ts index 0e0fd6c03..952b05a2b 100644 --- a/src-ui/src/app/services/tasks.service.ts +++ b/src-ui/src/app/services/tasks.service.ts @@ -53,7 +53,6 @@ export class TasksService { .subscribe((r) => { this.fileTasks = r.filter((t) => t.type == PaperlessTaskType.File) // they're all File tasks, for now this.loading = false - return true }) } From 8c474d3c9ac6adfd88dff4c064daec363b4762a4 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 27 May 2022 10:55:14 -0700 Subject: [PATCH 177/291] Update e2e tests for collapsible result --- src-ui/cypress/integration/tasks.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-ui/cypress/integration/tasks.spec.ts b/src-ui/cypress/integration/tasks.spec.ts index 685c8e61c..5f95978a5 100644 --- a/src-ui/cypress/integration/tasks.spec.ts +++ b/src-ui/cypress/integration/tasks.spec.ts @@ -40,7 +40,7 @@ describe('tasks', () => { }) it('should show a list of dismissable tasks in tabs', () => { - cy.get('tbody').find('tr:visible').its('length').should('eq', 5) + cy.get('tbody').find('tr:visible').its('length').should('eq', 10) // double because collapsible result tr cy.wait(500) // stabilizes the test, for some reason... cy.get('tbody') .find('button:visible') @@ -50,7 +50,7 @@ describe('tasks', () => { .wait('@tasks') .wait(2000) .then(() => { - cy.get('tbody').find('tr:visible').its('length').should('eq', 4) + cy.get('tbody').find('tr:visible').its('length').should('eq', 8) // double because collapsible result tr }) }) From 44782ee2da5ffaf33a20973d2497a027b71563f3 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 6 Jun 2022 01:39:45 -0700 Subject: [PATCH 178/291] Use pre_execute signal to specify started vs queued --- .../manage/tasks/tasks.component.html | 14 ++++++++---- .../manage/tasks/tasks.component.ts | 7 ++++-- src-ui/src/app/data/paperless-task.ts | 5 ++++- src-ui/src/app/services/tasks.service.ts | 10 +++++---- .../migrations/1021_paperlesstask.py | 9 +++++--- src/documents/models.py | 3 ++- src/documents/serialisers.py | 5 ++++- src/documents/signals/handlers.py | 22 ++++++++++++++----- 8 files changed, 54 insertions(+), 21 deletions(-) diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.html b/src-ui/src/app/components/manage/tasks/tasks.component.html index d6b03e207..fcffc0ba3 100644 --- a/src-ui/src/app/components/manage/tasks/tasks.component.html +++ b/src-ui/src/app/components/manage/tasks/tasks.component.html @@ -39,7 +39,7 @@ Name Created - Results + Results Info Actions @@ -104,10 +104,16 @@ -
  • - Incomplete {{tasksService.incompleteFileTasks.length}} +
  • + Started {{tasksService.startedFileTasks.length}} - + + +
    • +
  • + Queued {{tasksService.queuedFileTasks.length}} + +
    • diff --git a/src-ui/src/app/components/manage/tasks/tasks.component.ts b/src-ui/src/app/components/manage/tasks/tasks.component.ts index 249fbce39..3779e7281 100644 --- a/src-ui/src/app/components/manage/tasks/tasks.component.ts +++ b/src-ui/src/app/components/manage/tasks/tasks.component.ts @@ -77,8 +77,11 @@ export class TasksComponent implements OnInit, OnDestroy { get currentTasks(): PaperlessTask[] { let tasks: PaperlessTask[] switch (this.activeTab) { - case 'incomplete': - tasks = this.tasksService.incompleteFileTasks + case 'queued': + tasks = this.tasksService.queuedFileTasks + break + case 'started': + tasks = this.tasksService.startedFileTasks break case 'completed': tasks = this.tasksService.completedFileTasks diff --git a/src-ui/src/app/data/paperless-task.ts b/src-ui/src/app/data/paperless-task.ts index 15582913c..5984725f9 100644 --- a/src-ui/src/app/data/paperless-task.ts +++ b/src-ui/src/app/data/paperless-task.ts @@ -6,7 +6,8 @@ export enum PaperlessTaskType { } export enum PaperlessTaskStatus { - Incomplete = 'incomplete', + Queued = 'queued', + Started = 'started', Complete = 'complete', Failed = 'failed', Unknown = 'unknown', @@ -25,5 +26,7 @@ export interface PaperlessTask extends ObjectWithId { created: Date + started?: Date + result: string } diff --git a/src-ui/src/app/services/tasks.service.ts b/src-ui/src/app/services/tasks.service.ts index 952b05a2b..8518d6f0e 100644 --- a/src-ui/src/app/services/tasks.service.ts +++ b/src-ui/src/app/services/tasks.service.ts @@ -26,10 +26,12 @@ export class TasksService { return this.fileTasks.slice(0) } - public get incompleteFileTasks(): PaperlessTask[] { - return this.fileTasks.filter( - (t) => t.status == PaperlessTaskStatus.Incomplete - ) + public get queuedFileTasks(): PaperlessTask[] { + return this.fileTasks.filter((t) => t.status == PaperlessTaskStatus.Queued) + } + + public get startedFileTasks(): PaperlessTask[] { + return this.fileTasks.filter((t) => t.status == PaperlessTaskStatus.Started) } public get completedFileTasks(): PaperlessTask[] { diff --git a/src/documents/migrations/1021_paperlesstask.py b/src/documents/migrations/1021_paperlesstask.py index 8d38db802..7e97e2af3 100644 --- a/src/documents/migrations/1021_paperlesstask.py +++ b/src/documents/migrations/1021_paperlesstask.py @@ -15,6 +15,7 @@ def init_paperless_tasks(apps, schema_editor): task_id=task.id, name=task.name, created=task.started, + started=task.started, acknowledged=True, ) task.paperlesstask = paperlesstask @@ -45,9 +46,11 @@ class Migration(migrations.Migration): ("name", models.CharField(max_length=256)), ( "created", - models.DateTimeField( - auto_now=True, db_index=True, verbose_name="created" - ), + models.DateTimeField(auto_now=True, verbose_name="created"), + ), + ( + "started", + models.DateTimeField(verbose_name="started"), ), ("acknowledged", models.BooleanField(default=False)), ( diff --git a/src/documents/models.py b/src/documents/models.py index 63c1c6e33..7c65549ba 100644 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -507,7 +507,8 @@ class PaperlessTask(models.Model): task_id = models.CharField(max_length=128) name = models.CharField(max_length=256) - created = models.DateTimeField(_("created"), auto_now=True, db_index=True) + created = models.DateTimeField(_("created"), auto_now=True) + started = models.DateTimeField(_("started")) attempted_task = models.OneToOneField( Task, on_delete=models.CASCADE, diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 494efb5c4..c4c30f01f 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -622,7 +622,10 @@ class TasksViewSerializer(serializers.ModelSerializer): def get_status(self, obj): if obj.attempted_task is None: - return "incomplete" + if obj.started: + return "started" + else: + return "queued" elif obj.attempted_task.success: return "complete" elif not obj.attempted_task.success: diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py index 2ae78ab80..07d0392b5 100644 --- a/src/documents/signals/handlers.py +++ b/src/documents/signals/handlers.py @@ -514,12 +514,24 @@ def init_paperless_task(sender, task, **kwargs): paperless_task.save() -@receiver(models.signals.post_save, sender=django_q.tasks.Task) -def update_paperless_task(sender, instance, **kwargs): +@receiver(django_q.signals.pre_execute) +def paperless_task_started(sender, task, **kwargs): + print(task) try: - if instance.func == "documents.tasks.consume_file": - paperless_task = PaperlessTask.objects.get(task_id=instance.id) - paperless_task.attempted_task = instance + if task["func"] == "documents.tasks.consume_file": + paperless_task = PaperlessTask.objects.get(task_id=task["id"]) + paperless_task.started = timezone.now() + paperless_task.save() + except PaperlessTask.DoesNotExist: + pass + + +@receiver(models.signals.post_save, sender=django_q.tasks.Task) +def update_paperless_task(sender, task, **kwargs): + try: + if task.func == "documents.tasks.consume_file": + paperless_task = PaperlessTask.objects.get(task_id=task.id) + paperless_task.attempted_task = task paperless_task.save() except PaperlessTask.DoesNotExist: pass From c68df4002f3eea126053d5152b6037210b322e0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jun 2022 20:24:26 +0000 Subject: [PATCH 179/291] Bump whitenoise from 6.1.0 to 6.2.0 Bumps [whitenoise](https://github.com/evansd/whitenoise) from 6.1.0 to 6.2.0. - [Release notes](https://github.com/evansd/whitenoise/releases) - [Changelog](https://github.com/evansd/whitenoise/blob/main/docs/changelog.rst) - [Commits](https://github.com/evansd/whitenoise/compare/6.1.0...6.2.0) --- updated-dependencies: - dependency-name: whitenoise dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Pipfile | 2 +- Pipfile.lock | 426 +++++++++++++++++++++++------------------------ requirements.txt | 22 +-- 3 files changed, 225 insertions(+), 225 deletions(-) diff --git a/Pipfile b/Pipfile index a4dfe7cd4..13f8d5317 100644 --- a/Pipfile +++ b/Pipfile @@ -34,7 +34,7 @@ psycopg2 = "*" redis = "*" # Pinned because aarch64 wheels and updates cause warnings when loading the classifier model. scikit-learn="==1.0.2" -whitenoise = "~=6.1.0" +whitenoise = "~=6.2.0" watchdog = "~=2.1.0" whoosh="~=2.7.4" inotifyrecursive = "~=0.3" diff --git a/Pipfile.lock b/Pipfile.lock index 7edea98f2..45dd915d2 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "cfdddfe8f71308f6eb7f1bec53518644758e0299cc23de3c6ee6f3fa5bf80ed0" + "sha256": "416f74762bd0d17c4b9543a61d1153adbd330cda8c6654e35fdbfeaf5955d5e5" }, "pipfile-spec": 6, "requires": {}, @@ -68,10 +68,10 @@ }, "autobahn": { "hashes": [ - "sha256:57b7acf228d50d83cf327372b889e2a168a869275b26e17917ed0b4cf4d823a6" + "sha256:34aa5569b0b4419f8c277792c600dc2518c4930928c74e2279ef8b88d8b8a3ea" ], "markers": "python_version >= '3.7'", - "version": "==22.4.2" + "version": "==22.5.1" }, "automat": { "hashes": [ @@ -99,7 +99,6 @@ "sha256:f04e857b59d9d1ccc39ce2da1021d196e47234873820cbeaad210724b1ee28ac", "sha256:fadbfe37f74051d024037f223b8e001611eac868b5c5b06144ef4d8b799862f2" ], - "index": "pypi", "markers": "python_version < '3.9'", "version": "==0.2.1" }, @@ -195,7 +194,7 @@ "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597", "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df" ], - "markers": "python_full_version >= '3.5.0'", + "markers": "python_version >= '3.5'", "version": "==2.0.12" }, "click": { @@ -468,7 +467,7 @@ "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff", "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" ], - "markers": "python_version >= '3'", + "markers": "python_version >= '3.5'", "version": "==3.3" }, "imap-tools": { @@ -490,7 +489,6 @@ "sha256:b6062987dfc51f0fcb809187cffbd60f35df7acb4589091f154214af6d0d49d3", "sha256:e447dc01619b1e951286f3929be820029d48c75eb25d265c28b92a16548212b8" ], - "index": "pypi", "markers": "python_version < '3.9'", "version": "==5.7.1" }, @@ -534,109 +532,129 @@ }, "lxml": { "hashes": [ - "sha256:078306d19a33920004addeb5f4630781aaeabb6a8d01398045fcde085091a169", - "sha256:0c1978ff1fd81ed9dcbba4f91cf09faf1f8082c9d72eb122e92294716c605428", - "sha256:1010042bfcac2b2dc6098260a2ed022968dbdfaf285fc65a3acf8e4eb1ffd1bc", - "sha256:1d650812b52d98679ed6c6b3b55cbb8fe5a5460a0aef29aeb08dc0b44577df85", - "sha256:20b8a746a026017acf07da39fdb10aa80ad9877046c9182442bf80c84a1c4696", - "sha256:2403a6d6fb61c285969b71f4a3527873fe93fd0abe0832d858a17fe68c8fa507", - "sha256:24f5c5ae618395ed871b3d8ebfcbb36e3f1091fd847bf54c4de623f9107942f3", - "sha256:28d1af847786f68bec57961f31221125c29d6f52d9187c01cd34dc14e2b29430", - "sha256:31499847fc5f73ee17dbe1b8e24c6dafc4e8d5b48803d17d22988976b0171f03", - "sha256:31ba2cbc64516dcdd6c24418daa7abff989ddf3ba6d3ea6f6ce6f2ed6e754ec9", - "sha256:330bff92c26d4aee79c5bc4d9967858bdbe73fdbdbacb5daf623a03a914fe05b", - "sha256:5045ee1ccd45a89c4daec1160217d363fcd23811e26734688007c26f28c9e9e7", - "sha256:52cbf2ff155b19dc4d4100f7442f6a697938bf4493f8d3b0c51d45568d5666b5", - "sha256:530f278849031b0eb12f46cca0e5db01cfe5177ab13bd6878c6e739319bae654", - "sha256:545bd39c9481f2e3f2727c78c169425efbfb3fbba6e7db4f46a80ebb249819ca", - "sha256:5804e04feb4e61babf3911c2a974a5b86f66ee227cc5006230b00ac6d285b3a9", - "sha256:5a58d0b12f5053e270510bf12f753a76aaf3d74c453c00942ed7d2c804ca845c", - "sha256:5f148b0c6133fb928503cfcdfdba395010f997aa44bcf6474fcdd0c5398d9b63", - "sha256:5f7d7d9afc7b293147e2d506a4596641d60181a35279ef3aa5778d0d9d9123fe", - "sha256:60d2f60bd5a2a979df28ab309352cdcf8181bda0cca4529769a945f09aba06f9", - "sha256:6259b511b0f2527e6d55ad87acc1c07b3cbffc3d5e050d7e7bcfa151b8202df9", - "sha256:6268e27873a3d191849204d00d03f65c0e343b3bcb518a6eaae05677c95621d1", - "sha256:627e79894770783c129cc5e89b947e52aa26e8e0557c7e205368a809da4b7939", - "sha256:62f93eac69ec0f4be98d1b96f4d6b964855b8255c345c17ff12c20b93f247b68", - "sha256:6d6483b1229470e1d8835e52e0ff3c6973b9b97b24cd1c116dca90b57a2cc613", - "sha256:6f7b82934c08e28a2d537d870293236b1000d94d0b4583825ab9649aef7ddf63", - "sha256:6fe4ef4402df0250b75ba876c3795510d782def5c1e63890bde02d622570d39e", - "sha256:719544565c2937c21a6f76d520e6e52b726d132815adb3447ccffbe9f44203c4", - "sha256:730766072fd5dcb219dd2b95c4c49752a54f00157f322bc6d71f7d2a31fecd79", - "sha256:74eb65ec61e3c7c019d7169387d1b6ffcfea1b9ec5894d116a9a903636e4a0b1", - "sha256:7993232bd4044392c47779a3c7e8889fea6883be46281d45a81451acfd704d7e", - "sha256:80bbaddf2baab7e6de4bc47405e34948e694a9efe0861c61cdc23aa774fcb141", - "sha256:86545e351e879d0b72b620db6a3b96346921fa87b3d366d6c074e5a9a0b8dadb", - "sha256:891dc8f522d7059ff0024cd3ae79fd224752676447f9c678f2a5c14b84d9a939", - "sha256:8a31f24e2a0b6317f33aafbb2f0895c0bce772980ae60c2c640d82caac49628a", - "sha256:8b99ec73073b37f9ebe8caf399001848fced9c08064effdbfc4da2b5a8d07b93", - "sha256:986b7a96228c9b4942ec420eff37556c5777bfba6758edcb95421e4a614b57f9", - "sha256:a1547ff4b8a833511eeaceacbcd17b043214fcdb385148f9c1bc5556ca9623e2", - "sha256:a2bfc7e2a0601b475477c954bf167dee6d0f55cb167e3f3e7cefad906e7759f6", - "sha256:a3c5f1a719aa11866ffc530d54ad965063a8cbbecae6515acbd5f0fae8f48eaa", - "sha256:a9f1c3489736ff8e1c7652e9dc39f80cff820f23624f23d9eab6e122ac99b150", - "sha256:aa0cf4922da7a3c905d000b35065df6184c0dc1d866dd3b86fd961905bbad2ea", - "sha256:ad4332a532e2d5acb231a2e5d33f943750091ee435daffca3fec0a53224e7e33", - "sha256:b2582b238e1658c4061ebe1b4df53c435190d22457642377fd0cb30685cdfb76", - "sha256:b6fc2e2fb6f532cf48b5fed57567ef286addcef38c28874458a41b7837a57807", - "sha256:b92d40121dcbd74831b690a75533da703750f7041b4bf951befc657c37e5695a", - "sha256:bbab6faf6568484707acc052f4dfc3802bdb0cafe079383fbaa23f1cdae9ecd4", - "sha256:c0b88ed1ae66777a798dc54f627e32d3b81c8009967c63993c450ee4cbcbec15", - "sha256:ce13d6291a5f47c1c8dbd375baa78551053bc6b5e5c0e9bb8e39c0a8359fd52f", - "sha256:db3535733f59e5605a88a706824dfcb9bd06725e709ecb017e165fc1d6e7d429", - "sha256:dd10383f1d6b7edf247d0960a3db274c07e96cf3a3fc7c41c8448f93eac3fb1c", - "sha256:e01f9531ba5420838c801c21c1b0f45dbc9607cb22ea2cf132844453bec863a5", - "sha256:e11527dc23d5ef44d76fef11213215c34f36af1608074561fcc561d983aeb870", - "sha256:e1ab2fac607842ac36864e358c42feb0960ae62c34aa4caaf12ada0a1fb5d99b", - "sha256:e1fd7d2fe11f1cb63d3336d147c852f6d07de0d0020d704c6031b46a30b02ca8", - "sha256:e9f84ed9f4d50b74fbc77298ee5c870f67cb7e91dcdc1a6915cb1ff6a317476c", - "sha256:ec4b4e75fc68da9dc0ed73dcdb431c25c57775383fec325d23a770a64e7ebc87", - "sha256:f10ce66fcdeb3543df51d423ede7e238be98412232fca5daec3e54bcd16b8da0", - "sha256:f63f62fc60e6228a4ca9abae28228f35e1bd3ce675013d1dfb828688d50c6e23", - "sha256:fa56bb08b3dd8eac3a8c5b7d075c94e74f755fd9d8a04543ae8d37b1612dd170", - "sha256:fa9b7c450be85bfc6cd39f6df8c5b8cbd76b5d6fc1f69efec80203f9894b885f" + "sha256:00f3a6f88fd5f4357844dd91a1abac5f466c6799f1b7f1da2df6665253845b11", + "sha256:024684e0c5cfa121c22140d3a0898a3a9b2ea0f0fd2c229b6658af4bdf1155e5", + "sha256:03370ec37fe562238d385e2c53089076dee53aabf8325cab964fdb04a9130fa0", + "sha256:0aa4cce579512c33373ca4c5e23c21e40c1aa1a33533a75e51b654834fd0e4f2", + "sha256:1057356b808d149bc14eb8f37bb89129f237df488661c1e0fc0376ca90e1d2c3", + "sha256:11d62c97ceff9bab94b6b29c010ea5fb6831743459bb759c917f49ba75601cd0", + "sha256:1254a79f8a67a3908de725caf59eae62d86738f6387b0a34b32e02abd6ae73db", + "sha256:1bfb791a8fcdbf55d1d41b8be940393687bec0e9b12733f0796668086d1a23ff", + "sha256:28cf04a1a38e961d4a764d2940af9b941b66263ed5584392ef875ee9c1e360a3", + "sha256:2b9c2341d96926b0d0e132e5c49ef85eb53fa92ae1c3a70f9072f3db0d32bc07", + "sha256:2d10659e6e5c53298e6d718fd126e793285bff904bb71d7239a17218f6a197b7", + "sha256:3af00ee88376022589ceeb8170eb67dacf5f7cd625ea59fa0977d719777d4ae8", + "sha256:3cf816aed8125cfc9e6e5c6c31ff94278320d591bd7970c4a0233bee0d1c8790", + "sha256:4becd16750ca5c2a1b1588269322b2cebd10c07738f336c922b658dbab96a61c", + "sha256:4cd69bca464e892ea4ed544ba6a7850aaff6f8d792f8055a10638db60acbac18", + "sha256:4e97c8fc761ad63909198acc892f34c20f37f3baa2c50a62d5ec5d7f1efc68a1", + "sha256:520461c36727268a989790aef08884347cd41f2d8ae855489ccf40b50321d8d7", + "sha256:53b0410b220766321759f7f9066da67b1d0d4a7f6636a477984cbb1d98483955", + "sha256:56e19fb6e4b8bd07fb20028d03d3bc67bcc0621347fbde64f248e44839771756", + "sha256:5a49ad78543925e1a4196e20c9c54492afa4f1502c2a563f73097e2044c75190", + "sha256:5d52e1173f52020392f593f87a6af2d4055dd800574a5cb0af4ea3878801d307", + "sha256:607224ffae9a0cf0a2f6e14f5f6bce43e83a6fbdaa647891729c103bdd6a5593", + "sha256:612ef8f2795a89ba3a1d4c8c1af84d8453fd53ee611aa5ad460fdd2cab426fc2", + "sha256:615886ee84b6f42f1bdf1852a9669b5fe3b96b6ff27f1a7a330b67ad9911200a", + "sha256:63419db39df8dc5564f6f103102c4665f7e4d9cb64030e98cf7a74eae5d5760d", + "sha256:6467626fa74f96f4d80fc6ec2555799e97fff8f36e0bfc7f67769f83e59cff40", + "sha256:65b3b5f12c6fb5611e79157214f3cd533083f9b058bf2fc8a1c5cc5ee40fdc5a", + "sha256:686565ac77ff94a8965c11829af253d9e2ce3bf0d9225b1d2eb5c4d4666d0dca", + "sha256:6af7f51a6010748fc1bb71917318d953c9673e4ae3f6d285aaf93ef5b2eb11c1", + "sha256:70a198030d26f5e569367f0f04509b63256faa76a22886280eea69a4f535dd40", + "sha256:754a1dd04bff8a509a31146bd8f3a5dc8191a8694d582dd5fb71ff09f0722c22", + "sha256:75da29a0752c8f2395df0115ac1681cefbdd4418676015be8178b733704cbff2", + "sha256:81c29c8741fa07ecec8ec7417c3d8d1e2f18cf5a10a280f4e1c3f8c3590228b2", + "sha256:9093a359a86650a3dbd6532c3e4d21a6f58ba2cb60d0e72db0848115d24c10ba", + "sha256:915ecf7d486df17cc65aeefdb680d5ad4390cc8c857cf8db3fe241ed234f856a", + "sha256:94b181dd2777890139e49a5336bf3a9a3378ce66132c665fe8db4e8b7683cde2", + "sha256:94f2e45b054dd759bed137b6e14ae8625495f7d90ddd23cf62c7a68f72b62656", + "sha256:9af19eb789d674b59a9bee5005779757aab857c40bf9cc313cb01eafac55ce55", + "sha256:9cae837b988f44925d14d048fa6a8c54f197c8b1223fd9ee9c27084f84606143", + "sha256:aa7447bf7c1a15ef24e2b86a277b585dd3f055e8890ac7f97374d170187daa97", + "sha256:b1e22f3ee4d75ca261b6bffbf64f6f178cb194b1be3191065a09f8d98828daa9", + "sha256:b5031d151d6147eac53366d6ec87da84cd4d8c5e80b1d9948a667a7164116e39", + "sha256:b62d1431b4c40cda43cc986f19b8c86b1d2ae8918cfc00f4776fdf070b65c0c4", + "sha256:b71c52d69b91af7d18c13aef1b0cc3baee36b78607c711eb14a52bf3aa7c815e", + "sha256:b7679344f2270840dc5babc9ccbedbc04f7473c1f66d4676bb01680c0db85bcc", + "sha256:bb7c1b029e54e26e01b1d1d912fc21abb65650d16ea9a191d026def4ed0859ed", + "sha256:c2a57755e366e0ac7ebdb3e9207f159c3bf1afed02392ab18453ce81f5ee92ee", + "sha256:cf9ec915857d260511399ab87e1e70fa13d6b2972258f8e620a3959468edfc32", + "sha256:d0d03b9636f1326772e6854459728676354d4c7731dae9902b180e2065ba3da6", + "sha256:d1690c4d37674a5f0cdafbc5ed7e360800afcf06928c2a024c779c046891bf09", + "sha256:d76da27f5e3e9bc40eba6ed7a9e985f57547e98cf20521d91215707f2fb57e0f", + "sha256:d882c2f3345261e898b9f604be76b61c901fbfa4ac32e3f51d5dc1edc89da3cb", + "sha256:d8e5021e770b0a3084c30dda5901d5fce6d4474feaf0ced8f8e5a82702502fbb", + "sha256:dd00d28d1ab5fa7627f5abc957f29a6338a7395b724571a8cbff8fbed83aaa82", + "sha256:e35a298691b9e10e5a5631f8f0ba605b30ebe19208dc8f58b670462f53753641", + "sha256:e4d020ecf3740b7312bacab2cb966bb720fd4d3490562d373b4ad91dd1857c0d", + "sha256:e564d5a771b4015f34166a05ea2165b7e283635c41b1347696117f780084b46d", + "sha256:ea3f2e9eb41f973f73619e88bf7bd950b16b4c2ce73d15f24a11800ce1eaf276", + "sha256:eabdbe04ee0a7e760fa6cd9e799d2b020d098c580ba99107d52e1e5e538b1ecb", + "sha256:f17b9df97c5ecdfb56c5e85b3c9df9831246df698f8581c6e111ac664c7c656e", + "sha256:f386def57742aacc3d864169dfce644a8c396f95aa35b41b69df53f558d56dd0", + "sha256:f6d23a01921b741774f35e924d418a43cf03eca1444f3fdfd7978d35a5aaab8b", + "sha256:fcdf70191f0d1761d190a436db06a46f05af60e1410e1507935f0332280c9268" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==4.8.0" + "version": "==4.9.0" }, "msgpack": { "hashes": [ - "sha256:0d8c332f53ffff01953ad25131272506500b14750c1d0ce8614b17d098252fbc", - "sha256:1c58cdec1cb5fcea8c2f1771d7b5fec79307d056874f746690bd2bdd609ab147", - "sha256:2c3ca57c96c8e69c1a0d2926a6acf2d9a522b41dc4253a8945c4c6cd4981a4e3", - "sha256:2f30dd0dc4dfe6231ad253b6f9f7128ac3202ae49edd3f10d311adc358772dba", - "sha256:2f97c0f35b3b096a330bb4a1a9247d0bd7e1f3a2eba7ab69795501504b1c2c39", - "sha256:36a64a10b16c2ab31dcd5f32d9787ed41fe68ab23dd66957ca2826c7f10d0b85", - "sha256:3d875631ecab42f65f9dce6f55ce6d736696ced240f2634633188de2f5f21af9", - "sha256:40fb89b4625d12d6027a19f4df18a4de5c64f6f3314325049f219683e07e678a", - "sha256:47d733a15ade190540c703de209ffbc42a3367600421b62ac0c09fde594da6ec", - "sha256:494471d65b25a8751d19c83f1a482fd411d7ca7a3b9e17d25980a74075ba0e88", - "sha256:51fdc7fb93615286428ee7758cecc2f374d5ff363bdd884c7ea622a7a327a81e", - "sha256:6eef0cf8db3857b2b556213d97dd82de76e28a6524853a9beb3264983391dc1a", - "sha256:6f4c22717c74d44bcd7af353024ce71c6b55346dad5e2cc1ddc17ce8c4507c6b", - "sha256:73a80bd6eb6bcb338c1ec0da273f87420829c266379c8c82fa14c23fb586cfa1", - "sha256:89908aea5f46ee1474cc37fbc146677f8529ac99201bc2faf4ef8edc023c2bf3", - "sha256:8a3a5c4b16e9d0edb823fe54b59b5660cc8d4782d7bf2c214cb4b91a1940a8ef", - "sha256:96acc674bb9c9be63fa8b6dabc3248fdc575c4adc005c440ad02f87ca7edd079", - "sha256:973ad69fd7e31159eae8f580f3f707b718b61141838321c6fa4d891c4a2cca52", - "sha256:9b6f2d714c506e79cbead331de9aae6837c8dd36190d02da74cb409b36162e8a", - "sha256:9c0903bd93cbd34653dd63bbfcb99d7539c372795201f39d16fdfde4418de43a", - "sha256:9fce00156e79af37bb6db4e7587b30d11e7ac6a02cb5bac387f023808cd7d7f4", - "sha256:a598d0685e4ae07a0672b59792d2cc767d09d7a7f39fd9bd37ff84e060b1a996", - "sha256:b0a792c091bac433dfe0a70ac17fc2087d4595ab835b47b89defc8bbabcf5c73", - "sha256:bb87f23ae7d14b7b3c21009c4b1705ec107cb21ee71975992f6aca571fb4a42a", - "sha256:bf1e6bfed4860d72106f4e0a1ab519546982b45689937b40257cfd820650b920", - "sha256:c1ba333b4024c17c7591f0f372e2daa3c31db495a9b2af3cf664aef3c14354f7", - "sha256:c2140cf7a3ec475ef0938edb6eb363fa704159e0bf71dde15d953bacc1cf9d7d", - "sha256:c7e03b06f2982aa98d4ddd082a210c3db200471da523f9ac197f2828e80e7770", - "sha256:d02cea2252abc3756b2ac31f781f7a98e89ff9759b2e7450a1c7a0d13302ff50", - "sha256:da24375ab4c50e5b7486c115a3198d207954fe10aaa5708f7b65105df09109b2", - "sha256:e4c309a68cb5d6bbd0c50d5c71a25ae81f268c2dc675c6f4ea8ab2feec2ac4e2", - "sha256:f01b26c2290cbd74316990ba84a14ac3d599af9cebefc543d241a66e785cf17d", - "sha256:f201d34dc89342fabb2a10ed7c9a9aaaed9b7af0f16a5923f1ae562b31258dea", - "sha256:f74da1e5fcf20ade12c6bf1baa17a2dc3604958922de8dc83cbe3eff22e8b611" + "sha256:002b5c72b6cd9b4bafd790f364b8480e859b4712e91f43014fe01e4f957b8467", + "sha256:0a68d3ac0104e2d3510de90a1091720157c319ceeb90d74f7b5295a6bee51bae", + "sha256:0df96d6eaf45ceca04b3f3b4b111b86b33785683d682c655063ef8057d61fd92", + "sha256:0dfe3947db5fb9ce52aaea6ca28112a170db9eae75adf9339a1aec434dc954ef", + "sha256:0e3590f9fb9f7fbc36df366267870e77269c03172d086fa76bb4eba8b2b46624", + "sha256:11184bc7e56fd74c00ead4f9cc9a3091d62ecb96e97653add7a879a14b003227", + "sha256:112b0f93202d7c0fef0b7810d465fde23c746a2d482e1e2de2aafd2ce1492c88", + "sha256:1276e8f34e139aeff1c77a3cefb295598b504ac5314d32c8c3d54d24fadb94c9", + "sha256:1576bd97527a93c44fa856770197dec00d223b0b9f36ef03f65bac60197cedf8", + "sha256:1e91d641d2bfe91ba4c52039adc5bccf27c335356055825c7f88742c8bb900dd", + "sha256:26b8feaca40a90cbe031b03d82b2898bf560027160d3eae1423f4a67654ec5d6", + "sha256:2999623886c5c02deefe156e8f869c3b0aaeba14bfc50aa2486a0415178fce55", + "sha256:2a2df1b55a78eb5f5b7d2a4bb221cd8363913830145fad05374a80bf0877cb1e", + "sha256:2bb8cdf50dd623392fa75525cce44a65a12a00c98e1e37bf0fb08ddce2ff60d2", + "sha256:2cc5ca2712ac0003bcb625c96368fd08a0f86bbc1a5578802512d87bc592fe44", + "sha256:35bc0faa494b0f1d851fd29129b2575b2e26d41d177caacd4206d81502d4c6a6", + "sha256:3c11a48cf5e59026ad7cb0dc29e29a01b5a66a3e333dc11c04f7e991fc5510a9", + "sha256:449e57cc1ff18d3b444eb554e44613cffcccb32805d16726a5494038c3b93dab", + "sha256:462497af5fd4e0edbb1559c352ad84f6c577ffbbb708566a0abaaa84acd9f3ae", + "sha256:4733359808c56d5d7756628736061c432ded018e7a1dff2d35a02439043321aa", + "sha256:48f5d88c99f64c456413d74a975bd605a9b0526293218a3b77220a2c15458ba9", + "sha256:49565b0e3d7896d9ea71d9095df15b7f75a035c49be733051c34762ca95bbf7e", + "sha256:4ab251d229d10498e9a2f3b1e68ef64cb393394ec477e3370c457f9430ce9250", + "sha256:4d5834a2a48965a349da1c5a79760d94a1a0172fbb5ab6b5b33cbf8447e109ce", + "sha256:4dea20515f660aa6b7e964433b1808d098dcfcabbebeaaad240d11f909298075", + "sha256:545e3cf0cf74f3e48b470f68ed19551ae6f9722814ea969305794645da091236", + "sha256:63e29d6e8c9ca22b21846234913c3466b7e4ee6e422f205a2988083de3b08cae", + "sha256:6916c78f33602ecf0509cc40379271ba0f9ab572b066bd4bdafd7434dee4bc6e", + "sha256:6a4192b1ab40f8dca3f2877b70e63799d95c62c068c84dc028b40a6cb03ccd0f", + "sha256:6c9566f2c39ccced0a38d37c26cc3570983b97833c365a6044edef3574a00c08", + "sha256:76ee788122de3a68a02ed6f3a16bbcd97bc7c2e39bd4d94be2f1821e7c4a64e6", + "sha256:7760f85956c415578c17edb39eed99f9181a48375b0d4a94076d84148cf67b2d", + "sha256:77ccd2af37f3db0ea59fb280fa2165bf1b096510ba9fe0cc2bf8fa92a22fdb43", + "sha256:81fc7ba725464651190b196f3cd848e8553d4d510114a954681fd0b9c479d7e1", + "sha256:85f279d88d8e833ec015650fd15ae5eddce0791e1e8a59165318f371158efec6", + "sha256:9667bdfdf523c40d2511f0e98a6c9d3603be6b371ae9a238b7ef2dc4e7a427b0", + "sha256:a75dfb03f8b06f4ab093dafe3ddcc2d633259e6c3f74bb1b01996f5d8aa5868c", + "sha256:ac5bd7901487c4a1dd51a8c58f2632b15d838d07ceedaa5e4c080f7190925bff", + "sha256:aca0f1644d6b5a73eb3e74d4d64d5d8c6c3d577e753a04c9e9c87d07692c58db", + "sha256:b17be2478b622939e39b816e0aa8242611cc8d3583d1cd8ec31b249f04623243", + "sha256:c1683841cd4fa45ac427c18854c3ec3cd9b681694caf5bff04edb9387602d661", + "sha256:c23080fdeec4716aede32b4e0ef7e213c7b1093eede9ee010949f2a418ced6ba", + "sha256:d5b5b962221fa2c5d3a7f8133f9abffc114fe218eb4365e40f17732ade576c8e", + "sha256:d603de2b8d2ea3f3bcb2efe286849aa7a81531abc52d8454da12f46235092bcb", + "sha256:e83f80a7fec1a62cf4e6c9a660e39c7f878f603737a0cdac8c13131d11d97f52", + "sha256:eb514ad14edf07a1dbe63761fd30f89ae79b42625731e1ccf5e1f1092950eaa6", + "sha256:eba96145051ccec0ec86611fe9cf693ce55f2a3ce89c06ed307de0e085730ec1", + "sha256:ed6f7b854a823ea44cf94919ba3f727e230da29feb4a99711433f25800cf747f", + "sha256:f0029245c51fd9473dc1aede1160b0a29f4a912e6b1dd353fa6d317085b219da", + "sha256:f5d869c18f030202eb412f08b28d2afeea553d6613aee89e200d7aca7ef01f5f", + "sha256:fb62ea4b62bfcb0b380d5680f9a4b3f9a2d166d9394e9bbd9666c0ee09a3645c", + "sha256:fcb8a47f43acc113e24e910399376f7277cf8508b27e5b88499f053de6b115a8" ], - "version": "==1.0.3" + "version": "==1.0.4" }, "numpy": { "hashes": [ @@ -1065,45 +1083,45 @@ }, "reportlab": { "hashes": [ - "sha256:09b2ca175129a34292399fc4c6a8b1739f6c5946368fcaa6f931d69385b2f720", - "sha256:0a7f2b7232c3ffb451b649d55c51a6dd0c8104ad7bbcfe355addf7619705e7fa", - "sha256:0e767cf4507ca8eed7dde8511f0889b0f19f160a2bdf9ef07742b2aaeceed9f2", - "sha256:10681d89a0ca37bb4036283fb8c0efac9ac1b22265dbdf350bda0448be33e00c", - "sha256:15294435f786968bcdf1a7a67bcc23a136470b6ea26919497f5c76ff0f653041", - "sha256:193671445b4885128d8800d3e416eb2fa4fd89bafae08cc9889c0752fe5ad8c2", - "sha256:1967dbc9930917d75c39784712a137d432dbc2e5ca9e132a2453319c2619ccff", - "sha256:1ec84055cf2c83783958b74eadf0e577eb0cd9088c8b5d536e9ddc0f4a9f8c70", - "sha256:23f5aed2d212096f2fe95d56f868d63f839a08bf7e389237e644d93981274222", - "sha256:32a5c5cd9625a40feec956f460355b4813bc3187c4f8dc9efd9f1a7f8f854e34", - "sha256:37dda88dbe16dd3f4f9039464637cce66e462c0b95e5763dbd45ac5799136d3a", - "sha256:496f42840604255ce06777bc129048b3bab966213bbac4f07fbe4ceb6a2e0482", - "sha256:4ba8eebfa4383e4680d6e7e6dba9c45c1fe19bbc0a754db4d84823f1a9511e56", - "sha256:4fbe23ac870adf90544d2014c572dba6ec4d772afad6505bb91f171ddad12839", - "sha256:50f8e30f5410efc69b0217261b1f21912888da392a4549e79c7aaaac85f01bfa", - "sha256:5d0cc3682456ad213150f6dbffe7d47eab737d809e517c316103376be548fb84", - "sha256:6a114761ad3ba6e0cdfacf14a8fb2cb8f5713b115ca1f0c17f3cd638d0a5b4bd", - "sha256:713574da534b6ce73d884f1574c35a565e438af4888fcc75e752f1de02e356a7", - "sha256:8cb82b6d14ad4bd915acacc8f114c6a7bab8b9b1503cabb930e433ebd320f90c", - "sha256:90f74627cafecf3924741ab8b0690a19df4214eb56b1cfce2dc74a15c9744034", - "sha256:92a6613af9877e3ad2a1c5a16a122514a4f9f8d9b91b1f22e7fa0fa796617b36", - "sha256:a441afdfe31870b964bccde042d7172ed3c0077f519bbf3ed7d9d34c406b6b91", - "sha256:ab1ffe4ec7be99ad348791116d436610afdc7a9a02a968997f31eaa62eaadad8", - "sha256:b2c2fd861f10b2cd49ccf29a31da9ad5c3b95aa437804e4fd0351ed4eb695f74", - "sha256:bbaab798991863952c593c0459dcb82e0aade837675593310e13cba2ce7fb45a", - "sha256:c9a5f63bc381c0f945402ef4c1bccc74a8eed28f6be6596704b1db7d82ec89fe", - "sha256:cb21666fc9edec9716553bfcfe0c30d1bbbe2731910a96f07ec65652974e5f83", - "sha256:ce3a3aad287c8532f62223f5720b5504e31abe3dce52a27bd2a25f508c0d846e", - "sha256:cebd0b28a0e875a9ce789514700f80659269ecf2a8fcef0aa10b8ae52b40474a", - "sha256:d1bf9455aff37beb421a4447d89d6dd77bb46f677c0bab4eb0272cdb79faad2f", - "sha256:d927bf802bf53c1b5a3878a22e9be310900877984e7c436a3a99bdd19cfec4c3", - "sha256:de724c78f4eb1363b1195dce85a2a8806e7509b69ac5c842a714d942ea534d63", - "sha256:e1fc1b1f5d9d1c2e18b5e60602dfa7854b2330ba0efc312ef605abf588abea9c", - "sha256:e492e87886423192af1fafde23907bcd9d2fdccfc22f67e18aa5c73db3a380a3", - "sha256:e9b5e9115363545a727d8ebe7e4b94f7cf6f26113261a269d50d88b8db4eb726", - "sha256:ff0e014a3a3fe286c642ef51213c41684a156b9ed293ef205e8890bc1dbbfdc7" + "sha256:008b06747e422de3e05b244e7f2b738ad8a62ff4b7ed0cf727bc4bc34aca74b1", + "sha256:0830565827873f2f0a2cfa15ac9518901873529b53877b9092bc6c5813ce71d0", + "sha256:192b412a41b4306c90387e6ffaa866ba91ef83145c383fbfe889475bef77ede6", + "sha256:1f138308ac18a6f1704684a5bef713ec764636842d0ccac2daf775a6a814a449", + "sha256:2490293fb0fc071698301b89c2dd5c49dd2e19fded190c43f240eef0f8e02956", + "sha256:27b3e8df76af69dfc4d3bc2d1307f9468c00d421c72bfb586592fb160bf7d945", + "sha256:2971385d4fc5193ee6946253355222cf70df18e21f08ad678540e6e3207afa51", + "sha256:2aacaa98fda54b0d9e59edf87b3e4b1c2ec2ffe5291c53ee9c38dd6e16b4388c", + "sha256:32e73ab9bbab0daf1265238d31d716484afcea7cb04d57a5d36dcba413fbaf69", + "sha256:37d4e87a73ad938d4eac701dd25f3e2802fb3ee9d7fa064b9b08623d0be48a9a", + "sha256:39e40449c4f9b3328b87892d8f286448ec33397679b5c400ba9e08c67c6ee8df", + "sha256:43c10524699e4892549120a952f16b6051aab8bc15ab37fb50a7573ae30ce010", + "sha256:468a6ddef1a7b8cb7a96ee21de3a432e173f57c304a20d54332bcf18117dc978", + "sha256:53b10db39ba2c08d987fd81d6a181bd1c029b805d8484198d794d70bf5726cc4", + "sha256:55447f371524c964f24e42dd589e29a1020bcecc070a0afdfb541b446c5fd66d", + "sha256:5e9753587e88d9a4397aad495c6afee5ee643695083d1b994cde6507f7b68021", + "sha256:6549d68a2a1a697c8521d87585b1c424e1467f2c14e8bf4d6df97a6423c6bbfd", + "sha256:811c74594975ff8f4efa2f670fd38a5c11aa62f4520b642df0afd00f9015bf29", + "sha256:9db526b52966e46af59210d28b1d50757e4523b68d7a9416f8a13b5517392f3f", + "sha256:a808e92b8b4e8d84e7ef77e5a1a27f0275f548774d90e9090076cd8822c21146", + "sha256:aac50d451a28e11dafbb28b8456e7f0f7347fc4eb1cb6a55e3c0a3a726e50387", + "sha256:be84b5d01e5fdde2e372b882bb36c1edb17db0e8976758be9de18c86ddac6430", + "sha256:bf8cba95a2d5cf731e8b74c92b4f07d79ef286a2a78b617300e37e51cf955cb2", + "sha256:c129d8f1f10b7750c9f44de74e37e1005e39f26265843a71b908720492e96b95", + "sha256:c1d2a5c36bf4a0fafc3abc0e94b5b48ae01b3aefc3c9384cf9d8b36035f15407", + "sha256:c65ecf2c131f8d0a45f8b011e5bc9b219c8b3d1f8d49da72576f9ecc330f2280", + "sha256:c83f1be1c1e82dcdd0c1f445cab351fa8f45b0dcb6e89169c047f09bf4199779", + "sha256:cc5df9496df1ab7dfb6d72b28b3a4398a10f96137ed996e116636c2b3bb761d9", + "sha256:cf474fa3c27bed3313e4e4d3629bc139a8f6c82284eda5a16e13234a1cbe905b", + "sha256:dac7edc1f839e4825ad20e424f0b4919a66198361e70f92140016a30fd2b315a", + "sha256:de220b1c02c66255653d4326794bcb1f90448f29ffcd654957e3b73544653abe", + "sha256:e475921b6455ffba4889f7c54e336630ba6204ccab613a2f37e84e21b92bc454", + "sha256:ec7d8e554f01dab05e138e9348d444befe67143a97e3f478419f26e10802d3f2", + "sha256:f1cf0a16dca85bf071d5c968881e01e836671f96d468b2aa3659fdcf29ab6f2e", + "sha256:f41b698a95c37901df285b938cae05a8d787efe915a3589eea3b2e4c7601bbee", + "sha256:fcad0ac282b76820a7817ed0393883983a23f7f5a838ae8db34795ea7e4bfa37" ], "markers": "python_version >= '3.7' and python_version < '4'", - "version": "==3.6.9" + "version": "==3.6.10" }, "requests": { "hashes": [ @@ -1208,7 +1226,7 @@ "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663", "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de" ], - "markers": "python_full_version >= '3.5.0'", + "markers": "python_version >= '3.5'", "version": "==1.2.0" }, "sqlparse": { @@ -1216,7 +1234,7 @@ "sha256:0c00730c74263a94e5a9919ade150dfc3b19c574389985446148402998287dae", "sha256:48719e356bb8b42991bdbb1e8b83223757b93789c00910a616a071910ca4a64d" ], - "markers": "python_full_version >= '3.5.0'", + "markers": "python_version >= '3.5'", "version": "==0.4.2" }, "threadpoolctl": { @@ -1425,11 +1443,11 @@ }, "whitenoise": { "hashes": [ - "sha256:2067fe9008a3cd7d0d75f75c9240b54f5f59996ca285cbeab18fc1e89949e30d", - "sha256:6ccc6d1ad6fb688a398ea65d97db47f018ea0be7da75e146e8f2e837a04ba590" + "sha256:8e9c600a5c18bd17655ef668ad55b5edf6c24ce9bdca5bf607649ca4b1e8e2c2", + "sha256:8fa943c6d4cd9e27673b70c21a07b0aa120873901e099cd46cab40f7cc96d567" ], "index": "pypi", - "version": "==6.1.0" + "version": "==6.2.0" }, "whoosh": { "hashes": [ @@ -1445,7 +1463,6 @@ "sha256:56bf8aadb83c24db6c4b577e13de374ccfb67da2078beba1d037c17980bf43ad", "sha256:c4f6e5bbf48e74f7a38e7cc5b0480ff42b0ae5178957d564d18932525d5cf099" ], - "index": "pypi", "markers": "python_version < '3.9'", "version": "==3.8.0" }, @@ -1581,7 +1598,7 @@ "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597", "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df" ], - "markers": "python_full_version >= '3.5.0'", + "markers": "python_version >= '3.5'", "version": "==2.0.12" }, "click": { @@ -1605,50 +1622,50 @@ "toml" ], "hashes": [ - "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a", - "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6", - "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383", - "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f", - "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f", - "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f", - "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c", - "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018", - "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720", - "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3", - "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf", - "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211", - "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39", - "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95", - "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41", - "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c", - "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166", - "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49", - "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce", - "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088", - "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6", - "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426", - "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df", - "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632", - "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3", - "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08", - "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65", - "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea", - "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701", - "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5", - "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311", - "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7", - "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d", - "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61", - "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c", - "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a", - "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055", - "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740", - "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45", - "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052", - "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f" + "sha256:01c5615d13f3dd3aa8543afc069e5319cfa0c7d712f6e04b920431e5c564a749", + "sha256:106c16dfe494de3193ec55cac9640dd039b66e196e4641fa8ac396181578b982", + "sha256:129cd05ba6f0d08a766d942a9ed4b29283aff7b2cccf5b7ce279d50796860bb3", + "sha256:145f296d00441ca703a659e8f3eb48ae39fb083baba2d7ce4482fb2723e050d9", + "sha256:1480ff858b4113db2718848d7b2d1b75bc79895a9c22e76a221b9d8d62496428", + "sha256:269eaa2c20a13a5bf17558d4dc91a8d078c4fa1872f25303dddcbba3a813085e", + "sha256:26dff09fb0d82693ba9e6231248641d60ba606150d02ed45110f9ec26404ed1c", + "sha256:2bd9a6fc18aab8d2e18f89b7ff91c0f34ff4d5e0ba0b33e989b3cd4194c81fd9", + "sha256:309ce4a522ed5fca432af4ebe0f32b21d6d7ccbb0f5fcc99290e71feba67c264", + "sha256:3384f2a3652cef289e38100f2d037956194a837221edd520a7ee5b42d00cc605", + "sha256:342d4aefd1c3e7f620a13f4fe563154d808b69cccef415415aece4c786665397", + "sha256:39ee53946bf009788108b4dd2894bf1349b4e0ca18c2016ffa7d26ce46b8f10d", + "sha256:4321f075095a096e70aff1d002030ee612b65a205a0a0f5b815280d5dc58100c", + "sha256:4803e7ccf93230accb928f3a68f00ffa80a88213af98ed338a57ad021ef06815", + "sha256:4ce1b258493cbf8aec43e9b50d89982346b98e9ffdfaae8ae5793bc112fb0068", + "sha256:664a47ce62fe4bef9e2d2c430306e1428ecea207ffd68649e3b942fa8ea83b0b", + "sha256:75ab269400706fab15981fd4bd5080c56bd5cc07c3bccb86aab5e1d5a88dc8f4", + "sha256:83c4e737f60c6936460c5be330d296dd5b48b3963f48634c53b3f7deb0f34ec4", + "sha256:84631e81dd053e8a0d4967cedab6db94345f1c36107c71698f746cb2636c63e3", + "sha256:84e65ef149028516c6d64461b95a8dbcfce95cfd5b9eb634320596173332ea84", + "sha256:865d69ae811a392f4d06bde506d531f6a28a00af36f5c8649684a9e5e4a85c83", + "sha256:87f4f3df85aa39da00fd3ec4b5abeb7407e82b68c7c5ad181308b0e2526da5d4", + "sha256:8c08da0bd238f2970230c2a0d28ff0e99961598cb2e810245d7fc5afcf1254e8", + "sha256:961e2fb0680b4f5ad63234e0bf55dfb90d302740ae9c7ed0120677a94a1590cb", + "sha256:9b3e07152b4563722be523e8cd0b209e0d1a373022cfbde395ebb6575bf6790d", + "sha256:a7f3049243783df2e6cc6deafc49ea123522b59f464831476d3d1448e30d72df", + "sha256:bf5601c33213d3cb19d17a796f8a14a9eaa5e87629a53979a5981e3e3ae166f6", + "sha256:cec3a0f75c8f1031825e19cd86ee787e87cf03e4fd2865c79c057092e69e3a3b", + "sha256:d42c549a8f41dc103a8004b9f0c433e2086add8a719da00e246e17cbe4056f72", + "sha256:d67d44996140af8b84284e5e7d398e589574b376fb4de8ccd28d82ad8e3bea13", + "sha256:d9c80df769f5ec05ad21ea34be7458d1dc51ff1fb4b2219e77fe24edf462d6df", + "sha256:e57816f8ffe46b1df8f12e1b348f06d164fd5219beba7d9433ba79608ef011cc", + "sha256:ee2ddcac99b2d2aec413e36d7a429ae9ebcadf912946b13ffa88e7d4c9b712d6", + "sha256:f02cbbf8119db68455b9d763f2f8737bb7db7e43720afa07d8eb1604e5c5ae28", + "sha256:f1d5aa2703e1dab4ae6cf416eb0095304f49d004c39e9db1d86f57924f43006b", + "sha256:f5b66caa62922531059bc5ac04f836860412f7f88d38a476eda0a6f11d4724f4", + "sha256:f69718750eaae75efe506406c490d6fc5a6161d047206cc63ce25527e8a3adad", + "sha256:fb73e0011b8793c053bfa85e53129ba5f0250fdc0392c1591fd35d915ec75c46", + "sha256:fd180ed867e289964404051a958f7cccabdeed423f91a899829264bb7974d3d3", + "sha256:fdb6f7bd51c2d1714cea40718f6149ad9be6a2ee7d93b19e9f00934c0f2a74d9", + "sha256:ffa9297c3a453fba4717d06df579af42ab9a28022444cae7fa605af4df612d54" ], "markers": "python_version >= '3.7'", - "version": "==6.4" + "version": "==6.4.1" }, "coveralls": { "hashes": [ @@ -1697,11 +1714,11 @@ }, "faker": { "hashes": [ - "sha256:c6ff91847d7c820afc0a74d95e824b48aab71ddfd9003f300641e42d58ae886f", - "sha256:cad1f69d72a68878cd67855140b6fe3e44c11628971cd838595d289c98bc45de" + "sha256:0122b75e7960cbb1e2bbbf10ef9b8c183377878e38466854953539c6d822e7c0", + "sha256:fb95f956bac59c90f54543919d5c5ef41625e12a0773e5aa08c9b9c62ba58fb3" ], "markers": "python_version >= '3.6'", - "version": "==13.11.1" + "version": "==13.12.1" }, "filelock": { "hashes": [ @@ -1724,7 +1741,7 @@ "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff", "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" ], - "markers": "python_version >= '3'", + "markers": "python_version >= '3.5'", "version": "==3.3" }, "imagesize": { @@ -1735,14 +1752,6 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.3.0" }, - "importlib-metadata": { - "hashes": [ - "sha256:5d26852efe48c0a32b0509ffbc583fda1a2266545a78d104a6f4aff3db17d700", - "sha256:c58c8eb8a762858f49e18436ff552e83914778e50e9d2f1660535ffb364552ec" - ], - "markers": "python_version < '3.10'", - "version": "==4.11.4" - }, "iniconfig": { "hashes": [ "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3", @@ -2148,7 +2157,7 @@ "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f" ], - "markers": "python_version < '3.11'", + "markers": "python_version >= '3.7'", "version": "==2.0.1" }, "tornado": { @@ -2195,7 +2204,7 @@ "sha256:fa2ba70284fa42c2a5ecb35e322e68823288a4251f9ba9cc77be04ae15eada68", "sha256:fba85b6cd9c39be262fcd23865652920832b61583de2a2ca907dbd8e8a8c81e5" ], - "markers": "python_version > '2.7'", + "markers": "python_version >= '3.5'", "version": "==6.1" }, "tox": { @@ -2229,15 +2238,6 @@ ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==20.14.1" - }, - "zipp": { - "hashes": [ - "sha256:56bf8aadb83c24db6c4b577e13de374ccfb67da2078beba1d037c17980bf43ad", - "sha256:c4f6e5bbf48e74f7a38e7cc5b0480ff42b0ae5178957d564d18932525d5cf099" - ], - "index": "pypi", - "markers": "python_version < '3.9'", - "version": "==3.8.0" } } } diff --git a/requirements.txt b/requirements.txt index a9b584b60..ebb4f2b11 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,15 +5,15 @@ # pipenv lock --requirements # --i https://pypi.python.org/simple ---extra-index-url https://www.piwheels.org/simple +-i https://pypi.python.org/simple/ +--extra-index-url https://www.piwheels.org/simple/ aioredis==1.3.1 anyio==3.6.1; python_full_version >= '3.6.2' arrow==1.2.2; python_version >= '3.6' asgiref==3.5.2; python_version >= '3.7' async-timeout==4.0.2; python_version >= '3.6' attrs==21.4.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' -autobahn==22.4.2; python_version >= '3.7' +autobahn==22.5.1; python_version >= '3.7' automat==20.2.0 backports.zoneinfo==0.2.1; python_version < '3.9' blessed==1.19.1; python_version >= '2.7' @@ -21,7 +21,7 @@ certifi==2022.5.18.1; python_version >= '3.6' cffi==1.15.0 channels-redis==3.4.0 channels==3.0.4 -charset-normalizer==2.0.12; python_full_version >= '3.5.0' +charset-normalizer==2.0.12; python_version >= '3.5' click==8.1.3; python_version >= '3.7' coloredlogs==15.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' concurrent-log-handler==0.9.20 @@ -44,7 +44,7 @@ hiredis==2.0.0; python_version >= '3.6' httptools==0.4.0 humanfriendly==10.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' hyperlink==21.0.0 -idna==3.3; python_version >= '3' +idna==3.3; python_version >= '3.5' imap-tools==0.55.0 img2pdf==0.4.4 importlib-resources==5.7.1; python_version < '3.9' @@ -53,8 +53,8 @@ inotify-simple==1.3.5; python_version >= '2.7' and python_version not in '3.0, 3 inotifyrecursive==0.3.5 joblib==1.1.0; python_version >= '3.6' langdetect==1.0.9 -lxml==4.8.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' -msgpack==1.0.3 +lxml==4.9.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' +msgpack==1.0.4 numpy==1.22.4; python_version >= '3.8' ocrmypdf==13.4.4 packaging==21.3; python_version >= '3.6' @@ -82,15 +82,15 @@ pyyaml==6.0 pyzbar==0.1.9 redis==3.5.3 regex==2022.3.2; python_version >= '3.6' -reportlab==3.6.9; python_version >= '3.7' and python_version < '4' +reportlab==3.6.10; python_version >= '3.7' and python_version < '4' requests==2.27.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' scikit-learn==1.0.2 scipy==1.8.1; python_version < '3.11' and python_version >= '3.8' service-identity==21.1.0 setuptools==62.3.2; python_version >= '3.7' six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' -sniffio==1.2.0; python_full_version >= '3.5.0' -sqlparse==0.4.2; python_full_version >= '3.5.0' +sniffio==1.2.0; python_version >= '3.5' +sqlparse==0.4.2; python_version >= '3.5' threadpoolctl==3.1.0; python_version >= '3.6' tika==1.24 tqdm==4.64.0 @@ -106,7 +106,7 @@ watchdog==2.1.8 watchgod==0.8.2 wcwidth==0.2.5 websockets==10.3 -whitenoise==6.1.0 +whitenoise==6.2.0 whoosh==2.7.4 zipp==3.8.0; python_version < '3.9' zope.interface==5.4.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' From 441a6bab138c7dcd5b2366320b56b373c112288a Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Wed, 8 Jun 2022 12:04:30 -0700 Subject: [PATCH 180/291] Re-locks all dependencies and manually downgrades reportlab to 3.6.9 until piwheels issue is fixed --- Pipfile.lock | 106 ++++++++++++++++++++++++----------------------- requirements.txt | 25 +++++------ 2 files changed, 67 insertions(+), 64 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 45dd915d2..272c44be8 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -230,29 +230,31 @@ }, "cryptography": { "hashes": [ - "sha256:0a3bf09bb0b7a2c93ce7b98cb107e9170a90c51a0162a20af1c61c765b90e60b", - "sha256:1f64a62b3b75e4005df19d3b5235abd43fa6358d5516cfc43d87aeba8d08dd51", - "sha256:32db5cc49c73f39aac27574522cecd0a4bb7384e71198bc65a0d23f901e89bb7", - "sha256:4881d09298cd0b669bb15b9cfe6166f16fc1277b4ed0d04a22f3d6430cb30f1d", - "sha256:4e2dddd38a5ba733be6a025a1475a9f45e4e41139d1321f412c6b360b19070b6", - "sha256:53e0285b49fd0ab6e604f4c5d9c5ddd98de77018542e88366923f152dbeb3c29", - "sha256:70f8f4f7bb2ac9f340655cbac89d68c527af5bb4387522a8413e841e3e6628c9", - "sha256:7b2d54e787a884ffc6e187262823b6feb06c338084bbe80d45166a1cb1c6c5bf", - "sha256:7be666cc4599b415f320839e36367b273db8501127b38316f3b9f22f17a0b815", - "sha256:8241cac0aae90b82d6b5c443b853723bcc66963970c67e56e71a2609dc4b5eaf", - "sha256:82740818f2f240a5da8dfb8943b360e4f24022b093207160c77cadade47d7c85", - "sha256:8897b7b7ec077c819187a123174b645eb680c13df68354ed99f9b40a50898f77", - "sha256:c2c5250ff0d36fd58550252f54915776940e4e866f38f3a7866d92b32a654b86", - "sha256:ca9f686517ec2c4a4ce930207f75c00bf03d94e5063cbc00a1dc42531511b7eb", - "sha256:d2b3d199647468d410994dbeb8cec5816fb74feb9368aedf300af709ef507e3e", - "sha256:da73d095f8590ad437cd5e9faf6628a218aa7c387e1fdf67b888b47ba56a17f0", - "sha256:e167b6b710c7f7bc54e67ef593f8731e1f45aa35f8a8a7b72d6e42ec76afd4b3", - "sha256:ea634401ca02367c1567f012317502ef3437522e2fc44a3ea1844de028fa4b84", - "sha256:ec6597aa85ce03f3e507566b8bcdf9da2227ec86c4266bd5e6ab4d9e0cc8dab2", - "sha256:f64b232348ee82f13aac22856515ce0195837f6968aeaa94a3d0353ea2ec06a6" + "sha256:093cb351031656d3ee2f4fa1be579a8c69c754cf874206be1d4cf3b542042804", + "sha256:0cc20f655157d4cfc7bada909dc5cc228211b075ba8407c46467f63597c78178", + "sha256:1b9362d34363f2c71b7853f6251219298124aa4cc2075ae2932e64c91a3e2717", + "sha256:1f3bfbd611db5cb58ca82f3deb35e83af34bb8cf06043fa61500157d50a70982", + "sha256:2bd1096476aaac820426239ab534b636c77d71af66c547b9ddcd76eb9c79e004", + "sha256:31fe38d14d2e5f787e0aecef831457da6cec68e0bb09a35835b0b44ae8b988fe", + "sha256:3b8398b3d0efc420e777c40c16764d6870bcef2eb383df9c6dbb9ffe12c64452", + "sha256:3c81599befb4d4f3d7648ed3217e00d21a9341a9a688ecdd615ff72ffbed7336", + "sha256:419c57d7b63f5ec38b1199a9521d77d7d1754eb97827bbb773162073ccd8c8d4", + "sha256:46f4c544f6557a2fefa7ac8ac7d1b17bf9b647bd20b16decc8fbcab7117fbc15", + "sha256:471e0d70201c069f74c837983189949aa0d24bb2d751b57e26e3761f2f782b8d", + "sha256:59b281eab51e1b6b6afa525af2bd93c16d49358404f814fe2c2410058623928c", + "sha256:731c8abd27693323b348518ed0e0705713a36d79fdbd969ad968fbef0979a7e0", + "sha256:95e590dd70642eb2079d280420a888190aa040ad20f19ec8c6e097e38aa29e06", + "sha256:a68254dd88021f24a68b613d8c51d5c5e74d735878b9e32cc0adf19d1f10aaf9", + "sha256:a7d5137e556cc0ea418dca6186deabe9129cee318618eb1ffecbd35bee55ddc1", + "sha256:aeaba7b5e756ea52c8861c133c596afe93dd716cbcacae23b80bc238202dc023", + "sha256:dc26bb134452081859aa21d4990474ddb7e863aa39e60d1592800a8865a702de", + "sha256:e53258e69874a306fcecb88b7534d61820db8a98655662a3dd2ec7f1afd9132f", + "sha256:ef15c2df7656763b4ff20a9bc4381d8352e6640cfeb95c2972c38ef508e75181", + "sha256:f224ad253cc9cea7568f49077007d2263efa57396a2f2f78114066fd54b5c68e", + "sha256:f8ec91983e638a9bcd75b39f1396e5c0dc2330cbd9ce4accefe68717e6779e0a" ], "markers": "python_version >= '3.6'", - "version": "==36.0.2" + "version": "==37.0.2" }, "daphne": { "hashes": [ @@ -272,19 +274,19 @@ }, "django": { "hashes": [ - "sha256:07c8638e7a7f548dc0acaaa7825d84b7bd42b10e8d22268b3d572946f1e9b687", - "sha256:4e8177858524417563cc0430f29ea249946d831eacb0068a1455686587df40b5" + "sha256:502ae42b6ab1b612c933fb50d5ff850facf858a4c212f76946ecd8ea5b3bf2d9", + "sha256:f7431a5de7277966f3785557c3928433347d998c1e6459324501378a291e5aab" ], "index": "pypi", - "version": "==4.0.4" + "version": "==4.0.5" }, "django-cors-headers": { "hashes": [ - "sha256:39d1d5acb872c1860ecfd88b8572bfbb3a1f201b5685ede951d71fc57c7dfae5", - "sha256:5f07e2ff8a95c887698e748588a4a0b2ad0ad1b5a292e2d33132f1253e2a97cb" + "sha256:37e42883b5f1f2295df6b4bba96eb2417a14a03270cb24b2a07f021cd4487cf4", + "sha256:f9dc6b4e3f611c3199700b3e5f3398c28757dcd559c2f82932687f3d0443cfdf" ], "index": "pypi", - "version": "==3.12.0" + "version": "==3.13.0" }, "django-extensions": { "hashes": [ @@ -328,11 +330,11 @@ }, "filelock": { "hashes": [ - "sha256:b795f1b42a61bbf8ec7113c341dad679d772567b936fbd1bf43c9a238e673e20", - "sha256:c7b5fdb219b398a5b28c8e4c1893ef5f98ece6a38c6ab2c22e26ec161556fed6" + "sha256:37def7b658813cda163b56fc564cdc75e86d338246458c4c28ae84cabefa2404", + "sha256:3a0fd85166ad9dbab54c9aec96737b744106dc5f15c0b09a6744a445299fcf04" ], "index": "pypi", - "version": "==3.7.0" + "version": "==3.7.1" }, "fuzzywuzzy": { "extras": [ @@ -467,7 +469,7 @@ "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff", "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" ], - "markers": "python_version >= '3.5'", + "markers": "python_version >= '3'", "version": "==3.3" }, "imap-tools": { @@ -686,11 +688,11 @@ }, "ocrmypdf": { "hashes": [ - "sha256:1169e7acee4cb12d0d61ca1c2cf1f78250ed5d2d0e33fd68f58defbaf3770af7", - "sha256:d132a9e5dcd73a477f8bd89f15de2c4ae64b394ca296644971fcd004168ace9d" + "sha256:7bf9a20bcc8d0c01712d8413a0a7275c32a95accc2de75e7bc6f6e69af468e3f", + "sha256:8a0a2fa07cf0aac4dea11990d27a15b552afa7ff2dfffdb322bfd8bd0b77751d" ], "index": "pypi", - "version": "==13.4.4" + "version": "==13.4.7" }, "packaging": { "hashes": [ @@ -718,11 +720,11 @@ }, "pdfminer.six": { "hashes": [ - "sha256:0960be95fe8724a4847f83d53d0331b890871f6035ba706841568caa2b541bf5", - "sha256:3d65c1a0f4a0465c709e191550ec77a684ebe0bcb562337ccbfb7aa228c52076" + "sha256:5a64c924410ac48501d6060b21638bf401db69f5b1bd57207df7fbc070ac8ae2", + "sha256:7e19b857ec76bcbd35665909ad8965a481ad48d9bdff6c45f8522ee66f8a7aab" ], "index": "pypi", - "version": "==20220506" + "version": "==20220524" }, "pikepdf": { "hashes": [ @@ -925,11 +927,11 @@ }, "python-magic": { "hashes": [ - "sha256:8262c13001f904ad5b724d38b5e5b5f17ec0450ae249def398a62e4e33108a50", - "sha256:b978c4b69a20510d133a7f488910c2f07e7796f1f31703e61c241973f2bbf5fb" + "sha256:c1ba14b08e4a5f5c31a302b7721239695b2f0f058d125bd5ce1ee36b9d9d3c3b", + "sha256:c212960ad306f700aa0d01e5d7a325d20548ff97eb9920dcd29513174f0294d3" ], "index": "pypi", - "version": "==0.4.26" + "version": "==0.4.27" }, "pytz": { "hashes": [ @@ -1207,11 +1209,11 @@ }, "setuptools": { "hashes": [ - "sha256:68e45d17c9281ba25dc0104eadd2647172b3472d9e01f911efa57965e8d51a36", - "sha256:a43bdedf853c670e5fed28e5623403bad2f73cf02f9a2774e91def6bda8265a7" + "sha256:d1746e7fd520e83bbe210d02fff1aa1a425ad671c7a9da7d246ec2401a087198", + "sha256:e7d11f3db616cda0751372244c2ba798e8e56a28e096ec4529010b803485f3fe" ], "markers": "python_version >= '3.7'", - "version": "==62.3.2" + "version": "==62.3.3" }, "six": { "hashes": [ @@ -1722,11 +1724,11 @@ }, "filelock": { "hashes": [ - "sha256:b795f1b42a61bbf8ec7113c341dad679d772567b936fbd1bf43c9a238e673e20", - "sha256:c7b5fdb219b398a5b28c8e4c1893ef5f98ece6a38c6ab2c22e26ec161556fed6" + "sha256:37def7b658813cda163b56fc564cdc75e86d338246458c4c28ae84cabefa2404", + "sha256:3a0fd85166ad9dbab54c9aec96737b744106dc5f15c0b09a6744a445299fcf04" ], "index": "pypi", - "version": "==3.7.0" + "version": "==3.7.1" }, "identify": { "hashes": [ @@ -1741,7 +1743,7 @@ "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff", "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" ], - "markers": "python_version >= '3.5'", + "markers": "python_version >= '3'", "version": "==3.3" }, "imagesize": { @@ -1852,11 +1854,11 @@ }, "myst-parser": { "hashes": [ - "sha256:1635ce3c18965a528d6de980f989ff64d6a1effb482e1f611b1bfb79e38f3d98", - "sha256:4c076d649e066f9f5c7c661bae2658be1ca06e76b002bb97f02a09398707686c" + "sha256:4965e51918837c13bf1c6f6fe2c6bddddf193148360fbdaefe743a4981358f6a", + "sha256:739a4d96773a8e55a2cacd3941ce46a446ee23dcd6b37e06f73f551ad7821d86" ], "index": "pypi", - "version": "==0.17.2" + "version": "==0.18.0" }, "nodeenv": { "hashes": [ @@ -2157,7 +2159,7 @@ "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f" ], - "markers": "python_version >= '3.7'", + "markers": "python_version < '3.11'", "version": "==2.0.1" }, "tornado": { @@ -2204,7 +2206,7 @@ "sha256:fa2ba70284fa42c2a5ecb35e322e68823288a4251f9ba9cc77be04ae15eada68", "sha256:fba85b6cd9c39be262fcd23865652920832b61583de2a2ca907dbd8e8a8c81e5" ], - "markers": "python_version >= '3.5'", + "markers": "python_version > '2.7'", "version": "==6.1" }, "tox": { diff --git a/requirements.txt b/requirements.txt index ebb4f2b11..339ce8070 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,8 +5,8 @@ # pipenv lock --requirements # --i https://pypi.python.org/simple/ ---extra-index-url https://www.piwheels.org/simple/ +-i https://pypi.python.org/simple +--extra-index-url https://www.piwheels.org/simple aioredis==1.3.1 anyio==3.6.1; python_full_version >= '3.6.2' arrow==1.2.2; python_version >= '3.6' @@ -26,17 +26,17 @@ click==8.1.3; python_version >= '3.7' coloredlogs==15.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' concurrent-log-handler==0.9.20 constantly==15.1.0 -cryptography==36.0.2; python_version >= '3.6' +cryptography==37.0.2; python_version >= '3.6' daphne==3.0.2; python_version >= '3.6' dateparser==1.1.1 -django-cors-headers==3.12.0 +django-cors-headers==3.13.0 django-extensions==3.1.5 django-filter==21.1 django-picklefield==3.0.1; python_version >= '3' django-q==1.3.9 -django==4.0.4 +django==4.0.5 djangorestframework==3.13.1 -filelock==3.7.0 +filelock==3.7.1 fuzzywuzzy[speedup]==0.18.0 gunicorn==20.1.0 h11==0.13.0; python_version >= '3.6' @@ -44,7 +44,7 @@ hiredis==2.0.0; python_version >= '3.6' httptools==0.4.0 humanfriendly==10.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' hyperlink==21.0.0 -idna==3.3; python_version >= '3.5' +idna==3.3; python_version >= '3' imap-tools==0.55.0 img2pdf==0.4.4 importlib-resources==5.7.1; python_version < '3.9' @@ -56,11 +56,11 @@ langdetect==1.0.9 lxml==4.9.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' msgpack==1.0.4 numpy==1.22.4; python_version >= '3.8' -ocrmypdf==13.4.4 +ocrmypdf==13.4.7 packaging==21.3; python_version >= '3.6' pathvalidate==2.5.0 pdf2image==1.16.0 -pdfminer.six==20220506 +pdfminer.six==20220524 pikepdf==5.1.3 pillow==9.1.1 pluggy==1.0.0; python_version >= '3.6' @@ -75,19 +75,20 @@ python-dateutil==2.8.2 python-dotenv==0.20.0 python-gnupg==0.4.9 python-levenshtein==0.12.2 -python-magic==0.4.26 +python-magic==0.4.27 pytz-deprecation-shim==0.1.0.post0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' pytz==2022.1 pyyaml==6.0 pyzbar==0.1.9 redis==3.5.3 regex==2022.3.2; python_version >= '3.6' -reportlab==3.6.10; python_version >= '3.7' and python_version < '4' +# WARNING: Temporary manual change as piwheels build failed for 3.6.10 +reportlab==3.6.9; python_version >= '3.7' and python_version < '4' requests==2.27.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' scikit-learn==1.0.2 scipy==1.8.1; python_version < '3.11' and python_version >= '3.8' service-identity==21.1.0 -setuptools==62.3.2; python_version >= '3.7' +setuptools==62.3.3; python_version >= '3.7' six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' sniffio==1.2.0; python_version >= '3.5' sqlparse==0.4.2; python_version >= '3.5' From 4d98208a2afa4ff4596cc8c123de87eabb778e9a Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Wed, 8 Jun 2022 10:33:19 -0700 Subject: [PATCH 181/291] Updates the wheel builders to let pip handle finding the sdist of the required package and version --- .github/scripts/get-build-json.py | 10 ---------- .github/workflows/installer-library.yml | 2 -- Dockerfile | 12 ++++++------ build-docker-image.sh | 1 + docker-builders/Dockerfile.pikepdf | 25 +++++++++++-------------- docker-builders/Dockerfile.psycopg2 | 17 +++++++++++------ 6 files changed, 29 insertions(+), 38 deletions(-) diff --git a/.github/scripts/get-build-json.py b/.github/scripts/get-build-json.py index 42299abae..0bb140b03 100755 --- a/.github/scripts/get-build-json.py +++ b/.github/scripts/get-build-json.py @@ -50,7 +50,6 @@ def _main(): # Default output values version = None - git_tag = None extra_config = {} if args.package in pipfile_data["default"]: @@ -59,12 +58,6 @@ def _main(): pkg_version = pkg_data["version"].split("==")[-1] version = pkg_version - # Based on the package, generate the expected Git tag name - if args.package == "pikepdf": - git_tag = f"v{pkg_version}" - elif args.package == "psycopg2": - git_tag = pkg_version.replace(".", "_") - # Any extra/special values needed if args.package == "pikepdf": extra_config["qpdf_version"] = build_json["qpdf"]["version"] @@ -72,8 +65,6 @@ def _main(): elif args.package in build_json: version = build_json[args.package]["version"] - if "git_tag" in build_json[args.package]: - git_tag = build_json[args.package]["git_tag"] else: raise NotImplementedError(args.package) @@ -81,7 +72,6 @@ def _main(): output = { "name": args.package, "version": version, - "git_tag": git_tag, "image_tag": get_image_tag(repo_name, args.package, version), "cache_tag": get_cache_image_tag( repo_name, diff --git a/.github/workflows/installer-library.yml b/.github/workflows/installer-library.yml index 77a66e5d2..effa8278f 100644 --- a/.github/workflows/installer-library.yml +++ b/.github/workflows/installer-library.yml @@ -122,7 +122,6 @@ jobs: dockerfile: ./docker-builders/Dockerfile.psycopg2 build-json: ${{ needs.prepare-docker-build.outputs.psycopg2-json }} build-args: | - PSYCOPG2_GIT_TAG=${{ fromJSON(needs.prepare-docker-build.outputs.psycopg2-json).git_tag }} PSYCOPG2_VERSION=${{ fromJSON(needs.prepare-docker-build.outputs.psycopg2-json).version }} build-pikepdf-wheel: @@ -137,5 +136,4 @@ jobs: build-args: | REPO=${{ github.repository }} QPDF_VERSION=${{ fromJSON(needs.prepare-docker-build.outputs.qpdf-json).version }} - PIKEPDF_GIT_TAG=${{ fromJSON(needs.prepare-docker-build.outputs.pikepdf-json).git_tag }} PIKEPDF_VERSION=${{ fromJSON(needs.prepare-docker-build.outputs.pikepdf-json).version }} diff --git a/Dockerfile b/Dockerfile index b1ff73181..c75a3e3aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -151,14 +151,14 @@ RUN --mount=type=bind,from=qpdf-builder,target=/qpdf \ && apt-get install --yes --no-install-recommends /qpdf/usr/src/qpdf/libqpdf28_*.deb \ && apt-get install --yes --no-install-recommends /qpdf/usr/src/qpdf/qpdf_*.deb \ && echo "Installing pikepdf and dependencies" \ - && python3 -m pip install --no-cache-dir /pikepdf/usr/src/pikepdf/wheels/packaging*.whl \ - && python3 -m pip install --no-cache-dir /pikepdf/usr/src/pikepdf/wheels/lxml*.whl \ - && python3 -m pip install --no-cache-dir /pikepdf/usr/src/pikepdf/wheels/Pillow*.whl \ - && python3 -m pip install --no-cache-dir /pikepdf/usr/src/pikepdf/wheels/pyparsing*.whl \ - && python3 -m pip install --no-cache-dir /pikepdf/usr/src/pikepdf/wheels/pikepdf*.whl \ + && python3 -m pip install --no-cache-dir /pikepdf/usr/src/wheels/packaging*.whl \ + && python3 -m pip install --no-cache-dir /pikepdf/usr/src/wheels/lxml*.whl \ + && python3 -m pip install --no-cache-dir /pikepdf/usr/src/wheels/Pillow*.whl \ + && python3 -m pip install --no-cache-dir /pikepdf/usr/src/wheels/pyparsing*.whl \ + && python3 -m pip install --no-cache-dir /pikepdf/usr/src/wheels/pikepdf*.whl \ && python -m pip list \ && echo "Installing psycopg2" \ - && python3 -m pip install --no-cache-dir /psycopg2/usr/src/psycopg2/wheels/psycopg2*.whl \ + && python3 -m pip install --no-cache-dir /psycopg2/usr/src/wheels/psycopg2*.whl \ && python -m pip list # Python dependencies diff --git a/build-docker-image.sh b/build-docker-image.sh index ed20589f4..3c868344e 100755 --- a/build-docker-image.sh +++ b/build-docker-image.sh @@ -34,6 +34,7 @@ branch_name=$(git rev-parse --abbrev-ref HEAD) export DOCKER_BUILDKIT=1 docker build --file "$1" \ + --progress=plain \ --cache-from ghcr.io/paperless-ngx/paperless-ngx/builder/cache/app:"${branch_name}" \ --cache-from ghcr.io/paperless-ngx/paperless-ngx/builder/cache/app:dev \ --build-arg JBIG2ENC_VERSION="${jbig2enc_version}" \ diff --git a/docker-builders/Dockerfile.pikepdf b/docker-builders/Dockerfile.pikepdf index d37014126..3e16d8067 100644 --- a/docker-builders/Dockerfile.pikepdf +++ b/docker-builders/Dockerfile.pikepdf @@ -23,7 +23,6 @@ ARG BUILD_PACKAGES="\ build-essential \ python3-dev \ python3-pip \ - git \ # qpdf requirement - https://github.com/qpdf/qpdf#crypto-providers libgnutls28-dev \ # lxml requrements - https://lxml.de/installation.html @@ -72,21 +71,19 @@ RUN set -eux \ # For better caching, seperate the basic installs from # the building -ARG PIKEPDF_GIT_TAG ARG PIKEPDF_VERSION RUN set -eux \ - && echo "building pikepdf wheel" \ - # Note the v in the tag name here - && git clone --quiet --depth 1 --branch "${PIKEPDF_GIT_TAG}" https://github.com/pikepdf/pikepdf.git \ - && cd pikepdf \ - # pikepdf seems to specifciy either a next version when built OR - # a post release tag. - # In either case, this won't match what we want from requirements.txt - # Directly modify the setup.py to set the version we just checked out of Git - && sed -i "s/use_scm_version=True/version=\"${PIKEPDF_VERSION}\"/g" setup.py \ - # https://github.com/pikepdf/pikepdf/issues/323 - && rm pyproject.toml \ + && echo "Building pikepdf wheel ${PIKEPDF_VERSION}" \ && mkdir wheels \ - && python3 -m pip wheel . --wheel-dir wheels \ + && python3 -m pip wheel \ + # Build the package at the requried version + pikepdf==${PIKEPDF_VERSION} \ + # Output the *.whl into this directory + --wheel-dir wheels \ + # Do not use a binary packge for the package being built + --no-binary=pikepdf \ + # Do use binary packages for dependencies + --prefer-binary \ + --no-cache-dir \ && ls -ahl wheels diff --git a/docker-builders/Dockerfile.psycopg2 b/docker-builders/Dockerfile.psycopg2 index 78bdf2438..7fc59fc22 100644 --- a/docker-builders/Dockerfile.psycopg2 +++ b/docker-builders/Dockerfile.psycopg2 @@ -11,7 +11,6 @@ ARG DEBIAN_FRONTEND=noninteractive ARG BUILD_PACKAGES="\ build-essential \ - git \ python3-dev \ python3-pip \ # https://www.psycopg.org/docs/install.html#prerequisites @@ -32,14 +31,20 @@ RUN set -eux \ # For better caching, seperate the basic installs from # the building -ARG PSYCOPG2_GIT_TAG ARG PSYCOPG2_VERSION RUN set -eux \ - && echo "Building psycopg2 wheel" \ + && echo "Building psycopg2 wheel ${PSYCOPG2_VERSION}" \ && cd /usr/src \ - && git clone --quiet --depth 1 --branch ${PSYCOPG2_GIT_TAG} https://github.com/psycopg/psycopg2.git \ - && cd psycopg2 \ && mkdir wheels \ - && python3 -m pip wheel . --wheel-dir wheels \ + && python3 -m pip wheel \ + # Build the package at the requried version + psycopg2==${PSYCOPG2_VERSION} \ + # Output the *.whl into this directory + --wheel-dir wheels \ + # Do not use a binary packge for the package being built + --no-binary=psycopg2 \ + # Do use binary packages for dependencies + --prefer-binary \ + --no-cache-dir \ && ls -ahl wheels/ From fd0a8a4cb3247296f2054f05a7ed29b696d198f4 Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Wed, 8 Jun 2022 12:30:18 -0700 Subject: [PATCH 182/291] Removes references to now not set or used build args --- docker-builders/Dockerfile.pikepdf | 5 ++--- docker-builders/Dockerfile.psycopg2 | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docker-builders/Dockerfile.pikepdf b/docker-builders/Dockerfile.pikepdf index 3e16d8067..ff7086b7c 100644 --- a/docker-builders/Dockerfile.pikepdf +++ b/docker-builders/Dockerfile.pikepdf @@ -2,8 +2,7 @@ # Inputs: # - REPO - Docker repository to pull qpdf from # - QPDF_VERSION - The image qpdf version to copy .deb files from -# - PIKEPDF_GIT_TAG - The Git tag to clone and build from -# - PIKEPDF_VERSION - Used to force the built pikepdf version to match +# - PIKEPDF_VERSION - Version of pikepdf to build wheel for # Default to pulling from the main repo registry when manually building ARG REPO="paperless-ngx/paperless-ngx" @@ -77,7 +76,7 @@ RUN set -eux \ && echo "Building pikepdf wheel ${PIKEPDF_VERSION}" \ && mkdir wheels \ && python3 -m pip wheel \ - # Build the package at the requried version + # Build the package at the required version pikepdf==${PIKEPDF_VERSION} \ # Output the *.whl into this directory --wheel-dir wheels \ diff --git a/docker-builders/Dockerfile.psycopg2 b/docker-builders/Dockerfile.psycopg2 index 7fc59fc22..5e6157a02 100644 --- a/docker-builders/Dockerfile.psycopg2 +++ b/docker-builders/Dockerfile.psycopg2 @@ -1,7 +1,6 @@ # This Dockerfile builds the psycopg2 wheel # Inputs: -# - PSYCOPG2_GIT_TAG - The Git tag to clone and build from -# - PSYCOPG2_VERSION - Unused, kept for future possible usage +# - PSYCOPG2_VERSION - Version to build FROM python:3.9-slim-bullseye as main @@ -38,7 +37,7 @@ RUN set -eux \ && cd /usr/src \ && mkdir wheels \ && python3 -m pip wheel \ - # Build the package at the requried version + # Build the package at the required version psycopg2==${PSYCOPG2_VERSION} \ # Output the *.whl into this directory --wheel-dir wheels \ From e74198501d765ceea1d0d9714df0bb47162ee148 Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Fri, 6 May 2022 10:26:16 -0700 Subject: [PATCH 183/291] Changes to the forked django-q --- Pipfile | 2 +- Pipfile.lock | 95 +++++++++++++++++++++++++++++++++++++++++++----- requirements.txt | 9 +++-- 3 files changed, 91 insertions(+), 15 deletions(-) diff --git a/Pipfile b/Pipfile index 13f8d5317..2308883ab 100644 --- a/Pipfile +++ b/Pipfile @@ -14,7 +14,7 @@ django = "~=4.0" django-cors-headers = "*" django-extensions = "*" django-filter = "~=21.1" -django-q = "~=1.3" +django-q = {editable = true, ref = "relock-deps", git = "https://github.com/stumpylog/django-q.git"} djangorestframework = "~=3.13" filelock = "*" fuzzywuzzy = {extras = ["speedup"], version = "*"} diff --git a/Pipfile.lock b/Pipfile.lock index 272c44be8..d20b9702b 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "416f74762bd0d17c4b9543a61d1153adbd330cda8c6654e35fdbfeaf5955d5e5" + "sha256": "1d3e45af4ae34722d55a93f3255fc60f5f95b2671d46fb97e4f06323bf8667c4" }, "pipfile-spec": 6, "requires": {}, @@ -272,6 +272,14 @@ "index": "pypi", "version": "==1.1.1" }, + "deprecated": { + "hashes": [ + "sha256:43ac5335da90c31c24ba028af536a91d41d53f9e6901ddb021bcc572ce44e38d", + "sha256:64756e3e14c8c5eea9795d93c524551432a0be75629f8f29e67ab8caf076c76d" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==1.2.13" + }, "django": { "hashes": [ "sha256:502ae42b6ab1b612c933fb50d5ff850facf858a4c212f76946ecd8ea5b3bf2d9", @@ -313,12 +321,9 @@ "version": "==3.0.1" }, "django-q": { - "hashes": [ - "sha256:1b74ce3a8931990b136903e3a7bc9b07243282a2b5355117246f05ed5d076e68", - "sha256:5c6b4d530aa3aabf9c6aa57376da1ca2abf89a1562b77038b7a04e52a4a0a91b" - ], - "index": "pypi", - "version": "==1.3.9" + "editable": true, + "git": "https://github.com/stumpylog/django-q.git", + "ref": "20aa962739d41ea187540267e92bc01539c914d6" }, "djangorestframework": { "hashes": [ @@ -997,11 +1002,11 @@ }, "redis": { "hashes": [ - "sha256:0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2", - "sha256:432b788c4530cfe16d8d943a09d40ca6c16149727e4afe8c2c9d5580c59d9f24" + "sha256:2f7a57cf4af15cd543c4394bcbe2b9148db2606a37edba755368836e3a1d053e", + "sha256:f57f8df5d238a8ecf92f499b6b21467bfee6c13d89953c27edf1e2bc673622e7" ], "index": "pypi", - "version": "==3.5.3" + "version": "==4.3.3" }, "regex": { "hashes": [ @@ -1460,6 +1465,76 @@ "index": "pypi", "version": "==2.7.4" }, + "wrapt": { + "hashes": [ + "sha256:00b6d4ea20a906c0ca56d84f93065b398ab74b927a7a3dbd470f6fc503f95dc3", + "sha256:01c205616a89d09827986bc4e859bcabd64f5a0662a7fe95e0d359424e0e071b", + "sha256:02b41b633c6261feff8ddd8d11c711df6842aba629fdd3da10249a53211a72c4", + "sha256:07f7a7d0f388028b2df1d916e94bbb40624c59b48ecc6cbc232546706fac74c2", + "sha256:11871514607b15cfeb87c547a49bca19fde402f32e2b1c24a632506c0a756656", + "sha256:1b376b3f4896e7930f1f772ac4b064ac12598d1c38d04907e696cc4d794b43d3", + "sha256:21ac0156c4b089b330b7666db40feee30a5d52634cc4560e1905d6529a3897ff", + "sha256:257fd78c513e0fb5cdbe058c27a0624c9884e735bbd131935fd49e9fe719d310", + "sha256:2b39d38039a1fdad98c87279b48bc5dce2c0ca0d73483b12cb72aa9609278e8a", + "sha256:2cf71233a0ed05ccdabe209c606fe0bac7379fdcf687f39b944420d2a09fdb57", + "sha256:2fe803deacd09a233e4762a1adcea5db5d31e6be577a43352936179d14d90069", + "sha256:3232822c7d98d23895ccc443bbdf57c7412c5a65996c30442ebe6ed3df335383", + "sha256:34aa51c45f28ba7f12accd624225e2b1e5a3a45206aa191f6f9aac931d9d56fe", + "sha256:36f582d0c6bc99d5f39cd3ac2a9062e57f3cf606ade29a0a0d6b323462f4dd87", + "sha256:380a85cf89e0e69b7cfbe2ea9f765f004ff419f34194018a6827ac0e3edfed4d", + "sha256:40e7bc81c9e2b2734ea4bc1aceb8a8f0ceaac7c5299bc5d69e37c44d9081d43b", + "sha256:43ca3bbbe97af00f49efb06e352eae40434ca9d915906f77def219b88e85d907", + "sha256:4fcc4649dc762cddacd193e6b55bc02edca674067f5f98166d7713b193932b7f", + "sha256:5a0f54ce2c092aaf439813735584b9537cad479575a09892b8352fea5e988dc0", + "sha256:5a9a0d155deafd9448baff28c08e150d9b24ff010e899311ddd63c45c2445e28", + "sha256:5b02d65b9ccf0ef6c34cba6cf5bf2aab1bb2f49c6090bafeecc9cd81ad4ea1c1", + "sha256:60db23fa423575eeb65ea430cee741acb7c26a1365d103f7b0f6ec412b893853", + "sha256:642c2e7a804fcf18c222e1060df25fc210b9c58db7c91416fb055897fc27e8cc", + "sha256:6a9a25751acb379b466ff6be78a315e2b439d4c94c1e99cb7266d40a537995d3", + "sha256:6b1a564e6cb69922c7fe3a678b9f9a3c54e72b469875aa8018f18b4d1dd1adf3", + "sha256:6d323e1554b3d22cfc03cd3243b5bb815a51f5249fdcbb86fda4bf62bab9e164", + "sha256:6e743de5e9c3d1b7185870f480587b75b1cb604832e380d64f9504a0535912d1", + "sha256:709fe01086a55cf79d20f741f39325018f4df051ef39fe921b1ebe780a66184c", + "sha256:7b7c050ae976e286906dd3f26009e117eb000fb2cf3533398c5ad9ccc86867b1", + "sha256:7d2872609603cb35ca513d7404a94d6d608fc13211563571117046c9d2bcc3d7", + "sha256:7ef58fb89674095bfc57c4069e95d7a31cfdc0939e2a579882ac7d55aadfd2a1", + "sha256:80bb5c256f1415f747011dc3604b59bc1f91c6e7150bd7db03b19170ee06b320", + "sha256:81b19725065dcb43df02b37e03278c011a09e49757287dca60c5aecdd5a0b8ed", + "sha256:833b58d5d0b7e5b9832869f039203389ac7cbf01765639c7309fd50ef619e0b1", + "sha256:88bd7b6bd70a5b6803c1abf6bca012f7ed963e58c68d76ee20b9d751c74a3248", + "sha256:8ad85f7f4e20964db4daadcab70b47ab05c7c1cf2a7c1e51087bfaa83831854c", + "sha256:8c0ce1e99116d5ab21355d8ebe53d9460366704ea38ae4d9f6933188f327b456", + "sha256:8d649d616e5c6a678b26d15ece345354f7c2286acd6db868e65fcc5ff7c24a77", + "sha256:903500616422a40a98a5a3c4ff4ed9d0066f3b4c951fa286018ecdf0750194ef", + "sha256:9736af4641846491aedb3c3f56b9bc5568d92b0692303b5a305301a95dfd38b1", + "sha256:988635d122aaf2bdcef9e795435662bcd65b02f4f4c1ae37fbee7401c440b3a7", + "sha256:9cca3c2cdadb362116235fdbd411735de4328c61425b0aa9f872fd76d02c4e86", + "sha256:9e0fd32e0148dd5dea6af5fee42beb949098564cc23211a88d799e434255a1f4", + "sha256:9f3e6f9e05148ff90002b884fbc2a86bd303ae847e472f44ecc06c2cd2fcdb2d", + "sha256:a85d2b46be66a71bedde836d9e41859879cc54a2a04fad1191eb50c2066f6e9d", + "sha256:a9a52172be0b5aae932bef82a79ec0a0ce87288c7d132946d645eba03f0ad8a8", + "sha256:aa31fdcc33fef9eb2552cbcbfee7773d5a6792c137b359e82879c101e98584c5", + "sha256:b014c23646a467558be7da3d6b9fa409b2c567d2110599b7cf9a0c5992b3b471", + "sha256:b21bb4c09ffabfa0e85e3a6b623e19b80e7acd709b9f91452b8297ace2a8ab00", + "sha256:b5901a312f4d14c59918c221323068fad0540e34324925c8475263841dbdfe68", + "sha256:b9b7a708dd92306328117d8c4b62e2194d00c365f18eff11a9b53c6f923b01e3", + "sha256:d1967f46ea8f2db647c786e78d8cc7e4313dbd1b0aca360592d8027b8508e24d", + "sha256:d52a25136894c63de15a35bc0bdc5adb4b0e173b9c0d07a2be9d3ca64a332735", + "sha256:d77c85fedff92cf788face9bfa3ebaa364448ebb1d765302e9af11bf449ca36d", + "sha256:d79d7d5dc8a32b7093e81e97dad755127ff77bcc899e845f41bf71747af0c569", + "sha256:dbcda74c67263139358f4d188ae5faae95c30929281bc6866d00573783c422b7", + "sha256:ddaea91abf8b0d13443f6dac52e89051a5063c7d014710dcb4d4abb2ff811a59", + "sha256:dee0ce50c6a2dd9056c20db781e9c1cfd33e77d2d569f5d1d9321c641bb903d5", + "sha256:dee60e1de1898bde3b238f18340eec6148986da0455d8ba7848d50470a7a32fb", + "sha256:e2f83e18fe2f4c9e7db597e988f72712c0c3676d337d8b101f6758107c42425b", + "sha256:e3fb1677c720409d5f671e39bac6c9e0e422584e5f518bfd50aa4cbbea02433f", + "sha256:ee2b1b1769f6707a8a445162ea16dddf74285c3964f605877a20e38545c3c462", + "sha256:ee6acae74a2b91865910eef5e7de37dc6895ad96fa23603d1d27ea69df545015", + "sha256:ef3f72c9666bba2bab70d2a8b79f2c6d2c1a42a7f7e2b0ec83bb2f9e383950af" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==1.14.1" + }, "zipp": { "hashes": [ "sha256:56bf8aadb83c24db6c4b577e13de374ccfb67da2078beba1d037c17980bf43ad", diff --git a/requirements.txt b/requirements.txt index 339ce8070..68e8094ba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,7 @@ -i https://pypi.python.org/simple --extra-index-url https://www.piwheels.org/simple +-e git+https://github.com/stumpylog/django-q.git@20aa962739d41ea187540267e92bc01539c914d6#egg=django-q aioredis==1.3.1 anyio==3.6.1; python_full_version >= '3.6.2' arrow==1.2.2; python_version >= '3.6' @@ -29,11 +30,11 @@ constantly==15.1.0 cryptography==37.0.2; python_version >= '3.6' daphne==3.0.2; python_version >= '3.6' dateparser==1.1.1 +deprecated==1.2.13; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' django-cors-headers==3.13.0 django-extensions==3.1.5 django-filter==21.1 django-picklefield==3.0.1; python_version >= '3' -django-q==1.3.9 django==4.0.5 djangorestframework==3.13.1 filelock==3.7.1 @@ -80,10 +81,9 @@ pytz-deprecation-shim==0.1.0.post0; python_version >= '2.7' and python_version n pytz==2022.1 pyyaml==6.0 pyzbar==0.1.9 -redis==3.5.3 +redis==4.3.3 regex==2022.3.2; python_version >= '3.6' -# WARNING: Temporary manual change as piwheels build failed for 3.6.10 -reportlab==3.6.9; python_version >= '3.7' and python_version < '4' +reportlab==3.6.10; python_version >= '3.7' and python_version < '4' requests==2.27.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' scikit-learn==1.0.2 scipy==1.8.1; python_version < '3.11' and python_version >= '3.8' @@ -109,5 +109,6 @@ wcwidth==0.2.5 websockets==10.3 whitenoise==6.2.0 whoosh==2.7.4 +wrapt==1.14.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' zipp==3.8.0; python_version < '3.9' zope.interface==5.4.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' From f02f683499503824bb0617ec94e1fd2b63ba9fd7 Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Fri, 13 May 2022 12:52:57 -0700 Subject: [PATCH 184/291] Adds git as needed for a git link --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index c75a3e3aa..5338d8aa4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -169,6 +169,7 @@ COPY requirements.txt ../ # dependencies ARG BUILD_PACKAGES="\ build-essential \ + git \ python3-dev" RUN set -eux \ From 99b9acf36860a9f6ec7782efdf30529073a3ba47 Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Sun, 5 Jun 2022 10:22:27 -0700 Subject: [PATCH 185/291] Points to the organization fork of django-q, which now includes my replicated changes --- Pipfile | 4 +--- Pipfile.lock | 10 ++++------ requirements.txt | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Pipfile b/Pipfile index 2308883ab..a32feee52 100644 --- a/Pipfile +++ b/Pipfile @@ -14,7 +14,7 @@ django = "~=4.0" django-cors-headers = "*" django-extensions = "*" django-filter = "~=21.1" -django-q = {editable = true, ref = "relock-deps", git = "https://github.com/stumpylog/django-q.git"} +django-q = {editable = true, ref = "paperless-main", git = "https://github.com/paperless-ngx/django-q.git"} djangorestframework = "~=3.13" filelock = "*" fuzzywuzzy = {extras = ["speedup"], version = "*"} @@ -23,13 +23,11 @@ imap-tools = "*" langdetect = "*" pathvalidate = "*" pillow = "~=9.1" -# Any version update to pikepdf requires a base image update pikepdf = "~=5.1" python-gnupg = "*" python-dotenv = "*" python-dateutil = "*" python-magic = "*" -# Any version update to psycopg2 requires a base image update psycopg2 = "*" redis = "*" # Pinned because aarch64 wheels and updates cause warnings when loading the classifier model. diff --git a/Pipfile.lock b/Pipfile.lock index d20b9702b..b06748b8f 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "1d3e45af4ae34722d55a93f3255fc60f5f95b2671d46fb97e4f06323bf8667c4" + "sha256": "5eb8d3dd2f13d65f3f334413f6905f1a7badc42adc79d34c8f8c8c61525aff59" }, "pipfile-spec": 6, "requires": {}, @@ -322,8 +322,8 @@ }, "django-q": { "editable": true, - "git": "https://github.com/stumpylog/django-q.git", - "ref": "20aa962739d41ea187540267e92bc01539c914d6" + "git": "https://github.com/paperless-ngx/django-q.git", + "ref": "71abc78fdaec029cf71e9849a3b0fa084a1678f7" }, "djangorestframework": { "hashes": [ @@ -1695,9 +1695,7 @@ "version": "==0.4.4" }, "coverage": { - "extras": [ - "toml" - ], + "extras": [], "hashes": [ "sha256:01c5615d13f3dd3aa8543afc069e5319cfa0c7d712f6e04b920431e5c564a749", "sha256:106c16dfe494de3193ec55cac9640dd039b66e196e4641fa8ac396181578b982", diff --git a/requirements.txt b/requirements.txt index 68e8094ba..28c3df01c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ -i https://pypi.python.org/simple --extra-index-url https://www.piwheels.org/simple --e git+https://github.com/stumpylog/django-q.git@20aa962739d41ea187540267e92bc01539c914d6#egg=django-q +-e git+https://github.com/paperless-ngx/django-q.git@71abc78fdaec029cf71e9849a3b0fa084a1678f7#egg=django-q aioredis==1.3.1 anyio==3.6.1; python_full_version >= '3.6.2' arrow==1.2.2; python_version >= '3.6' From b9fffa30bb0cec062627cb6d24394c2f794d55b4 Mon Sep 17 00:00:00 2001 From: Trenton Holmes Date: Wed, 8 Jun 2022 17:04:00 -0700 Subject: [PATCH 186/291] Manually downgrades reportlab, no 3.9 wheel was built yet --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 28c3df01c..2b06a8743 100644 --- a/requirements.txt +++ b/requirements.txt @@ -83,7 +83,8 @@ pyyaml==6.0 pyzbar==0.1.9 redis==4.3.3 regex==2022.3.2; python_version >= '3.6' -reportlab==3.6.10; python_version >= '3.7' and python_version < '4' +# Manual downgrade until piwheel is working with this package again +reportlab==3.6.9; python_version >= '3.7' and python_version < '4' requests==2.27.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' scikit-learn==1.0.2 scipy==1.8.1; python_version < '3.11' and python_version >= '3.8' From 8141b5d58df20f1c0130541c510c7bb509d9470a Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 8 Jun 2022 19:47:46 -0700 Subject: [PATCH 187/291] Update tasks e2e tests to cypress 10 and remove debug print --- .../e2e/{documents/tasks.spec.ts => tasks/tasks.cy.ts} | 10 ---------- src/documents/signals/handlers.py | 1 - 2 files changed, 11 deletions(-) rename src-ui/cypress/e2e/{documents/tasks.spec.ts => tasks/tasks.cy.ts} (84%) diff --git a/src-ui/cypress/e2e/documents/tasks.spec.ts b/src-ui/cypress/e2e/tasks/tasks.cy.ts similarity index 84% rename from src-ui/cypress/e2e/documents/tasks.spec.ts rename to src-ui/cypress/e2e/tasks/tasks.cy.ts index 5f95978a5..b68de3be1 100644 --- a/src-ui/cypress/e2e/documents/tasks.spec.ts +++ b/src-ui/cypress/e2e/tasks/tasks.cy.ts @@ -2,16 +2,6 @@ describe('tasks', () => { beforeEach(() => { this.dismissedTasks = new Set() - cy.intercept('http://localhost:8000/api/ui_settings/', { - fixture: 'ui_settings/settings.json', - }) - cy.intercept('http://localhost:8000/api/correspondents/*', { - fixture: 'correspondents/correspondents.json', - }) - cy.intercept('http://localhost:8000/api/tags/*', { - fixture: 'tags/tags.json', - }) - cy.fixture('tasks/tasks.json').then((tasksViewsJson) => { // acknowledge tasks POST cy.intercept( diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py index 07d0392b5..ecf4bb745 100644 --- a/src/documents/signals/handlers.py +++ b/src/documents/signals/handlers.py @@ -516,7 +516,6 @@ def init_paperless_task(sender, task, **kwargs): @receiver(django_q.signals.pre_execute) def paperless_task_started(sender, task, **kwargs): - print(task) try: if task["func"] == "documents.tasks.consume_file": paperless_task = PaperlessTask.objects.get(task_id=task["id"]) From 898830e81d27df07ce5977625b077d574b092901 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 9 Jun 2022 08:37:40 -0700 Subject: [PATCH 188/291] Quick toggle for tags / doctypes etc on doc view --- src-ui/messages.xlf | 78 +++++++++++-------- .../document-card-small.component.html | 8 +- .../document-list/document-list.component.ts | 8 +- .../filter-editor/filter-editor.component.ts | 25 ++---- 4 files changed, 61 insertions(+), 58 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index f4c0d6598..b69d864e1 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -102,35 +102,35 @@ »» node_modules/src/pagination/pagination.ts - 313,316 + 312 First node_modules/src/pagination/pagination.ts - 332,333 + 330 Previous node_modules/src/pagination/pagination.ts - 347,348 + 343,345 Next node_modules/src/pagination/pagination.ts - 363 + 357 Last node_modules/src/pagination/pagination.ts - 379,380 + 378,379 @@ -368,7 +368,7 @@ src/app/components/document-list/document-list.component.ts - 68 + 65 src/app/components/manage/management-list/management-list.component.html @@ -872,7 +872,7 @@ src/app/components/manage/storage-path-list/storage-path-list.component.ts - 36 + 35 @@ -1592,7 +1592,7 @@ Confirm delete src/app/components/document-detail/document-detail.component.ts - 469 + 467 src/app/components/manage/management-list/management-list.component.ts @@ -1603,28 +1603,28 @@ Do you really want to delete document ""? src/app/components/document-detail/document-detail.component.ts - 470 + 468 The files for this document will be deleted permanently. This operation cannot be undone. src/app/components/document-detail/document-detail.component.ts - 471 + 469 Delete document src/app/components/document-detail/document-detail.component.ts - 473 + 471 Error deleting document: src/app/components/document-detail/document-detail.component.ts - 489 + 487 @@ -1882,10 +1882,6 @@ src/app/components/document-list/document-card-large/document-card-large.component.html 20 - - src/app/components/document-list/document-card-small/document-card-small.component.html - 24 - src/app/components/document-list/document-list.component.html 173 @@ -1897,10 +1893,6 @@ src/app/components/document-list/document-card-large/document-card-large.component.html 24 - - src/app/components/document-list/document-card-small/document-card-small.component.html - 14 - src/app/components/document-list/document-list.component.html 178 @@ -1962,10 +1954,6 @@ src/app/components/document-list/document-card-large/document-card-large.component.html 63 - - src/app/components/document-list/document-card-small/document-card-small.component.html - 31 - src/app/components/document-list/document-list.component.html 182 @@ -1977,10 +1965,6 @@ src/app/components/document-list/document-card-large/document-card-large.component.html 70 - - src/app/components/document-list/document-card-small/document-card-small.component.html - 38 - src/app/components/document-list/document-list.component.html 187 @@ -2026,6 +2010,34 @@ 98 + + Toggle tag filter + + src/app/components/document-list/document-card-small/document-card-small.component.html + 14 + + + + Toggle correspondent filter + + src/app/components/document-list/document-card-small/document-card-small.component.html + 24 + + + + Toggle document type filter + + src/app/components/document-list/document-card-small/document-card-small.component.html + 31 + + + + Toggle storage path filter + + src/app/components/document-list/document-card-small/document-card-small.component.html + 38 + + Select none @@ -2144,14 +2156,14 @@ View "" saved successfully. src/app/components/document-list/document-list.component.ts - 197 + 180 View "" created successfully. src/app/components/document-list/document-list.component.ts - 227 + 210 @@ -2829,21 +2841,21 @@ storage path src/app/components/manage/storage-path-list/storage-path-list.component.ts - 31 + 30 storage paths src/app/components/manage/storage-path-list/storage-path-list.component.ts - 32 + 31 Do you really want to delete the storage path ""? src/app/components/manage/storage-path-list/storage-path-list.component.ts - 46 + 45 diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html index a27b23d37..813447f2d 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html @@ -11,7 +11,7 @@
    - +
    + {{moreTags}}
    @@ -21,21 +21,21 @@

    - {{(document.correspondent$ | async)?.name}}: + {{(document.correspondent$ | async)?.name}}: {{document.title | documentTitle}}

    - -
    - -
    -