Merge branch 'main' into dev

This commit is contained in:
shamoon
2025-08-17 13:21:52 -07:00
2 changed files with 14 additions and 17 deletions

View File

@@ -185,7 +185,7 @@ the instructions from your database's documentation for how to upgrade between m
!!! note !!! note
As of Paperless-ngx v2.18, the minimum supported version of PostgreSQL is 13. As of Paperless-ngx v2.18, the minimum supported version of PostgreSQL is 14.
For PostgreSQL, refer to [Upgrading a PostgreSQL Cluster](https://www.postgresql.org/docs/current/upgrading.html). For PostgreSQL, refer to [Upgrading a PostgreSQL Cluster](https://www.postgresql.org/docs/current/upgrading.html).

View File

@@ -469,12 +469,12 @@ The `get_cf_value` filter retrieves a value from custom field data with optional
##### Datetime Formatting ##### Datetime Formatting
The `format_datetime`filter formats a datetime string or datetime object using Python's strftime formatting. The `datetime` filter formats a datetime string or datetime object using Python's strftime formatting.
###### Syntax ###### Syntax
```jinja2 ```jinja2
{{ datetime_value | format_datetime('%Y-%m-%d %H:%M:%S') }} {{ datetime_value | datetime('%Y-%m-%d %H:%M:%S') }}
``` ```
###### Parameters ###### Parameters
@@ -490,15 +490,11 @@ The `format_datetime`filter formats a datetime string or datetime object using P
```jinja2 ```jinja2
<!-- Format datetime object --> <!-- Format datetime object -->
{{ created_at | format_datetime('%B %d, %Y at %I:%M %p') }} {{ created | datetime('%B %d, %Y at %I:%M %p') }}
<!-- Output: "January 15, 2024 at 02:30 PM" --> <!-- Output: "January 15, 2024 at 02:30 PM" -->
<!-- Format datetime string -->
{{ "2024-01-15T14:30:00" | format_datetime('%m/%d/%Y') }}
<!-- Output: "01/15/2024" -->
<!-- Custom formatting --> <!-- Custom formatting -->
{{ timestamp | format_datetime('%A, %B %d, %Y') }} {{ custom_fields | get_cf_value('Date Field') | datetime('%A, %B %d, %Y') }}
<!-- Output: "Monday, January 15, 2024" --> <!-- Output: "Monday, January 15, 2024" -->
``` ```
@@ -508,7 +504,8 @@ for the possible codes and their meanings.
##### Date Localization ##### Date Localization
The `localize_date` filter formats a date or datetime object into a localized string using Babel internationalization. The `localize_date` filter formats a date or datetime object into a localized string using Babel internationalization.
This takes into account the provided locale for translation. This takes into account the provided locale for translation. Since this must be used on a date or datetime object,
you must access the field directly, i.e. `document.created`.
###### Syntax ###### Syntax
@@ -531,27 +528,27 @@ This takes into account the provided locale for translation.
```jinja2 ```jinja2
<!-- Preset formats --> <!-- Preset formats -->
{{ created_date | localize_date('short', 'en_US') }} {{ document.created | localize_date('short', 'en_US') }}
<!-- Output: "1/15/24" --> <!-- Output: "1/15/24" -->
{{ created_date | localize_date('medium', 'en_US') }} {{ document.created | localize_date('medium', 'en_US') }}
<!-- Output: "Jan 15, 2024" --> <!-- Output: "Jan 15, 2024" -->
{{ created_date | localize_date('long', 'en_US') }} {{ document.created | localize_date('long', 'en_US') }}
<!-- Output: "January 15, 2024" --> <!-- Output: "January 15, 2024" -->
{{ created_date | localize_date('full', 'en_US') }} {{ document.created | localize_date('full', 'en_US') }}
<!-- Output: "Monday, January 15, 2024" --> <!-- Output: "Monday, January 15, 2024" -->
<!-- Different locales --> <!-- Different locales -->
{{ created_date | localize_date('medium', 'fr_FR') }} {{ document.created | localize_date('medium', 'fr_FR') }}
<!-- Output: "15 janv. 2024" --> <!-- Output: "15 janv. 2024" -->
{{ created_date | localize_date('medium', 'de_DE') }} {{ document.created | localize_date('medium', 'de_DE') }}
<!-- Output: "15.01.2024" --> <!-- Output: "15.01.2024" -->
<!-- Custom patterns --> <!-- Custom patterns -->
{{ created_date | localize_date('dd/MM/yyyy', 'en_GB') }} {{ document.created | localize_date('dd/MM/yyyy', 'en_GB') }}
<!-- Output: "15/01/2024" --> <!-- Output: "15/01/2024" -->
``` ```