Changeset 2754 in products

Timestamp:

Aug 16, 2010 11:40:15 AM (14 years ago)

Author:

kroman0

Message:

Fixed issue #7

Location:

quintagroup.plonecomments/trunk

Files:

• . (modified) (1 prop)
• quintagroup/plonecomments/locales (modified) (1 prop)
• quintagroup/plonecomments/skins/quintagroup_plonecomments/discussion_edit_form.cpt (modified) (1 prop)
• quintagroup/plonecomments/utils.py (modified) (5 diffs)

quintagroup.plonecomments/trunk/quintagroup/plonecomments/utils.py

@@ -4 +4 @@
 _ = MessageFactory("quintagroup.plonecomments")
 from Products.CMFCore.utils import getToolByName
+from Products.CMFPlone.utils import safe_unicode
 from config import warning
 
@@ -121 +122 @@
         subject = translate(_(u"approve_user_notification_subject",
             default=u"Your comment on ${title} is now published",
-            mapping={u"title" : getParent(context).Title()}),
+            mapping={u"title": safe_unicode(getParent(context).title_or_id())}),
             context=context.REQUEST)
         if user_email:
@@ -136 +137 @@
         subject = translate(_(u"rejected_user_notification_subject",
             default=u"Your comment on ${title} was not approved",
-            mapping={u"title" : getParent(context).Title()}),
+            mapping={u"title": safe_unicode(getParent(context).title_or_id())}),
             context=context.REQUEST)
         if user_email:
@@ -152 +153 @@
         subject = translate(_(u"reply_user_notification_subject",
             default=u"Someone replied to your comment on ${title}",
-            mapping={u"title" : getParent(context).Title()}),
+            mapping={u"title": safe_unicode(getParent(context).title_or_id())}),
             context=context.REQUEST)
         di_parrent = getDIParent(reply)
@@ -217 +218 @@
                     'comment_text':comment.text}
             subject = translate(_(u"report_abuse_subject",
-                default=u"[${organization_name}] A comment on ${title} has been reported for abuse.",
-                mapping={u"organization_name" : organization_name, u"title" : getParent(context).Title()}),
+                default=u"[${organization_name}] A comment on ${title} has "
+                        u"been reported for abuse.",
+                mapping={u"organization_name": organization_name,
+                         u"title":
+                             safe_unicode(getParent(context).title_or_id())}),
                 context=context.REQUEST)
         else: