From 28d7556c92ac8973594ccfb59798579ff65befaf Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin@eaudeweb.ro>
Date: Fri, 18 Apr 2014 16:42:06 +0300
Subject: [PATCH] Remove hard dependency on plone.stringinterp

---
 plone/app/discussion/contentrules.zcml | 62 +++++++++++++-------------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/plone/app/discussion/contentrules.zcml b/plone/app/discussion/contentrules.zcml
index c3d1108..5dd222a 100644
--- a/plone/app/discussion/contentrules.zcml
+++ b/plone/app/discussion/contentrules.zcml
@@ -58,39 +58,41 @@
   </configure>
 
   <!-- Content rules strings -->
-  <adapter
-    for="zope.interface.Interface"
-    provides="plone.stringinterp.interfaces.IStringSubstitution"
-    factory=".contentrules.Id"
-    name="comment_id"
-    />
+  <configure zcml:condition="installed plone.stringinterp">
+    <adapter
+      for="zope.interface.Interface"
+      provides="plone.stringinterp.interfaces.IStringSubstitution"
+      factory=".contentrules.Id"
+      name="comment_id"
+      />
 
-  <adapter
-    for="zope.interface.Interface"
-    provides="plone.stringinterp.interfaces.IStringSubstitution"
-    factory=".contentrules.Text"
-    name="comment_text"
-    />
+    <adapter
+      for="zope.interface.Interface"
+      provides="plone.stringinterp.interfaces.IStringSubstitution"
+      factory=".contentrules.Text"
+      name="comment_text"
+      />
 
-  <adapter
-    for="zope.interface.Interface"
-    provides="plone.stringinterp.interfaces.IStringSubstitution"
-    factory=".contentrules.AuthorUserName"
-    name="comment_user_id"
-    />
+    <adapter
+      for="zope.interface.Interface"
+      provides="plone.stringinterp.interfaces.IStringSubstitution"
+      factory=".contentrules.AuthorUserName"
+      name="comment_user_id"
+      />
 
-  <adapter
-    for="zope.interface.Interface"
-    provides="plone.stringinterp.interfaces.IStringSubstitution"
-    factory=".contentrules.AuthorFullName"
-    name="comment_user_fullname"
-    />
+    <adapter
+      for="zope.interface.Interface"
+      provides="plone.stringinterp.interfaces.IStringSubstitution"
+      factory=".contentrules.AuthorFullName"
+      name="comment_user_fullname"
+      />
 
-  <adapter
-    for="zope.interface.Interface"
-    provides="plone.stringinterp.interfaces.IStringSubstitution"
-    factory=".contentrules.AuthorEmail"
-    name="comment_user_email"
-    />
+    <adapter
+      for="zope.interface.Interface"
+      provides="plone.stringinterp.interfaces.IStringSubstitution"
+      factory=".contentrules.AuthorEmail"
+      name="comment_user_email"
+      />
+  </configure>
 
 </configure>