Use plone i18n domain

plone · Jan 27, 2016 · 869f445 · 869f445
1 parent 820bffc
commit 869f445
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/plone/formwidget/namedfile/__init__.py b/plone/formwidget/namedfile/__init__.py
@@ -2,6 +2,6 @@
 from plone.formwidget.namedfile.widget import NamedFileWidget  # noqa
 from plone.formwidget.namedfile.widget import NamedImageFieldWidget  # noqa
 from plone.formwidget.namedfile.widget import NamedImageWidget  # noqa
-import zope.i18nmessageid
+from zope.i18nmessageid import MessageFactory
 
-MessageFactory = zope.i18nmessageid.MessageFactory('plone.formwidget.namedfile')
+_ = MessageFactory('plone')
diff --git a/plone/formwidget/namedfile/configure.zcml b/plone/formwidget/namedfile/configure.zcml
@@ -3,7 +3,7 @@
     xmlns:z3c="http://namespaces.zope.org/z3c"
     xmlns:browser="http://namespaces.zope.org/browser"
     xmlns:i18n="http://namespaces.zope.org/i18n"
-    i18n_domain="plone.formwidget.namedfile">
+    i18n_domain="plone">
 
   <include package="z3c.form" file="meta.zcml" />
   <include package="z3c.form" />

diff --git a/plone/formwidget/namedfile/file_display.pt b/plone/formwidget/namedfile/file_display.pt
@@ -1,4 +1,4 @@
-<span id="" class="" i18n:domain="plone.formwidget.namedfile"
+<span id="" class="" i18n:domain="plone"
       tal:attributes="id view/id;
                       class view/klass;
                       style view/style;
@@ -31,7 +31,6 @@
            tal:attributes="href view/download_url">Filename</a>
         <span class="discreet"> &mdash;<tal:doc_type condition="doc_type">
             <span tal:replace="doc_type"
-                  i18n:domain="plone"
                   i18n:translate="">ContentType</span>,</tal:doc_type>
             <span tal:define="sizekb view/file_size"
                   tal:replace="sizekb" i18n:translate="">100</span>

diff --git a/plone/formwidget/namedfile/file_input.pt b/plone/formwidget/namedfile/file_input.pt
@@ -1,5 +1,5 @@
 <span
-    i18n:domain="plone.formwidget.namedfile"
+    i18n:domain="plone"
     tal:attributes="id view/id;
                     class view/klass;
                     style view/style;
@@ -39,7 +39,6 @@
             >Filename</a>
         <span class="discreet"> &mdash;<tal:doc_type condition="doc_type">
             <span tal:replace="doc_type"
-                  i18n:domain="plone"
                   i18n:translate="">ContentType</span>,</tal:doc_type>
             <span tal:define="sizekb view/file_size" tal:replace="sizekb"
                   i18n:translate="">100</span>

diff --git a/plone/formwidget/namedfile/image_display.pt b/plone/formwidget/namedfile/image_display.pt
@@ -1,4 +1,4 @@
-<span id="" class="" i18n:domain="plone.formwidget.namedfile"
+<span id="" class="" i18n:domain="plone"
       tal:attributes="id view/id;
                       class view/klass;
                       style view/style;

diff --git a/plone/formwidget/namedfile/image_input.pt b/plone/formwidget/namedfile/image_input.pt
@@ -1,5 +1,5 @@
 <span
-    i18n:domain="plone.formwidget.namedfile"
+    i18n:domain="plone"
     tal:attributes="id view/id;
                     class view/klass;
                     style view/style;
@@ -43,7 +43,6 @@
             >Filename</a>
         <span class="discreet"> &mdash;<tal:doc_type condition="doc_type">
             <span tal:replace="doc_type"
-                  i18n:domain="plone"
                   i18n:translate="">ContentType</span>,</tal:doc_type>
             <span tal:define="sizekb view/file_size" tal:replace="sizekb"
                   i18n:translate="">100</span>