From 37b8e0fe1565454ac2f460d4f51e90a1e7bf8c0b Mon Sep 17 00:00:00 2001
From: Timo Stollenwerk <timo@zmag.de>
Date: Wed, 17 Mar 2010 12:34:38 +0000
Subject: [PATCH] Fix #2419342: Fix untranslated published/deleted status
 messages. import _ from p.a.d message factory instead of from the standard
 Plone message factory.

svn path=/plone.app.discussion/trunk/; revision=35092
---
 CHANGES.txt                                | 3 +++
 plone/app/discussion/browser/moderation.py | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f79a1b4..ca4ae61 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,9 @@ Changelog
 1.0b4 (unreleased)
 ------------------
 
+* Fix #2419342: Fix untranslated published/deleted status messages.
+  [timo]
+  
 * Remove fixed width of the actions column of the moderation view. The
   translated button titles can differ in size from the English titles.
   [timo]
diff --git a/plone/app/discussion/browser/moderation.py b/plone/app/discussion/browser/moderation.py
index 4dba5f4..216254b 100644
--- a/plone/app/discussion/browser/moderation.py
+++ b/plone/app/discussion/browser/moderation.py
@@ -6,10 +6,9 @@ from Products.Five.browser.pagetemplatefile import ZopeTwoPageTemplateFile
 
 from Products.CMFCore.utils import getToolByName
 
-from Products.CMFPlone import PloneMessageFactory as _
-
 from Products.statusmessages.interfaces import IStatusMessage
 
+from plone.app.discussion.interfaces import _
 from plone.app.discussion.interfaces import IComment
 
 # Begin ugly hack. It works around a ContentProviderLookupError: plone.htmlhead error caused by Zope 2 permissions.