lino 25.3.4__tar.gz → 25.4.0__tar.gz

{lino-25.3.4 → lino-25.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lino
-Version: 25.3.4
+Version: 25.4.0
 Summary: A framework for writing desktop-like web applications using Django and ExtJS or React
 Project-URL: Homepage, https://www.lino-framework.org
 Project-URL: Repository, https://gitlab.com/lino-framework/lino

{lino-25.3.4 → lino-25.4.0}/lino/__init__.py

@@ -31,7 +31,7 @@ from django import VERSION
 from django.apps import AppConfig
 from django.conf import settings
 import warnings
-__version__ = '25.3.4'
+__version__ = '25.4.0'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 
@@ -96,6 +96,12 @@ warnings.filterwarnings(
 # TODO: get everything to work even when ResourceWarning gives an error
 # warnings.filterwarnings("error", category=ResourceWarning)
 
+warnings.filterwarnings("error", category=SyntaxWarning)
+
+# 20250401 Activating the following line caused `doctest docs/plugins/linod.rst`
+# to fail with "Fatal Python error: Segmentation fault":
+# warnings.filterwarnings("error", category=DeprecationWarning)
+
 
 # def setup_project(settings_module):
 #     os.environ['DJANGO_SETTINGS_MODULE'] = settings_module

{lino-25.3.4 → lino-25.4.0}/lino/api/dd.py

@@ -155,7 +155,7 @@ from lino.utils import IncompleteDate, read_exception
 
 from lino.utils.format_date import fdm, fdl, fdf, fdmy
 from lino.utils.format_date import fds as fds_
-from lino.utils.format_date import ftl
+from lino.utils.format_date import ftl, ftf
 
 
 def fds(d):

{lino-25.3.4 → lino-25.4.0}/lino/config/admin_main_base.html

@@ -77,20 +77,21 @@
         {{_("Or sign in using ")}}
         {% for e in site.get_social_auth_links() %}
         {{tostring(e)}}
-        {% endfor %}
+        {% endfor %}.
         {% endif %}
       </p>
         {% if site.is_demo_site %}
             <p>
             {{_("This demo site has %d users:") %
-            site.models.users.UsersOverview.request().get_total_count()}}
+            site.models.users.UsersOverview.create_request().get_total_count()}}
             </p>
             {% if False %}
             <p>{{ar.show(site.models.users.UsersOverview, display_mode="ul")}}</p>
             {% else %}
             {{as_ul('users.UsersOverview')}}
             {% endif %}
-            <p>{{_("The password is the same for all of them: \"1234\".")}}</p>
+            <p>{{_("The password is the same for all of them:")}}
+              "{{site.plugins.users.demo_password}}".</p>
         {% endif %}
       {% endif %}
   {% endblock %}

{lino-25.3.4 → lino-25.4.0}/lino/help_texts.py

@@ -139,7 +139,7 @@ help_texts = {
     'lino.modlib.extjs.ext_renderer.ExtRenderer.goto_instance' : _("""See JsRenderer.goto_instance(), but when this is called while the detail window is already open (only on another record), then we don’t want to redirect to another page because that would take more time."""),
     'lino.modlib.extjs.views.AdminIndex' : _("""Similar to PlainIndex"""),
     'lino.modlib.extjs.views.Restful' : _("""Used to collaborate with a restful Ext.data.Store."""),
-    'lino.modlib.extjs.views.ApiElement' : _("""The view that responds to r'api/(?P<app_label>\w+)/(?P<actor>\w+)/(?P<pk>[^/]+)$'."""),
+    'lino.modlib.extjs.views.ApiElement' : _("""The view that responds to api/app_label/actor/pk."""),
     'lino.modlib.gfks.Plugin' : _("""Base class for this plugin."""),
     'lino.modlib.importfilters.Plugin' : _("""See /dev/plugins."""),
     'lino.modlib.jinja.Plugin' : _("""See /dev/plugins."""),
@@ -153,13 +153,13 @@ help_texts = {
     'lino.modlib.memo.Plugin' : _("""Base class for this plugin."""),
     'lino.modlib.memo.Plugin.parser' : _("""An instance of lino.modlib.memo.parser.Parser."""),
     'lino.modlib.memo.Plugin.front_end' : _("""The front end to use when writing previews."""),
-    'lino.modlib.memo.parser.Suggester' : _("""Holds the configuration for the behaviour of a given “trigger”."""),
     'lino.modlib.memo.parser.Parser' : _("""The memo parser."""),
     'lino.modlib.memo.parser.Parser.add_suggester' : _("""Add a Suggester (see there for args and kwargs)."""),
-    'lino.modlib.memo.parser.Parser.register_command' : _("""Register a memo command identified by the given text cmd."""),
-    'lino.modlib.memo.parser.Parser.register_django_model' : _("""Register the given string name as command for referring to database rows of the given Django database model model."""),
     'lino.modlib.memo.parser.Parser.get_referred_objects' : _("""Yield all database objects referred in the given text using a suggester."""),
     'lino.modlib.memo.parser.Parser.parse' : _("""Parse the given string src, replacing memo commands by their result."""),
+    'lino.modlib.memo.parser.Parser.register_command' : _("""Register a memo command identified by the given text cmd."""),
+    'lino.modlib.memo.parser.Parser.register_django_model' : _("""Register the given string name as command for referring to database rows of the given Django database model model."""),
+    'lino.modlib.memo.parser.Suggester' : _("""Holds the configuration for the behaviour of a given “trigger”."""),
     'lino.modlib.restful.Plugin' : _("""See /dev/plugins."""),
     'lino.modlib.smtpd.Plugin' : _("""See /dev/plugins."""),
     'lino.modlib.system.Plugin' : _("""See /dev/plugins."""),
@@ -172,13 +172,6 @@ help_texts = {
     'lino.modlib.tinymce.Plugin.window_buttons2' : _("""The second row of toolbar buttons when editing in own window."""),
     'lino.modlib.tinymce.Plugin.window_buttons3' : _("""The third row of toolbar buttons when editing in own window."""),
     'lino.modlib.tinymce.Plugin.media_name' : _("""Lino currently includes three versions of TinyMCE, but for production sites we still use the eldest version 3.4.8."""),
-    'lino.modlib.weasyprint.Plugin' : _("""See /dev/plugins."""),
-    'lino.modlib.weasyprint.Plugin.header_height' : _("""Height of header in mm. Set to None if you want no header."""),
-    'lino.modlib.weasyprint.Plugin.footer_height' : _("""Height of footer in mm. Set to None if you want no header."""),
-    'lino.modlib.weasyprint.Plugin.top_right_width' : _("""Width of top-right.jpg in mm. If not given, Lino computes it based on height."""),
-    'lino.modlib.weasyprint.Plugin.top_right_image' : _("""The first image file found in config named either top-right.jpg or top-right.png."""),
-    'lino.modlib.weasyprint.Plugin.header_image' : _("""The first image file found in config named either header.jpg or header.png."""),
-    'lino.modlib.weasyprint.Plugin.margin' : _("""Top and bottom page margin in mm."""),
     'lino.modlib.wkhtmltopdf.Plugin' : _("""See /dev/plugins."""),
     'lino.sphinxcontrib.actordoc.CurrentLanguage' : _("""Tell Sphinx to switch to the specified language until the end of this document."""),
     'lino.sphinxcontrib.actordoc.CurrentProject' : _("""Tell Sphinx to switch to the specified project until the end of this document."""),
@@ -371,13 +364,18 @@ help_texts = {
     'lino.modlib.linod.LogLevels' : _("""A choicelist of logging levels available in this application."""),
     'lino.modlib.linod.SystemTask' : _("""Django model used to represent a background task."""),
     'lino.modlib.linod.SystemTask.start_datetime' : _("""Tells at what time exactly this job started."""),
-    'lino.modlib.linod.SystemTask.message' : _("""Stores information about the job, mostly logs."""),
-    'lino.modlib.linod.SystemTask.disabled' : _("""Tells whether the task should be ignored."""),
-    'lino.modlib.linod.SystemTask.log_level' : _("""The logging level to apply when running this task."""),
     'lino.modlib.linod.SystemTask.run' : _("""Performs a routine job."""),
     'lino.modlib.linod.SystemTasks' : _("""The default table for the SystemTask model."""),
     'lino.modlib.linod.Runnable' : _("""Model mixin used by SystemTask and other models."""),
+    'lino.modlib.linod.Runnable.run_now' : _("""Explicitly request to tun this task as soon as possible."""),
+    'lino.modlib.linod.Runnable.cancel_run' : _("""Cancel the explicit request to tun this task as soon as possible."""),
     'lino.modlib.linod.Runnable.procedure' : _("""The background procedure to run in this task."""),
+    'lino.modlib.linod.Runnable.requested_at' : _("""The timestamp when a user has explicitly requested to run this task."""),
+    'lino.modlib.linod.Runnable.last_start_time' : _("""The timestamp when this task has started running in the task runner."""),
+    'lino.modlib.linod.Runnable.last_end_time' : _("""The timestamp when this task has finished running in the task runner."""),
+    'lino.modlib.linod.Runnable.message' : _("""Stores information about the job, mostly logs."""),
+    'lino.modlib.linod.Runnable.disabled' : _("""Tells whether the task should be ignored."""),
+    'lino.modlib.linod.Runnable.log_level' : _("""The logging level to apply when running this task."""),
     'lino.modlib.periods.StoredYear' : _("""The Django model used to store a fiscal year."""),
     'lino.modlib.periods.StoredPeriod' : _("""The Django model used to store an accounting period."""),
     'lino.modlib.periods.StoredYears' : _("""The fiscal years defined in this database."""),

{lino-25.3.4 → lino-25.4.0}/lino/management/commands/buildcache.py

@@ -37,7 +37,7 @@ class Command(BaseCommand):
 
         # the following log message was useful on Travis 20150104
         if verbosity > 0:
-            logger.info("`buildsite` started on %s.", project_dir)
+            logger.info("`buildcache` started on %s.", project_dir)
 
         # pth = project_dir / "settings.py"
         # if pth.exists():
@@ -55,4 +55,4 @@ class Command(BaseCommand):
 
         # settings.SITE.clear_site_config()
 
-        logger.info("`buildsite` finished on %s.", project_dir)
+        logger.info("`buildcache` finished on %s.", project_dir)

{lino-25.3.4 → lino-25.4.0}/lino/modlib/__init__.py

@@ -55,7 +55,6 @@ Communication
 
     comments
     notify
-    linod
 
 Enterprise Resources
 ====================

{lino-25.3.4 → lino-25.4.0}/lino/modlib/extjs/views.py

@@ -321,8 +321,7 @@ NOT_FOUND = "%s has no row with primary key %r"
 
 class ApiElement(View):
     """
-    The view that responds to
-    ``r'api/(?P<app_label>\w+)/(?P<actor>\w+)/(?P<pk>[^/]+)$'``.
+    The view that responds to ``api/app_label/actor/pk``.
     """
 
     @method_decorator(ensure_csrf_cookie)

{lino-25.3.4 → lino-25.4.0}/lino/modlib/linod/mixins.py

@@ -38,6 +38,11 @@ class RunNow(dd.Action):
     # icon_name = 'bell'
     # icon_name = 'lightning'
 
+    # def get_action_permission(self, ar, obj, state):
+    #     if obj.requested_at or obj.is_running():
+    #         return False
+    #     return super().get_action_permission(ar, obj, state)
+
     def run_from_ui(self, ar, **kwargs):
         # print("20231102 RunNow", ar.selected_rows)
         for obj in ar.selected_rows:
@@ -45,10 +50,11 @@ class RunNow(dd.Action):
             if True:  # dd.plugins.linod.use_channels:
                 obj.last_start_time = None
                 obj.last_end_time = None
+                obj.requested_at = timezone.now()
                 obj.message = "{} requested to run this task at {}.".format(
                     ar.get_user(), dd.ftl(timezone.now())
                 )
-                obj.disabled = False
+                # obj.disabled = False
                 obj.full_clean()
                 obj.save()
             else:
@@ -57,6 +63,30 @@ class RunNow(dd.Action):
         ar.set_response(refresh=True)
 
 
+class CancelRun(dd.Action):
+    label = _("Cancel request")
+    help_text = _("Cancel the request to run this task asap.")
+    select_rows = True
+    button_text = "🗙"  # ⛒
+    # icon_name = 'bell'
+    # icon_name = 'lightning'
+
+    # def get_action_permission(self, ar, obj, state):
+    #     if obj.requested_at is None:
+    #         return False
+    #     return super().get_action_permission(ar, obj, state)
+
+    def run_from_ui(self, ar, **kwargs):
+        for obj in ar.selected_rows:
+            assert issubclass(obj.__class__, Runnable)
+            obj.requested_at = None
+            obj.message = "{} cancelled the request to run this task.".format(
+                ar.get_user())
+            obj.full_clean()
+            obj.save()
+        ar.set_response(refresh=True)
+
+
 class Runnable(Sequenced, RecurrenceSet):
     class Meta:
         abstract = True
@@ -66,6 +96,7 @@ class Runnable(Sequenced, RecurrenceSet):
     last_start_time = dd.DateTimeField(
         _("Started at"), null=True, editable=False)
     last_end_time = dd.DateTimeField(_("Ended at"), null=True, editable=False)
+    requested_at = dd.DateTimeField(_("Requested at"), null=True, editable=False)
     message = dd.RichTextField(
         _("Logged messages"), format="plain", editable=False)
 
@@ -74,12 +105,23 @@ class Runnable(Sequenced, RecurrenceSet):
     name = models.CharField(_("Name"), max_length=200, blank=True)
 
     run_now = RunNow()
+    cancel_run = CancelRun()
 
     def __str__(self):
+        # r = "{} ({} #{})".format(
+        #     self.name, self._meta.verbose_name, self.seqno)
         r = "{} #{} ({})".format(
             self._meta.verbose_name, self.seqno, self.name)
         return r
 
+    def disabled_fields(self, ar):
+        rv = super().disabled_fields(ar)
+        if self.requested_at is None:
+            rv.add('cancel_run')
+        else:
+            rv.add('run_now')
+        return rv
+
     def full_clean(self, *args, **kwargs):
         super().full_clean(*args, **kwargs)
         # 20250213 The following caused 'Invalid procedure invoicing.Task for
@@ -114,6 +156,7 @@ class Runnable(Sequenced, RecurrenceSet):
         # ar.info("Start %s with logging level %s", astr(self), self.log_level)
         # forget about any previous run:
         self.last_start_time = timezone.now()
+        self.requested_at = None
         self.last_end_time = None
         self.message = ""
         # print("20231102 full_clean")
@@ -150,17 +193,20 @@ class Runnable(Sequenced, RecurrenceSet):
     @dd.displayfield("Status")
     def status(self, ar=None):
         if self.is_running():
-            return _("Running since {}").format(dd.ftl(self.last_start_time))
+            return _("Running since {}").format(dd.ftf(self.last_start_time))
+        if self.requested_at is not None:
+            return _("Requested to run asap (since {})").format(
+                dd.ftf(self.requested_at))
         if self.disabled:
             return _("Disabled")
         if self.last_start_time is None or self.last_end_time is None:
-            if self.every_unit in (Recurrences.never, None):
+            if self.every_unit in {Recurrences.never, None}:
                 return _("Not scheduled")
             return _("Scheduled to run asap")
         next_time = self.get_next_suggested_date(self.last_end_time)
         if next_time is None:
             return _("Not scheduled")
-        return _("Scheduled to run at {}").format(dd.ftl(next_time))
+        return _("Scheduled to run at {}").format(dd.ftf(next_time))
 
 
 async def start_task_runner(ar=None, max_count=None):
@@ -177,53 +223,60 @@ async def start_task_runner(ar=None, max_count=None):
         next_time = now + \
             timedelta(seconds=dd.plugins.linod.background_sleep_time)
 
+        tasks = []
         for cls in Procedures.task_classes():
             # asyncio.ensure_future(m.start_task_runner(ar.spawn_request()))
             # print("20240424b")
-            tasks = cls.objects.filter(disabled=False).order_by("seqno")
+            async for obj in cls.objects.filter(
+                    requested_at__isnull=False).order_by("requested_at"):
+                tasks.append(obj)
+        for cls in Procedures.task_classes():
+            async for obj in cls.objects.filter(
+                    requested_at__isnull=True, disabled=False).order_by("seqno"):
+                tasks.append(obj)
             # print("20240424c")
             # async for self in tasks:
-            async for self in tasks:
-                # print("20240424d")
-                # raise Warning("20231230")
-                if self.last_end_time is None and self.last_start_time is not None:
-                    run_duration = now - self.last_start_time
-                    if run_duration > timedelta(hours=2):
-                        msg = "Kill {} because it has been running more than 2 hours".format(
-                            astr(self)
-                        )
-                        await ar.adebug(msg)
-                        self.last_end_time = now
-                        self.message = msg
-                        await sync_to_async(self.full_clean)()
-                        # self.full_clean()
-                        await self.asave()
-                        # self.disabled = True
-                    else:
-                        await ar.adebug("Skip running task %s", astr(self))
-                    continue
-
-                if self.last_end_time is not None:
-                    nst = await sync_to_async(self.get_next_suggested_date)(
-                        self.last_end_time, ar.logger
+        for self in tasks:
+            # print("20240424d")
+            # raise Warning("20231230")
+            if self.last_end_time is None and self.last_start_time is not None:
+                run_duration = now - self.last_start_time
+                if run_duration > timedelta(hours=2):
+                    msg = "Killed {} because running more than 2 hours".format(
+                        astr(self)
                     )
-                    if nst is None:
-                        await ar.adebug("No time suggested to start %s", astr(self))
-                        continue
-                    if nst > now:
-                        await ar.adebug("Too early to start %s", astr(self))
-                        next_time = min(next_time, nst)
-                        continue
-
-                # await ar.adebug("Start %s", self)
-                # print("20231021 1 gonna start", self)
-                await self.start_task(ar)
-                assert self.last_end_time is not None
+                    await ar.adebug(msg)
+                    self.last_end_time = now
+                    self.message = msg
+                    await sync_to_async(self.full_clean)()
+                    # self.full_clean()
+                    await self.asave()
+                    # self.disabled = True
+                else:
+                    await ar.adebug("Skip running task %s", astr(self))
+                continue
+
+            if self.requested_at is None and self.last_end_time is not None:
                 nst = await sync_to_async(self.get_next_suggested_date)(
                     self.last_end_time, ar.logger
                 )
-                if nst is not None:
+                if nst is None:
+                    await ar.adebug("No time suggested to start %s", astr(self))
+                    continue
+                if nst > now:
+                    await ar.adebug("Too early to start %s", astr(self))
                     next_time = min(next_time, nst)
+                    continue
+
+            # await ar.adebug("Start %s", self)
+            # print("20231021 1 gonna start", self)
+            await self.start_task(ar)
+            assert self.last_end_time is not None
+            nst = await sync_to_async(self.get_next_suggested_date)(
+                self.last_end_time, ar.logger
+            )
+            if nst is not None:
+                next_time = min(next_time, nst)
 
         count += 1
         if max_count is not None and count >= max_count:

{lino-25.3.4 → lino-25.4.0}/lino/modlib/linod/models.py

@@ -38,7 +38,7 @@ class SystemTasks(dd.Table):
     name
     every every_unit
     log_level disabled status
-    last_start_time last_end_time
+    requested_at last_start_time last_end_time
     message
     """
     insert_layout = """

{lino-25.3.4 → lino-25.4.0}/lino/modlib/memo/__init__.py

@@ -158,3 +158,7 @@ class Plugin(ad.Plugin):
         mg = site.plugins.office
         m = m.add_menu(mg.app_label, mg.verbose_name)
         m.add_action("memo.Mentions")
+        # m.add_action("about.About.insert_reference")
+
+    # def get_quicklinks(self):
+    #     yield "about.About.insert_reference"

{lino-25.3.4 → lino-25.4.0}/lino/modlib/memo/models.py

@@ -14,8 +14,9 @@ from lino.core.roles import SiteStaff
 from lino.core.gfks import gfk2lookup
 from lino.modlib.gfks.mixins import Controllable
 from lino.modlib.gfks.fields import GenericForeignKey, GenericForeignKeyIdField
+from lino.modlib.about.models import About
 from .parser import split_name_rest
-# from .mixins import *
+from .mixins import MemoReferrable
 
 # Translators: will also be concatenated with '(type)' and '(object)'
 target_label = _("Target")
@@ -71,8 +72,10 @@ class Mention(Controllable):
             obj = super()
         return obj.as_summary_item(ar, text, **kwargs)
 
+
 dd.update_field(Mention, 'owner', verbose_name=_("Referrer"))
 
+
 class Mentions(dd.Table):
     required_roles = dd.login_required(SiteStaff)
     editable = False
@@ -89,8 +92,51 @@ class Mentions(dd.Table):
 #     column_names = "target *"
 #     default_display_modes = {None: constants.DISPLAY_MODE_SUMMARY}
 
+
 class MentionsByTarget(Mentions):
     label = _("Mentioned by")
     master_key = "target"
     column_names = "owner *"
     default_display_modes = {None: constants.DISPLAY_MODE_SUMMARY}
+
+
+CONTENT_TYPE_FIELD = dd.ForeignKey(ContentType, editable=True)
+
+
+class InsertReference(dd.Action):
+
+    label = _("Insert reference")
+    select_rows = False
+    parameters = dict(
+        content_type=CONTENT_TYPE_FIELD,
+        primary_key=GenericForeignKeyIdField(CONTENT_TYPE_FIELD, editable=True)
+    )
+    params_layout = """
+    content_type
+    primary_key
+    """
+
+    @dd.chooser()
+    def content_type_choices(self):
+        for obj in rt.models.gfks.ContentType.objects.all():
+            if issubclass(obj.model_class(), MemoReferrable):
+                yield obj
+
+    @dd.chooser(instance_values=True)
+    def primary_key_choices(cls, content_type):
+        if content_type is None:
+            # print("You must select a content type")
+            # return []
+            return [("", _("You must select a content type"))]
+        m = content_type.model_class()
+        return m.objects.all()
+
+    def run_from_ui(self, ar, **kwargs):
+        pv = ar.action_param_values
+        ct = pv.content_type.model_class()
+        obj = ct.objects.get(pk=pv.primary_key)
+        txt = obj.obj2memo()
+        ar.success(message=txt)
+
+
+About.insert_reference = InsertReference()

{lino-25.3.4 → lino-25.4.0}/lino/modlib/weasyprint/config/weasyprint/base.weasy.html

@@ -56,7 +56,9 @@ div.recipient {
     position:relative; left:{{100-dd.plugins.weasyprint.margin_left}}mm;
     height:30mm;
     width:80mm;
-    border: 1px solid grey;
+    border: 1px solid lightgray;
+    border-radius: 2mm;
+    background-color: lightgray;
     padding: 1em;
     margin: 1em;
 }

{lino-25.3.4 → lino-25.4.0}/lino/sphinxcontrib/logo/__init__.py

@@ -44,7 +44,8 @@ def config_inited(app, config):
 
 def copy_custom_files(app, env, docnames):
     if app.builder.format == "html":
-        staticdir = Path(app.builder.outdir / "_static")
+        # In older Sphinx version the builder.outdir was a simple string
+        staticdir = Path(app.builder.outdir) / "_static"
         staticdir.mkdir(exist_ok=True)
         (staticdir / "favicons").mkdir(exist_ok=True)
         for fn in ("synodal-logo.png", "favicons/favicon.ico"):

{lino-25.3.4 → lino-25.4.0}/lino/utils/__init__.py

@@ -23,6 +23,7 @@ function for general use. It has also many subpackages and submodules.
     djangotest
     dpy
     fieldutils
+    format_date
     html
     html2odf
     html2xhtml

{lino-25.3.4 → lino-25.4.0}/lino/utils/dbhash.py

@@ -91,15 +91,17 @@ def check_virgin(restore=True, verbose=True):
     if not can_restore:
         raise Exception(
             "Cannot restore database because some rows have been deleted")
-    # print(f"Tidy up {len(must_delete)} rows from database")
-    # It can happen that some rows refer to each other with a protected fk
-    # We call bulk delete() to avoid Lino deleting the items of an invoice
     must_delete = list(must_delete.items())
+    if verbose:
+        print(f"Tidy up {len(must_delete)} rows from database: {must_delete}.")
     while len(must_delete):
         todo = []
         hope = False
         for m, added in must_delete:
             try:
+                # It can happen that some rows refer to each other with a
+                # protected fk,  so we call bulk delete() to avoid Lino deleting
+                # the items of an invoice.
                 m.objects.filter(pk__in=added).delete()
                 # obj.delete()
                 hope = True

{lino-25.3.4 → lino-25.4.0}/lino/utils/format_date.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2009-2023 Rumma & Ko Ltd
+# Copyright 2009-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 """See :doc:`/topics/datetime`.
 """
@@ -111,6 +111,11 @@ def day_and_weekday(d):
 
 def ftl(t):
     # "format time long"
-    return "{} ({})".format(
-        t.strftime(settings.SITE.datetime_format_strftime), naturaltime(t)
-    )
+    return "{} {}".format(
+        t.strftime(settings.SITE.date_format_strftime),
+        t.strftime(settings.SITE.time_format_strftime))
+
+
+def ftf(t):
+    # "format time full"
+    return "{} ({})".format(ftl(t), naturaltime(t))