Merge branch 'main' into dev

This commit is contained in:
shamoon committed 2026-06-02 08:32:43 -07:00
commit 2638554969
3 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -972,7 +972,7 @@ pages being rotated as well.
#### [`PAPERLESS_OCR_OUTPUT_TYPE=<type>`](#PAPERLESS_OCR_OUTPUT_TYPE) {#PAPERLESS_OCR_OUTPUT_TYPE}
: Specify the the type of PDF documents that paperless should produce.
: Specify the type of PDF documents that paperless should produce.
- `pdf`: Modify the PDF document as little as possible.
- `pdfa`: Convert PDF documents into PDF/A-2b documents, which is
+1 -1
View File
@@ -14,7 +14,7 @@ def localize_date(value: date | datetime | str, format: str, locale: str) -> str
Args:
value (date | datetime | str): The date or datetime to format. If a datetime
is provided, it should be timezone-aware (e.g., UTC from a Django DB object).
if str is provided is is parsed as date.
If str is provided it is parsed as date.
format (str): The format to use. Can be one of Babel's preset formats
('short', 'medium', 'long', 'full') or a custom pattern string.
locale (str): The locale code (e.g., 'en_US', 'fr_FR') to use for
@@ -335,7 +335,7 @@ class TestCommandImport(
WHEN:
- An import is attempted
THEN:
- Warning about the the version mismatch is output
- Warning about the version mismatch is output
"""
stdout = StringIO()