This package now uses the plone i18n domain.

svn path=/plone.app.z3cform/trunk/; revision=38600
plone · Aug 6, 2010 · 17c687f · 17c687f
1 parent b309235
commit 17c687f
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 9 deletions.
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -4,6 +4,9 @@ Changelog
 0.5.1 - unreleased
 ------------------
 
+* This package now uses the plone i18n domain.
+  [vincentfretin]
+
 * Added option to override <form action=""> [miohtama]
 
 * Updated README regarding form action  and method [miohtama] 

diff --git a/plone/app/z3cform/configure.zcml b/plone/app/z3cform/configure.zcml
@@ -3,7 +3,7 @@
     xmlns:browser="http://namespaces.zope.org/browser"
     xmlns:i18n="http://namespaces.zope.org/i18n"
     xmlns:zcml="http://namespaces.zope.org/zcml"
-    i18n_domain="plone.app.z3cform">
+    i18n_domain="plone">
 
   <include package="plone.z3cform" />
   <include package=".wysiwyg" />

diff --git a/plone/app/z3cform/profiles.zcml b/plone/app/z3cform/profiles.zcml
@@ -3,7 +3,7 @@
            xmlns:five="http://namespaces.zope.org/five"
            xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
            xmlns:plone="http://namespaces.plone.org/plone"
-           i18n_domain="plone.app.z3cform">
+           i18n_domain="plone">
 
   <genericsetup:registerProfile
       name="default"

diff --git a/plone/app/z3cform/templates/form.pt b/plone/app/z3cform/templates/form.pt
@@ -2,7 +2,7 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       xmlns:tal="http://xml.zope.org/namespaces/tal"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      i18n:domain="plone.z3cform"
+      i18n:domain="plone"
       metal:use-macro="context/main_template/macros/master">
 
     <metal:block fill-slot="main">

diff --git a/plone/app/z3cform/templates/layout.pt b/plone/app/z3cform/templates/layout.pt
@@ -4,7 +4,7 @@
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
       lang="en"
       metal:use-macro="here/main_template/macros/master"
-      i18n:domain="plone.z3cform">
+      i18n:domain="plone">
 <body>
 
     <metal:main fill-slot="main">

diff --git a/plone/app/z3cform/templates/macros.pt b/plone/app/z3cform/templates/macros.pt
@@ -2,7 +2,7 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       xmlns:tal="http://xml.zope.org/namespaces/tal"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      i18n:domain="plone.app.z3cform">
+      i18n:domain="plone">
 
     <body>
 
@@ -16,13 +16,13 @@
 
                 <tal:status define="status view/status" condition="status">
                     <dl class="portalMessage error" tal:condition="view/widgets/errors">
-                        <dt i18n:domain="plone" i18n:translate="">
+                        <dt i18n:translate="">
                             Error
                         </dt>
                         <dd tal:content="status" />
                     </dl>
                     <dl class="portalMessage info" tal:condition="not: view/widgets/errors">
-                        <dt i18n:domain="plone" i18n:translate="">
+                        <dt i18n:translate="">
                             Info
                         </dt>
                         <dd tal:content="status" />

diff --git a/plone/app/z3cform/tests/testing.zcml b/plone/app/z3cform/tests/testing.zcml
@@ -4,7 +4,7 @@
            xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
            xmlns:plone="http://namespaces.plone.org/plone"
            xmlns:i18n="http://namespaces.zope.org/i18n"
-           i18n_domain="plone.app.z3cform">
+           i18n_domain="plone">
 
     <include package="zope.annotation" />
     <include package="plone.app.z3cform" />

diff --git a/plone/app/z3cform/wysiwyg/configure.zcml b/plone/app/z3cform/wysiwyg/configure.zcml
@@ -1,7 +1,7 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:z3c="http://namespaces.zope.org/z3c"
-    i18n_domain="plone.z3cform">
+    i18n_domain="plone">
 
   <class class=".widget.WysiwygWidget">
     <require