From 29a81f07178b56aa8770c48ef395d74e7913f6e2 Mon Sep 17 00:00:00 2001
From: Hanno Schlichting <hanno@hannosch.eu>
Date: Wed, 27 Jan 2010 14:56:30 +0000
Subject: [PATCH] Fixed i18n domain in GenericSetup profiles to be ``plone``.
 Other values aren't supported for GS profiles.

svn path=/plone.app.discussion/trunk/; revision=33492
---
 docs/HISTORY.txt                                                | 1 +
 plone/app/discussion/profiles/default/actions.xml               | 2 +-
 plone/app/discussion/profiles/default/controlpanel.xml          | 2 +-
 plone/app/discussion/profiles/default/portal_atct.xml           | 2 +-
 plone/app/discussion/profiles/default/types/Discussion_Item.xml | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index eec31a2..4fab0a2 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -4,6 +4,7 @@ Changelog
 1.0b3 (XXXX-XX-XX)
 ------------------
 
+* Fixed i18n domain in GenericSetup profiles to be ``plone``. Other values aren't supported for GS profiles. [hannosch]
 * Provide our own copy of the default one state workflow. Not all Plone sites have this workflow installed. [hannosch]
 * Register the event subscribers for the correct interfaces in Plone 3. [hannosch]
 * Factored out subscriber declarations into its own ZCML file. [hannosch]
diff --git a/plone/app/discussion/profiles/default/actions.xml b/plone/app/discussion/profiles/default/actions.xml
index 27c57a1..d880d85 100644
--- a/plone/app/discussion/profiles/default/actions.xml
+++ b/plone/app/discussion/profiles/default/actions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <object name="portal_actions" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <object name="site_actions">
-  <object name="review-comments" meta_type="CMF Action" i18n:domain="plone.app.discussion">
+  <object name="review-comments" meta_type="CMF Action" i18n:domain="plone">
    <property name="title" i18n:translate="">Moderate comments</property>
    <property name="description" i18n:translate=""></property>
    <property name="url_expr">string:$portal_url/@@moderate-comments</property>
diff --git a/plone/app/discussion/profiles/default/controlpanel.xml b/plone/app/discussion/profiles/default/controlpanel.xml
index 7bd6bcd..88450b8 100644
--- a/plone/app/discussion/profiles/default/controlpanel.xml
+++ b/plone/app/discussion/profiles/default/controlpanel.xml
@@ -2,7 +2,7 @@
 <object
     name="portal_controlpanel"
     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-    i18n:domain="plone.app.discussion"
+    i18n:domain="plone"
     purge="False">
 
     <configlet
diff --git a/plone/app/discussion/profiles/default/portal_atct.xml b/plone/app/discussion/profiles/default/portal_atct.xml
index 953c8a0..068e0d9 100644
--- a/plone/app/discussion/profiles/default/portal_atct.xml
+++ b/plone/app/discussion/profiles/default/portal_atct.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <atcttool xmlns:i18n="http://xml.zope.org/namespaces/i18n">
-    <topic_indexes i18n:domain="plone.app.discussion">
+    <topic_indexes i18n:domain="plone">
 
         <index name="commentators" friendlyName="Commentators"
             description="Users who have commented on the item"
diff --git a/plone/app/discussion/profiles/default/types/Discussion_Item.xml b/plone/app/discussion/profiles/default/types/Discussion_Item.xml
index ac15877..f5feac0 100644
--- a/plone/app/discussion/profiles/default/types/Discussion_Item.xml
+++ b/plone/app/discussion/profiles/default/types/Discussion_Item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <object name="Discussion Item" meta_type="Factory-based Type Information"
-   i18n:domain="plone.app.discussion" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+   i18n:domain="plone" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title" i18n:translate="">Comment</property>
  <property name="description" i18n:translate="">Comments added to a content item.</property>
  <property name="content_icon">discussionitem_icon.gif</property>