lino 24.11.1__py3-none-any.whl → 25.1.0__py3-none-any.whl

lino/locale/zh_Hant/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lino 24.7.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-11-15 13:05+0200\n"
+"POT-Creation-Date: 2024-11-16 21:41+0200\n"
 "PO-Revision-Date: 2024-07-20 19:57+0300\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: zh_Hant\n"
@@ -3539,8 +3539,8 @@ msgstr ""
 #: lino/modlib/importfilters/models.py:100 lino/modlib/notify/actions.py:14
 #: lino/modlib/search/models.py:85 lino/modlib/system/mixins.py:286
 #: lino/modlib/tinymce/models.py:21 lino/modlib/uploads/actions.py:23
-#: lino/modlib/uploads/models.py:49 lino/modlib/uploads/models.py:121
-#: lino/modlib/uploads/models.py:193 lino/modlib/users/ui.py:262
+#: lino/modlib/uploads/models.py:53 lino/modlib/uploads/models.py:125
+#: lino/modlib/uploads/models.py:189 lino/modlib/users/ui.py:262
 msgid "Description"
 msgstr ""
 
@@ -3613,7 +3613,7 @@ msgstr ""
 msgid "Select a %s..."
 msgstr ""
 
-#: lino/core/elems.py:1618 lino/modlib/uploads/models.py:377
+#: lino/core/elems.py:1618 lino/modlib/uploads/models.py:380
 msgid "show"
 msgstr ""
 
@@ -4936,12 +4936,12 @@ msgid "Controlled by"
 msgstr ""
 
 #: lino/modlib/gfks/mixins.py:31 lino/modlib/gfks/mixins.py:53
-#: lino/modlib/memo/models.py:36
+#: lino/modlib/memo/models.py:37
 msgid "(type)"
 msgstr ""
 
 #: lino/modlib/gfks/mixins.py:39 lino/modlib/gfks/mixins.py:49
-#: lino/modlib/memo/models.py:44
+#: lino/modlib/memo/models.py:45
 msgid "(object)"
 msgstr ""
 
@@ -5256,19 +5256,26 @@ msgstr ""
 msgid "Mentions differ from expected mentions."
 msgstr ""
 
-#: lino/modlib/memo/models.py:20 lino/modlib/uploads/models.py:250
-#: lino/modlib/uploads/models.py:264
-msgid "Source"
+#: lino/modlib/memo/models.py:21
+msgid "Target"
 msgstr ""
 
-#: lino/modlib/memo/models.py:27
+#: lino/modlib/memo/models.py:28
 msgid "Mention"
 msgstr ""
 
-#: lino/modlib/memo/models.py:28
+#: lino/modlib/memo/models.py:29
 msgid "Mentions"
 msgstr ""
 
+#: lino/modlib/memo/models.py:62
+msgid "Referrer"
+msgstr ""
+
+#: lino/modlib/memo/models.py:81
+msgid "Mentioned by"
+msgstr ""
+
 #: lino/modlib/notify/__init__.py:16
 msgid "Messages"
 msgstr ""
@@ -5711,7 +5718,7 @@ msgstr ""
 msgid "You have a dangling edit lock on"
 msgstr ""
 
-#: lino/modlib/system/actions.py:17 lino/modlib/uploads/models.py:389
+#: lino/modlib/system/actions.py:17 lino/modlib/uploads/models.py:392
 msgid "Edit"
 msgstr ""
 
@@ -6144,116 +6151,120 @@ msgstr ""
 msgid "File size"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:42
+#: lino/modlib/uploads/models.py:46
 msgid "Library volume"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:43
+#: lino/modlib/uploads/models.py:47
 msgid "Library volumes"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:47
+#: lino/modlib/uploads/models.py:51
 msgid "Root directory"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:80
+#: lino/modlib/uploads/models.py:84
 msgid "Upload type"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:81
+#: lino/modlib/uploads/models.py:85
 msgid "Upload types"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:86
+#: lino/modlib/uploads/models.py:90
 msgid "Max. number"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:94
+#: lino/modlib/uploads/models.py:98
 msgid "No need to upload more uploads than N of this type."
 msgstr ""
 
-#: lino/modlib/uploads/models.py:95
+#: lino/modlib/uploads/models.py:99
 msgid "-1 means no limit."
 msgstr ""
 
-#: lino/modlib/uploads/models.py:99
+#: lino/modlib/uploads/models.py:103
 msgid "Wanted"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:101
+#: lino/modlib/uploads/models.py:105
 msgid "Add a (+) button when there is no upload of this type."
 msgstr ""
 
-#: lino/modlib/uploads/models.py:112
+#: lino/modlib/uploads/models.py:116
 msgid "Upload file"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:113
+#: lino/modlib/uploads/models.py:117
 msgid "Upload files"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:120
+#: lino/modlib/uploads/models.py:124
 msgid "Library file"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:155
+#: lino/modlib/uploads/models.py:160
 msgid "Uploaded an {obj}."
 msgstr ""
 
-#: lino/modlib/uploads/models.py:230
+#: lino/modlib/uploads/models.py:233
 msgid "No preview available"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:234
+#: lino/modlib/uploads/models.py:237
 msgid "Thumbnail"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:273
+#: lino/modlib/uploads/models.py:253 lino/modlib/uploads/models.py:267
+msgid "Source"
+msgstr ""
+
+#: lino/modlib/uploads/models.py:276
 msgid "Uploaded by"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:274
+#: lino/modlib/uploads/models.py:277
 msgid "Attached to"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:278
+#: lino/modlib/uploads/models.py:281
 msgid "Check metadata of upload files"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:286
+#: lino/modlib/uploads/models.py:289
 msgid "Upload entry {} has no file"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:303
+#: lino/modlib/uploads/models.py:306
 msgid "Find orphaned files in uploads folder"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:319
+#: lino/modlib/uploads/models.py:322
 msgid "File {} has no upload entry."
 msgstr ""
 
-#: lino/modlib/uploads/models.py:365
+#: lino/modlib/uploads/models.py:368
 msgid "Upload"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:367
+#: lino/modlib/uploads/models.py:370
 msgid "Upload a file from your PC to the server."
 msgstr ""
 
-#: lino/modlib/uploads/models.py:381
+#: lino/modlib/uploads/models.py:384
 msgid "Open the uploaded file in a new browser window"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:391 lino/modlib/uploads/ui.py:204
+#: lino/modlib/uploads/models.py:394 lino/modlib/uploads/ui.py:204
 msgid "Edit metadata of the uploaded file."
 msgstr ""
 
-#: lino/modlib/uploads/models.py:396
+#: lino/modlib/uploads/models.py:399
 msgctxt "uploaded file"
 msgid "Last"
 msgstr ""
 
-#: lino/modlib/uploads/models.py:402
+#: lino/modlib/uploads/models.py:405
 msgid "All {0} files"
 msgstr ""
 
@@ -6261,19 +6272,19 @@ msgstr ""
 msgid "Open the file in a new browser window"
 msgstr ""
 
-#: lino/modlib/uploads/utils.py:37
+#: lino/modlib/uploads/utils.py:43
 msgid "PDF file"
 msgstr ""
 
-#: lino/modlib/uploads/utils.py:39
+#: lino/modlib/uploads/utils.py:45
 msgid "picture"
 msgstr ""
 
-#: lino/modlib/uploads/utils.py:40
+#: lino/modlib/uploads/utils.py:46
 msgid "media file"
 msgstr ""
 
-#: lino/modlib/uploads/utils.py:83
+#: lino/modlib/uploads/utils.py:89
 msgid "Must build thumbnail for {}"
 msgstr ""
 

lino/mixins/dupable.py

@@ -9,7 +9,7 @@ Don't mix up this module with :mod:`lino.mixins.duplicable`.  Models
 are "duplicable" if users may *want* to duplicate some instance
 thereof, while "dupable" implies that the duplicates are *unwanted*.
 To dupe *somebody* means "to make a dupe of; deceive; delude; trick."
-(`reference.com <http://dictionary.reference.com/browse/dupe>`_), and
+(`reference.com <https://dictionary.reference.com/browse/dupe>`_), and
 to dupe *something* means to duplicate it (eventually in order to
 cheat somebody e.g. by making a cheap copy of a valuable object).
 
@@ -31,9 +31,6 @@ in Python
 by Frank Hofmann (2018-02-12)
 """
 
-import six
-from builtins import map
-
 from django.conf import settings
 from django.db import models
 
@@ -76,6 +73,10 @@ class CheckedSubmitInsert(SubmitInsert):
         else:
             ok(ar)
 
+# TODO: remove duplicate code. PhoneticWordBase.reduce_word() is exactly the
+# same code as lino.modlib.dupable.models.PhoneticWord.reduce_word(). One of
+# them is used in welfare, the other in avanti.
+
 
 class PhoneticWordBase(dd.Model):
     """Base class for the table of phonetic words of a given dupable
@@ -88,7 +89,7 @@ class PhoneticWordBase(dd.Model):
 
     """
 
-    class Meta(object):
+    class Meta:
         abstract = True
 
     allow_cascaded_delete = ["owner"]
@@ -118,7 +119,7 @@ class PhoneticWordBase(dd.Model):
         dms = dm[0] or dm[1]
         if dms is None:
             return ""
-        if isinstance(dms, six.binary_type):
+        if isinstance(dms, bytes):
             dms = dms.decode("utf8")
         return dms
 
@@ -141,7 +142,7 @@ class Dupable(dd.Model):
     :mod:`lino_welfare.modlib.dupable_clients`
     """
 
-    class Meta(object):
+    class Meta:
         abstract = True
 
     submit_insert = CheckedSubmitInsert()

lino/mixins/periods.py

@@ -7,10 +7,10 @@ Defines classes related to date ranges.
 
 import datetime
 
-try:
-    import pytz
-except ImportError:
-    pytz = None
+# try:
+#     import pytz
+# except ImportError:
+#     pytz = None
 
 from django.db import models
 from django.conf import settings

lino/modlib/checkdata/__init__.py

@@ -64,7 +64,7 @@ class Plugin(ad.Plugin):
 
         """
         super().on_plugins_loaded(site)
-        if site.is_demo_site:
+        if site.is_demo_site and self.responsible_user is None:
             self.configure(responsible_user="robin")
 
     def post_site_startup(self, site):

lino/modlib/comments/ui.py

@@ -55,9 +55,12 @@ class CommentDetail(dd.DetailLayout):
     body #body_full_preview
     """
     general2 = """
-    reply
     RepliesByComment
+    reply
     """
+    # i moved the reply field to the bottom because i stopped using it after
+    # repeated cases where my editing got lost because there was a traceback
+    # after hitting submit, and these tracebacks are difficult to reproduce.
 
     more = dd.Panel(
         """
@@ -120,7 +123,8 @@ class Comments(dd.Table):
 
     @classmethod
     def comments_created(cls, user, sd, ed):
-        pv = dict(start_date=sd, end_date=ed, observed_event=CommentEvents.created)
+        pv = dict(user=user, start_date=sd, end_date=ed, observed_event=CommentEvents.created)
+        # pv = dict(start_date=sd, end_date=ed, observed_event=CommentEvents.created)
         return cls.request(user=user, param_values=pv)
 
     # @classmethod
@@ -268,7 +272,7 @@ class CommentsByMentioned(CommentsByX):
         Mention = rt.models.memo.Mention
         assert not cls.model._meta.abstract
         ct = ContentType.objects.get_for_model(cls.model)
-        mkw = gfk2lookup(Mention.source, mi, owner_type=ct)
+        mkw = gfk2lookup(Mention.target, mi, owner_type=ct)
         mentions = Mention.objects.filter(**mkw).values_list("owner_id", flat=True)
         # mentions = [o.comment_id for o in Mention.objects.filter(**mkw)]
         # print(mkw, mentions)

lino/modlib/dupable/models.py

@@ -8,7 +8,7 @@ Don't mix up this module with :mod:`lino.mixins.duplicable`.  Models
 are "duplicable" if users may *want* to duplicate some instance
 thereof, while "dupable" implies that the duplicates are *unwanted*.
 To dupe *somebody* means "to make a dupe of; deceive; delude; trick."
-(`reference.com <http://dictionary.reference.com/browse/dupe>`_), and
+(`reference.com <https://dictionary.reference.com/browse/dupe>`_), and
 to dupe *something* means to duplicate it (eventually in order to
 cheat somebody e.g. by making a cheap copy of a valuable object).
 
@@ -23,15 +23,11 @@ and the `Double Metaphone
 <https://en.wikipedia.org/wiki/Metaphone#Double_Metaphone>`_
 algorithm.  Read also Doug Hellmann about `Using Fuzzy Matching to
 Search by Sound with Python
-<http://www.informit.com/articles/article.aspx?p=1848528>`_
+<https://www.informit.com/articles/article.aspx?p=1848528>`_
 (2012-03-22).
 
 """
 
-from __future__ import unicode_literals
-import six
-from builtins import object
-
 from django.db import models
 
 from lino.api import dd, _
@@ -54,7 +50,7 @@ class PhoneticWord(Controllable):
 
     """
 
-    class Meta(object):
+    class Meta:
         verbose_name = _("Phonetic word")
         verbose_name_plural = _("Phonetic words")
 
@@ -86,16 +82,16 @@ class PhoneticWord(Controllable):
         dms = dm[0] or dm[1]
         if dms is None:
             return ""
-        if isinstance(dms, six.binary_type):
+        if isinstance(dms, bytes):
             dms = dms.decode("utf8")
         return dms
 
-    @classmethod
-    def get_simple_parameters(cls):
-        for p in super(PhoneticWord, cls).get_simple_parameters():
-            yield p
-        yield "owner_id"
-        yield "owner_type"
+    # @classmethod
+    # def get_simple_parameters(cls):
+    #     for p in super(PhoneticWord, cls).get_simple_parameters():
+    #         yield p
+    #     yield "owner_id"
+    #     yield "owner_type"
 
 
 class PhoneticWords(dd.Table):

lino/modlib/gfks/mixins.py

@@ -56,7 +56,7 @@ class Controllable(dd.Model):
     def update_owned_instance(self, controllable):
         if self.owner:
             self.owner.update_owned_instance(controllable)
-        super(Controllable, self).update_owned_instance(controllable)
+        super().update_owned_instance(controllable)
 
     def save(self, *args, **kw):
         if settings.SITE.loading_from_dump:
@@ -72,3 +72,10 @@ class Controllable(dd.Model):
         gfk = self._meta.get_field("owner")
         kwargs = gfk2lookup(gfk, self, **kwargs)
         return model.objects.filter(**kwargs)
+
+    @classmethod
+    def get_simple_parameters(cls):
+        for p in super().get_simple_parameters():
+            yield p
+        yield "owner_type"
+        yield "owner_id"

lino/modlib/jinja/choicelists.py

@@ -37,8 +37,8 @@ class JinjaBuildMethod(DjangoBuildMethod):
             )
             context = elem.get_printable_context(ar)
             html = tpl.render(context)
-            self.html2file(html, filename)
+            self.html2file(html, filename, context)
             return os.path.getmtime(filename)
 
-    def html2file(self, html, filename):
-        raise NotImplementedError()
+    def html2file(self, html, filename, context):
+        open(filename, "w").write(html)

lino/modlib/jinja/renderer.py

@@ -128,6 +128,8 @@ class JinjaRenderer(HtmlRenderer):
             iif=iif,
             str=str,
             len=len,
+            int=int,
+            round=round,
             E=E,
             tostring=tostring,
             isinstance=isinstance,

lino/modlib/languages/fixtures/all_languages.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2011-2020 Rumma & Ko Ltd
+# Copyright 2011-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 """
 Adds all languages of the world to your database.
@@ -22,8 +22,6 @@ import codecs
 
 from django.conf import settings
 
-# from lino.utils import dblogger as logger
-
 from lino.api import dd
 from lino.modlib.languages.models import Language
 
@@ -752,7 +750,7 @@ def objects():
         if ln:
             ln = ln.strip()
             if not ln[-4:-3].isspace():
-                logger.warning("german %d: syntax", n)
+                dd.logger.warning("german %d: syntax", n)
             else:
                 code = ln[-3:]
                 name = ln[:-4]
@@ -772,7 +770,7 @@ def objects():
             ln = ln.strip()
             rec = ln.split("\t")
             if len(rec) < 6:
-                logger.warning("Ignored french:%d:%s (len(rec) is %d)", n, ln, len(rec))
+                dd.logger.warning("Ignored french:%d:%s (len(rec) is %d)", n, ln, len(rec))
             code = rec[1]
             if len(code) == 7:
                 if code[3:4] == "/":
@@ -794,7 +792,7 @@ def objects():
             kw.update(iso2=iso2)
             yield Language(id=code, **kw)
         else:
-            logger.debug(
+            dd.logger.debug(
                 "%r : no name for default site language %s",
                 code,
                 settings.SITE.DEFAULT_LANGUAGE.django_code,

lino/modlib/memo/mixins.py

@@ -171,24 +171,24 @@ class BasePreviewable(dd.Model):
         )
         short = truncate_comment(full, self.get_preview_length())
         if not full.startswith("<"):
-            if markdown is not None:
+            if dd.get_plugin_setting("memo", "use_markup"):
                 full = markdown.markdown(full, **MARKDOWNCFG)
         return (short, full)
 
     def get_saved_mentions(self):
         Mention = rt.models.memo.Mention
         flt = gfk2lookup(Mention.owner, self)
-        return Mention.objects.filter(**flt).order_by("source_type", "source_id")
+        return Mention.objects.filter(**flt).order_by("target_type", "target_id")
 
     def synchronize_mentions(self, mentions):
         Mention = rt.models.memo.Mention
         for obj in self.get_saved_mentions():
-            if obj.source in mentions:
-                mentions.remove(obj.source)
+            if obj.target in mentions:
+                mentions.remove(obj.target)
             else:
                 obj.delete()
-        for source in mentions:
-            obj = Mention(owner=self, source=source)
+        for target in mentions:
+            obj = Mention(owner=self, target=target)
             # source_id=source.pk,
             # source_type=ContentType.objects.get_for_model(source.__class__))
             obj.full_clean()
@@ -274,7 +274,7 @@ class PreviewableChecker(Checker):
         ):
             yield (True, _("Preview differs from source."))
             is_broken = True
-        found_mentions = set([obj.source for obj in obj.get_saved_mentions()])
+        found_mentions = set([obj.target for obj in obj.get_saved_mentions()])
         if expected_mentions != found_mentions:
             yield (True, _("Mentions differ from expected mentions."))
             is_broken = True

lino/modlib/memo/models.py

@@ -9,6 +9,7 @@ from django.utils.text import format_lazy
 
 # from rstgen.sphinxconf.sigal_image import line2html
 from lino.api import dd, rt, _
+from lino.core import constants
 from lino.core.roles import SiteStaff
 from lino.core.gfks import gfk2lookup
 from lino.modlib.gfks.mixins import Controllable
@@ -17,7 +18,7 @@ from .parser import split_name_rest
 # from .mixins import *
 
 # Translators: will also be concatenated with '(type)' '(object)'
-source_label = _("Source")
+target_label = _("Target")
 
 
 class Mention(Controllable):
@@ -27,36 +28,64 @@ class Mention(Controllable):
         verbose_name = _("Mention")
         verbose_name_plural = _("Mentions")
 
-    source_type = dd.ForeignKey(
+    target_type = dd.ForeignKey(
         ContentType,
         editable=True,
         blank=True,
         null=True,
-        related_name="%(app_label)s_%(class)s_source_set",
-        verbose_name=format_lazy("{} {}", source_label, _("(type)")),
+        related_name="%(app_label)s_%(class)s_target_set",
+        verbose_name=format_lazy("{} {}", target_label, _("(type)")),
     )
 
-    source_id = GenericForeignKeyIdField(
-        source_type,
+    target_id = GenericForeignKeyIdField(
+        target_type,
         editable=True,
         blank=True,
         null=True,
-        verbose_name=format_lazy("{} {}", source_label, _("(object)")),
+        verbose_name=format_lazy("{} {}", target_label, _("(object)")),
     )
 
-    source = GenericForeignKey("source_type", "source_id", verbose_name=source_label)
+    target = GenericForeignKey("target_type", "target_id", verbose_name=target_label)
 
+    @classmethod
+    def get_simple_parameters(cls):
+        for p in super().get_simple_parameters():
+            yield p
+        yield "target_type"
+        yield "target_id"
+
+    def as_summary_item(self, ar, text=None, **kwargs):
+        # raise Exception("20240613")
+        if ar is None:
+            obj = super()
+        elif ar.is_obvious_field('target'):
+            obj = self.owner
+        elif ar.is_obvious_field('owner'):
+            obj = self.target
+        else:
+            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
     model = "memo.Mention"
-    column_names = "source owner *"
+    column_names = "owner target *"
     # detail_layout = """
     # id comment owner created
     # """
 
+# Not used because when you are on the owner, you can see the mentions in the memo text
+# class MentionsByOwner(Mentions):
+#     label = _("Mentions")
+#     master_key = "owner"
+#     column_names = "target *"
+#     default_display_modes = {None: constants.DISPLAY_MODE_SUMMARY}
 
-class MentionsByOwner(Mentions):
-    master_key = "owner"
-    column_names = "source *"
+class MentionsByTarget(Mentions):
+    label = _("Mentioned by")
+    master_key = "target"
+    column_names = "owner *"
+    default_display_modes = {None: constants.DISPLAY_MODE_SUMMARY}