Moved the format_amount and format_date template filters from the "accounting.transaction.template_filters" module to the "accounting.template_filters" module, and rename the filters from "accounting_txn_format_amount" and "accounting_txn_format_date" to "accounting_format_amount" and "accounting_format_date", respectively. They will not only be used in the transaction management, but also the reports.

src/accounting/transaction/template_filters.py

@@ -17,16 +17,12 @@
 """The template filters for the transaction management.
 
 """
-from datetime import date, timedelta
 from decimal import Decimal
 from html import escape
 from urllib.parse import ParseResult, urlparse, parse_qsl, urlencode, \
     urlunparse
 
 from flask import request
-from flask_babel import get_locale
-
-from accounting.locale import gettext
 
 
 def with_type(uri: str) -> str:
@@ -61,19 +57,6 @@ def to_transfer(uri: str) -> str:
     return urlunparse(parts)
 
 
-def format_amount(value: Decimal | None) -> str:
-    """Formats an amount for readability.
-
-    :param value: The amount.
-    :return: The formatted amount text.
-    """
-    if value is None or value == 0:
-        return "-"
-    whole: int = int(value)
-    frac: Decimal = (value - whole).normalize()
-    return "{:,}".format(whole) + str(frac)[1:]
-
-
 def format_amount_input(value: Decimal) -> str:
     """Format an amount for an input value.
 
@@ -85,36 +68,6 @@ def format_amount_input(value: Decimal) -> str:
     return str(whole) + str(frac)[1:]
 
 
-def format_date(value: date) -> str:
-    """Formats a date to be human-friendly.
-
-    :param value: The date.
-    :return: The human-friendly date text.
-    """
-    today: date = date.today()
-    if value == today:
-        return gettext("Today")
-    if value == today - timedelta(days=1):
-        return gettext("Yesterday")
-    if value == today + timedelta(days=1):
-        return gettext("Tomorrow")
-    locale = str(get_locale())
-    if locale == "zh" or locale.startswith("zh_"):
-        if value == today - timedelta(days=2):
-            return gettext("The day before yesterday")
-        if value == today + timedelta(days=2):
-            return gettext("The day after tomorrow")
-    if locale == "zh" or locale.startswith("zh_"):
-        weekdays = ["一", "二", "三", "四", "五", "六", "日"]
-        weekday = weekdays[value.weekday()]
-    else:
-        weekday = value.strftime("%a")
-    if value.year != today.year:
-        return "{}/{}/{}({})".format(
-            value.year, value.month, value.day, weekday)
-    return "{}/{}({})".format(value.month, value.day, weekday)
-
-
 def text2html(value: str) -> str:
     """Converts plain text into HTML.
 

src/accounting/transaction/views.py

@@ -36,18 +36,16 @@ from accounting.utils.user import get_current_user_pk
 from .dispatcher import TransactionType, get_txn_type, TXN_TYPE_OBJ
 from .forms import sort_transactions_in, TransactionReorderForm
 from .queries import get_transaction_query
-from .template_filters import with_type, to_transfer, format_amount, \
-    format_amount_input, format_date, text2html
+from .template_filters import with_type, to_transfer, format_amount_input, \
+    text2html
 from .template_globals import currency_options, default_currency_code
 
 bp: Blueprint = Blueprint("transaction", __name__)
 """The view blueprint for the transaction management."""
 bp.add_app_template_filter(with_type, "accounting_txn_with_type")
 bp.add_app_template_filter(to_transfer, "accounting_txn_to_transfer")
-bp.add_app_template_filter(format_amount, "accounting_txn_format_amount")
 bp.add_app_template_filter(format_amount_input,
                            "accounting_txn_format_amount_input")
-bp.add_app_template_filter(format_date, "accounting_txn_format_date")
 bp.add_app_template_filter(text2html, "accounting_txn_text2html")
 bp.add_app_template_global(currency_options, "accounting_txn_currency_options")
 bp.add_app_template_global(default_currency_code,
@@ -192,8 +190,8 @@ def show_transaction_order(txn_date: date) -> str:
     :param txn_date: The date.
     :return: The order of the transactions in the date.
     """
-    transactions: list[Transaction] = Transaction.query\
-        .filter(Transaction.date == txn_date)\
+    transactions: list[Transaction] = Transaction.query \
+        .filter(Transaction.date == txn_date) \
         .order_by(Transaction.no).all()
     return render_template("accounting/transaction/order.html",
                            date=txn_date, list=transactions)