Merge pull request #298 from plone/erral-translation-fixes-main

Pass request as context parameter in the translate function (main branch)

Author: erral

.meta.toml

@@ -3,7 +3,7 @@
 # See the inline comments on how to expand/tweak this configuration file
 [meta]
 template = "default"
-commit-id = "2.2.1"
+commit-id = "2.3.2"
 
 [pyproject]
 dependencies_ignores = "['Products.LinguaPlone.interfaces.ITranslatable', 'collective.akismet', 'collective.z3cform.norobots', 'plone.formwidget.captcha', 'plone.formwidget.recaptcha', 'plone.formwidget.hcaptcha', 'plone.contentrules', 'plone.app.contentrules', 'plone.restapi', 'plone.stringinterp', 'plone.app.collection']"

news/+meta.internal

@@ -0,0 +1,2 @@
+Update configuration files.
+[plone devs]

news/+translatecontext.bugfix

@@ -0,0 +1 @@
+Fix translation of comment byline. @erral

src/plone/app/discussion/comment.py

@@ -35,6 +35,7 @@
 from zope.component import queryUtility
 from zope.component.factory import Factory
 from zope.event import notify
+from zope.globalrequest import getRequest
 from zope.i18n import translate
 from zope.i18nmessageid import Message
 from zope.interface import implementer
@@ -206,6 +207,7 @@ def Title(self):
                         default="Anonymous",
                     ),
                 ),
+                context=getRequest(),
             )
         else:
             author_name = self.author_name
@@ -220,8 +222,10 @@ def Title(self):
                     "author_name": safe_text(author_name),
                     "content": safe_text(content.Title()),
                 },
-            )
+            ),
+            context=getRequest(),
         )
+
         return title
 
     def Creator(self):
@@ -381,7 +385,7 @@ def notify_user(obj, event):
     if not emails:
         return
 
-    subject = translate(_("A comment has been posted."), context=obj.REQUEST)
+    subject = translate(_("A comment has been posted."), context=getRequest())
     message = translate(
         Message(
             MAIL_NOTIFICATION_MESSAGE,
@@ -391,7 +395,7 @@ def notify_user(obj, event):
                 "text": obj.text,
             },
         ),
-        context=obj.REQUEST,
+        context=getRequest(),
     )
     for email in emails:
         # Send email
@@ -449,7 +453,7 @@ def notify_moderator(obj, event):
     content_object = aq_parent(conversation)
 
     # Compose email
-    subject = translate(_("A comment has been posted."), context=obj.REQUEST)
+    subject = translate(_("A comment has been posted."), context=getRequest())
     message = translate(
         Message(
             MAIL_NOTIFICATION_MESSAGE_MODERATOR,
@@ -465,10 +469,11 @@ def notify_moderator(obj, event):
                             default="Anonymous",
                         ),
                     ),
+                    context=getRequest(),
                 ),
             },
         ),
-        context=obj.REQUEST,
+        context=getRequest(),
     )
 
     # Send email

tox.ini

@@ -62,6 +62,7 @@ description = check if the package defines all its dependencies
 skip_install = true
 deps =
     build
+    setuptools<82.0.0
     z3c.dependencychecker==2.14.3
 commands =
     python -m build --sdist