Use plone i18n domain

plone.app.discussion is an official Plone core package, thus their translations belong to plone.app.locales. This commit removes the plone.app.discussion domain and changes it for plone. This fixes: https://github.com/plone/plone.app.discussion/issues/66
2015-11-05 00:26:49 +01:00
parent 24aadbdb72
commit 0713bcd8bc
16 changed files with 16 additions and 23 deletions
@@ -2,7 +2,7 @@
    xmlns="http://namespaces.zope.org/zope"
    xmlns:meta="http://namespaces.zope.org/meta"
    xmlns:zcml="http://namespaces.zope.org/zcml"
-    i18n_domain="plone.app.discussion">
+    i18n_domain="plone">

    <!-- Captcha comment form extender -->
    <configure zcml:condition="have plone.app.discussion-captcha">
@@ -6,7 +6,7 @@ from Products.CMFCore.utils import getToolByName
 from Products.Five.browser import BrowserView
 from Products.statusmessages.interfaces import IStatusMessage
 from comments import CommentForm
-from plone.app.discussion import PloneAppDiscussionMessageFactory as _
+from plone.app.discussion import _
 from plone.registry.interfaces import IRegistry
 from plone.z3cform.layout import wrap_form
 from z3c.form import button
@@ -63,7 +63,7 @@
                                         alt reply/author_name" />
                </div>

-                <div class="documentByLine" i18n:domain="plone.app.discussion">
+                <div class="documentByLine">
                    <tal:name>
                        <a href=""
                           tal:condition="has_author_link"
@@ -170,7 +170,6 @@

        <div tal:condition="python: has_replies and not isDiscussionAllowed"
             class="discreet"
-             i18n:domain="plone.app.discussion"
             i18n:translate="label_commenting_disabled">
            Commenting has been disabled.
        </div>
@@ -7,7 +7,7 @@ from Products.CMFCore.utils import getToolByName
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from Products.statusmessages.interfaces import IStatusMessage
 from datetime import datetime
-from plone.app.discussion import PloneAppDiscussionMessageFactory as _
+from plone.app.discussion import _
 from plone.app.discussion.browser.validator import CaptchaValidator
 from plone.app.discussion.interfaces import ICaptcha
 from plone.app.discussion.interfaces import IComment
@@ -2,7 +2,7 @@
    xmlns="http://namespaces.zope.org/zope"
    xmlns:browser="http://namespaces.zope.org/browser"
    xmlns:zcml="http://namespaces.zope.org/zcml"
-    i18n_domain="plone.app.discussion">
+    i18n_domain="plone">

    <include package="plone.app.registry" />

@@ -4,7 +4,7 @@
      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
      lang="en"
      metal:use-macro="context/main_template/macros/master"
-      i18n:domain="plone.app.discussion">
+      i18n:domain="plone">
 <body>

 <metal:main fill-slot="main">
@@ -27,7 +27,7 @@

        <div class="portalMessage warning"
            tal:condition="not: view/moderation_enabled">
-            <strong i18n:domain="plone" i18n:translate="">Warning</strong>
+            <strong i18n:translate="">Warning</strong>
            <span tal:omit-tag="" i18n:translate="message_moderation_disabled">
                Moderation workflow is disabled. You have to
                <a i18n:name="enable_comment_workflow"