[Checkins] SVN: z3ext.preferences/trunk/ UI api refactored

Nikolay Kim fafhrd at datacom.kz
Tue Oct 14 08:26:51 EDT 2008


Log message for revision 92192:
  UI api refactored

Changed:
  U   z3ext.preferences/trunk/CHANGES.txt
  U   z3ext.preferences/trunk/buildout.cfg
  A   z3ext.preferences/trunk/i18ncheck.in
  U   z3ext.preferences/trunk/setup.py
  U   z3ext.preferences/trunk/src/z3ext/preferences/browser/breadcrumb.py
  D   z3ext.preferences/trunk/src/z3ext/preferences/browser/category.pt
  D   z3ext.preferences/trunk/src/z3ext/preferences/browser/category.py
  U   z3ext.preferences/trunk/src/z3ext/preferences/browser/configure.zcml
  U   z3ext.preferences/trunk/src/z3ext/preferences/browser/group.pt
  U   z3ext.preferences/trunk/src/z3ext/preferences/browser/group.py
  A   z3ext.preferences/trunk/src/z3ext/preferences/browser/groupcategory.pt
  A   z3ext.preferences/trunk/src/z3ext/preferences/browser/grouppreview.pt
  U   z3ext.preferences/trunk/src/z3ext/preferences/browser/index.pt
  U   z3ext.preferences/trunk/src/z3ext/preferences/browser/interfaces.py
  U   z3ext.preferences/trunk/src/z3ext/preferences/browser/layout.pt
  U   z3ext.preferences/trunk/src/z3ext/preferences/browser/layoutcontent.pt
  U   z3ext.preferences/trunk/src/z3ext/preferences/browser/navigation.py
  U   z3ext.preferences/trunk/src/z3ext/preferences/configure.zcml
  D   z3ext.preferences/trunk/src/z3ext/preferences/i18n.py
  U   z3ext.preferences/trunk/src/z3ext/preferences/interfaces.py
  A   z3ext.preferences/trunk/src/z3ext/preferences/locales/
  U   z3ext.preferences/trunk/src/z3ext/preferences/preferencetype.py
  U   z3ext.preferences/trunk/src/z3ext/preferences/root.py

-=-
Modified: z3ext.preferences/trunk/CHANGES.txt
===================================================================
--- z3ext.preferences/trunk/CHANGES.txt	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/CHANGES.txt	2008-10-14 12:26:50 UTC (rev 92192)
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+1.4.0 (2008-10-14)
+------------------
+
+- UI api refactored
+
+
 1.3.2 (2008-05-16)
 ------------------
 

Modified: z3ext.preferences/trunk/buildout.cfg
===================================================================
--- z3ext.preferences/trunk/buildout.cfg	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/buildout.cfg	2008-10-14 12:26:50 UTC (rev 92192)
@@ -1,6 +1,6 @@
 [buildout]
 develop = .
-parts = test coverage-test coverage-report
+parts = test coverage-test coverage-report i18n i18ncheck i18ndude
 
 [test]
 recipe = zc.recipe.testrunner
@@ -16,3 +16,35 @@
 eggs = z3c.coverage
 scripts = coverage=coverage-report
 arguments = ('coverage', 'coverage/report')
+
+[i18n]
+recipe = z3c.recipe.i18n:i18n
+packages = z3ext.preferences
+domain = z3ext.preferences
+output = ${buildout:directory}/src/z3ext/preferences/locales
+eggs = z3ext.preferences [test]
+zcml =
+  <configure i18n_domain="zope"
+             xmlns:zcml="http://namespaces.zope.org/zcml"
+             xmlns:browser="http://namespaces.zope.org/browser">
+    <include package="zope.component" file="meta.zcml" />
+    <include package="zope.viewlet" file="meta.zcml" />
+    <include package="zope.app.component" file="meta.zcml" />
+    <include package="zope.app.security" file="meta.zcml" />
+    <include package="zope.app.pagetemplate" file="meta.zcml" />
+    <include package="zope.app.security" />
+    <include package="zope.app.zcmlfiles" />
+
+    <include package="z3c.autoinclude" file="meta.zcml" />
+    <include package="z3ext.preferences" />
+  </configure>
+
+[i18ncheck]
+recipe = buildout_script
+template_dir = ${buildout:directory}/
+template = i18ncheck.in
+
+[i18ndude]
+unzip = true
+recipe = zc.recipe.egg
+eggs = i18ndude

Added: z3ext.preferences/trunk/i18ncheck.in
===================================================================
--- z3ext.preferences/trunk/i18ncheck.in	                        (rev 0)
+++ z3ext.preferences/trunk/i18ncheck.in	2008-10-14 12:26:50 UTC (rev 92192)
@@ -0,0 +1,4 @@
+#!/bin/sh
+# Startup or shutdown buildbot
+
+bin/i18ndude find-untranslated ./ | grep z3ext.preferences | less


Property changes on: z3ext.preferences/trunk/i18ncheck.in
___________________________________________________________________
Name: svn:executable
   + *

Modified: z3ext.preferences/trunk/setup.py
===================================================================
--- z3ext.preferences/trunk/setup.py	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/setup.py	2008-10-14 12:26:50 UTC (rev 92192)
@@ -21,7 +21,7 @@
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
-version='1.3.3dev'
+version='1.4.0dev'
 
 
 setup(name = 'z3ext.preferences',
@@ -65,6 +65,7 @@
                           'zope.securitypolicy',
 			  'zope.cachedescriptors',
 			  'zope.pagetemplate',
+			  'zope.i18n',
                           'zope.i18nmessageid',
 			  'zope.viewlet',
 			  'zope.contentprovider',

Modified: z3ext.preferences/trunk/src/z3ext/preferences/browser/breadcrumb.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/breadcrumb.py	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/breadcrumb.py	2008-10-14 12:26:50 UTC (rev 92192)
@@ -17,11 +17,9 @@
 """
 from zope import interface, component
 from z3c.breadcrumb.browser import GenericBreadcrumb
+from z3ext.preferences.interfaces import _, IPreferenceGroup
 
-from z3ext.preferences.i18n import _
-from z3ext.preferences.interfaces import IPreferenceGroup
 
-
 class PreferenceGroupBreadcrumb(GenericBreadcrumb):
     component.adapts(IPreferenceGroup, interface.Interface)
     

Deleted: z3ext.preferences/trunk/src/z3ext/preferences/browser/category.pt
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/category.pt	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/category.pt	2008-10-14 12:26:50 UTC (rev 92192)
@@ -1,8 +0,0 @@
-<tal:block tal:content="structure view/renderForm" />
-
-<div class="frame" tal:condition="view/groups">
-  <tal:block tal:repeat="group view/groups">
-    <tal:block tal:content="structure group/render" />
-    <br />
-  </tal:block>
-</div>

Deleted: z3ext.preferences/trunk/src/z3ext/preferences/browser/category.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/category.py	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/category.py	2008-10-14 12:26:50 UTC (rev 92192)
@@ -1,56 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2007 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-""" IPreferenceCategory view
-
-$Id$
-"""
-from zope import schema, interface
-from zope.component import getMultiAdapter
-from z3ext.layoutform import PageletEditForm
-
-from group import PreferenceGroup
-
-
-class PreferenceCategory(PreferenceGroup):
-
-    label = u''
-    description = u''
-
-    def update(self):
-        super(PreferenceCategory, self).update()
-
-        context = self.context
-        request = self.request
-
-        subgroups = []
-
-        for name, group in context.items():
-            if not group.isAvailable():
-                continue
-
-            view = getMultiAdapter((group, request), name='view.html')
-            view.update()
-
-            subgroups.append(view)
-
-        self.groups = subgroups
-
-    def renderForm(self):
-        if bool(schema.getFields(self.context.__schema__)):
-            return PageletEditForm.render(self)
-        else:
-            return u''
-
-    def render(self):
-        return self.template()

Modified: z3ext.preferences/trunk/src/z3ext/preferences/browser/configure.zcml
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/configure.zcml	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/configure.zcml	2008-10-14 12:26:50 UTC (rev 92192)
@@ -19,6 +19,17 @@
      template="layoutcontent.pt"
      hidden="yes" />
 
+  <!-- pagelet types -->
+  <interface
+     name="preference.editGroup"
+     type="z3ext.layout.interfaces.IPageletType"
+     interface=".interfaces.IEdit" />
+
+  <interface
+     name="preference.previewGroup"
+     type="z3ext.layout.interfaces.IPageletType"
+     interface=".interfaces.IPreview" />
+
   <!-- browser view -->
   <adapter
      name="preferences"
@@ -44,27 +55,33 @@
      class=".index.PreferencesView"
      permission="zope.View" />
 
-  <!-- preference category view -->
+  <!-- preference group view -->
   <z3ext:pagelet
      name="index.html"
-     for="..interfaces.IPreferenceCategory"
-     template="category.pt"
-     class=".category.PreferenceCategory"
+     for="..interfaces.IPreferenceGroup"
+     template="group.pt"
+     class=".group.PreferenceGroup"
      permission="zope.Public" />
 
-  <!-- preference group view -->
   <z3ext:pagelet
      name="index.html"
-     for="..interfaces.IPreferenceGroup"
+     for="..interfaces.IPreferenceCategory"
+     template="groupcategory.pt"
      class=".group.PreferenceGroup"
      permission="zope.Public" />
 
   <z3ext:pagelet
-     name="view.html"
      for="..interfaces.IPreferenceGroup"
-     template="group.pt"
+     provides=".interfaces.IEdit"
+     class=".group.PreferenceGroupView"
      permission="zope.Public" />
 
+  <z3ext:pagelet
+     for="..interfaces.IPreferenceGroup"
+     template="grouppreview.pt"
+     provides=".interfaces.IPreview"
+     permission="zope.Public" />
+
   <!-- navigation -->
   <browser:viewletManager
      name="z3ext.preferences-navigation"

Modified: z3ext.preferences/trunk/src/z3ext/preferences/browser/group.pt
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/group.pt	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/group.pt	2008-10-14 12:26:50 UTC (rev 92192)
@@ -1,3 +1,4 @@
-<h2><a tal:attributes="href string:${context/@@absolute_url}/"
-       tal:content="context/__title__"></a></h2>
-<div class="discreet" tal:content="context/__description__"></div>
+<tal:block tal:condition="view/hasFields"
+	   tal:content="structure context/@@pagelet/preference.editGroup" />
+<tal:block tal:repeat="group view/subgroups"
+	   tal:content="structure group/@@pagelet/preference.editGroup" />

Modified: z3ext.preferences/trunk/src/z3ext/preferences/browser/group.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/group.py	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/group.py	2008-10-14 12:26:50 UTC (rev 92192)
@@ -16,32 +16,13 @@
 $Id$
 """
 from zope import schema
-from zope.component import getMultiAdapter
 from zope.cachedescriptors.property import Lazy
 from z3ext.layoutform import Fields, PageletEditForm
 
 
-class PreferenceGroup(PageletEditForm):
+class PreferenceGroup(object):
 
-    @property
-    def prefix(self):
-        return str(self.context.__id__)
-
-    @property
-    def label(self):
-        return self.context.__title__
-
-    @property
-    def description(self):
-        return self.context.__description__
-
-    @Lazy
-    def fields(self):
-        return Fields(self.context.__schema__, omitReadOnly=True)
-
     def update(self):
-        super(PreferenceGroup, self).update()
-
         context = self.context
         request = self.request
 
@@ -50,20 +31,26 @@
         for name, group in context.items():
             if not group.isAvailable():
                 continue
+            subgroups.append(group)
 
-            view = getMultiAdapter((group, request), name='index.html')
-            view.update()
+        self.subgroups = subgroups
+        self.hasFields = bool(schema.getFields(self.context.__schema__))
 
-            subgroups.append(view)
 
-        self.groups = subgroups
+class PreferenceGroupView(PageletEditForm):
 
-    def render(self):
-        result = []
-        
-        if bool(schema.getFields(self.context.__schema__)):
-            result.append(super(PreferenceGroup, self).render())
+    @property
+    def prefix(self):
+        return str(self.context.__id__)
 
-        result.extend([group.render() for group in self.groups])
+    @property
+    def label(self):
+        return self.context.__title__
 
-        return u'<br />\n'.join(result)
+    @property
+    def description(self):
+        return self.context.__description__
+
+    @Lazy
+    def fields(self):
+        return Fields(self.context.__schema__, omitReadOnly=True)

Copied: z3ext.preferences/trunk/src/z3ext/preferences/browser/groupcategory.pt (from rev 92184, z3ext.preferences/trunk/src/z3ext/preferences/browser/category.pt)
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/groupcategory.pt	                        (rev 0)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/groupcategory.pt	2008-10-14 12:26:50 UTC (rev 92192)
@@ -0,0 +1,9 @@
+<tal:block tal:condition="view/hasFields"
+	   tal:content="structure context/@@pagelet/preference.editGroup" />
+
+<div class="z-frame" tal:condition="view/subgroups">
+  <tal:block tal:repeat="group view/subgroups">
+    <tal:block tal:content="structure group/@@pagelet/preference.previewGroup" />
+    <br />
+  </tal:block>
+</div>

Added: z3ext.preferences/trunk/src/z3ext/preferences/browser/grouppreview.pt
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/grouppreview.pt	                        (rev 0)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/grouppreview.pt	2008-10-14 12:26:50 UTC (rev 92192)
@@ -0,0 +1,3 @@
+<h2><a tal:attributes="href string:${context/@@absolute_url}/"
+       tal:content="context/__title__"></a></h2>
+<div class="discreet" tal:content="context/__description__"></div>

Modified: z3ext.preferences/trunk/src/z3ext/preferences/browser/index.pt
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/index.pt	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/index.pt	2008-10-14 12:26:50 UTC (rev 92192)
@@ -1,36 +1,32 @@
-<tal:block tal:define="img context/++resource++z3ext-images/bullet2.gif|nothing">
-  <div class="frame">
-    <ul class="listing">
-      <li tal:repeat="item view/groups">
-	<tal:block tal:define="group item/group">
-	  <div class="icon" tal:define="icon group/@@zmi_icon|nothing"
-	       tal:condition="python:icon or img">
-	    <tal:block tal:condition="icon" tal:content="structure icon"/>
-	    <img tal:condition="not:icon" tal:attributes="src img" />
-	  </div>
-	  <div class="details">
-	    <a tal:attributes="href string:${group/__id__}/">
-	      <tal:block tal:content="group/__title__"/></a>
-	    <div><tal:block tal:content="group/__description__"/> &nbsp;</div>
-	    
-	    <ul class="listing" tal:condition="item/subgroups">
-	      <li tal:repeat="sgroup item/subgroups">
-		<div class="icon" tal:define="icon sgroup/group/@@zmi_icon|nothing"
-		     tal:condition="python:icon or img">
-		  <tal:block tal:condition="icon" tal:content="structure icon" />
-		  <img tal:condition="not:icon" tal:attributes="src img"/>
-		</div>
-		<div class="details">
-		  <a tal:attributes="href string:${group/__id__}/${sgroup/id}/">
-		    <tal:block tal:content="sgroup/group/__title__"/></a>
-		  <div><tal:block tal:content="sgroup/group/__description__"/> 
-		    &nbsp;</div>
-		</div>
-	      </li>
-	    </ul>
-	  </div>
-	</tal:block>
-      </li>
-    </ul>
-  </div>
-</tal:block>
+<div class="z-frame">
+  <ul class="listing">
+    <li tal:repeat="item view/groups">
+      <tal:block tal:define="group item/group">
+	<div class="icon" tal:define="icon group/@@zmi_icon|nothing"
+	     tal:condition="icon">
+	  <tal:block tal:condition="icon" tal:content="structure icon"/>
+	</div>
+	<div class="details">
+	  <a tal:attributes="href string:${group/__id__}/">
+	    <tal:block tal:content="group/__title__"/></a>
+	  <div><tal:block tal:content="group/__description__"/> &nbsp;</div>
+	  
+	  <ul class="listing" tal:condition="item/subgroups">
+	    <li tal:repeat="sgroup item/subgroups">
+	      <div class="icon" tal:define="icon sgroup/group/@@zmi_icon|nothing"
+		   tal:condition="icon">
+		<tal:block tal:condition="icon" tal:content="structure icon" />
+	      </div>
+	      <div class="details">
+		<a tal:attributes="href string:${group/__id__}/${sgroup/id}/">
+		  <tal:block tal:content="sgroup/group/__title__"/></a>
+		<div><tal:block tal:content="sgroup/group/__description__"/> 
+		  &nbsp;</div>
+	      </div>
+	    </li>
+	  </ul>
+	</div>
+      </tal:block>
+    </li>
+  </ul>
+</div>

Modified: z3ext.preferences/trunk/src/z3ext/preferences/browser/interfaces.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/interfaces.py	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/interfaces.py	2008-10-14 12:26:50 UTC (rev 92192)
@@ -15,8 +15,17 @@
 
 $Id$
 """
+from zope import interface
 from zope.viewlet.interfaces import IViewletManager
 
 
+class IEdit(interface.Interface):
+    """ preference group edit view """
+
+
+class IPreview(interface.Interface):
+    """ preference group preview """
+
+
 class IPreferencesNavigation(IViewletManager):
     """ preferences navigation viewlet manager """

Modified: z3ext.preferences/trunk/src/z3ext/preferences/browser/layout.pt
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/layout.pt	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/layout.pt	2008-10-14 12:26:50 UTC (rev 92192)
@@ -3,7 +3,7 @@
                  nav provider:z3ext.preferences-navigation;
 		 noNav not:nav;
 		 rendered view/render">
-  <div class="page">
+  <div class="z-page">
     <table class="wide" tal:omit-tag="noNav">
       <tr style="vertical-align: top" tal:omit-tag="noNav">
 	<td style="padding-right: 1em; width: 200px"

Modified: z3ext.preferences/trunk/src/z3ext/preferences/browser/layoutcontent.pt
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/layoutcontent.pt	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/layoutcontent.pt	2008-10-14 12:26:50 UTC (rev 92192)
@@ -1,5 +1,5 @@
 <h1 tal:content="layoutcontext/__title__"></h1>
-<div class="pageDescription" tal:content="layoutcontext/__description__"></div>
+<div class="z-page-description" tal:content="layoutcontext/__description__"></div>
 
 <div id="z-viewspace" tal:content="structure view/render">
   [rendered body]

Modified: z3ext.preferences/trunk/src/z3ext/preferences/browser/navigation.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/navigation.py	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/navigation.py	2008-10-14 12:26:50 UTC (rev 92192)
@@ -45,6 +45,7 @@
 
     def _process(self, context, path, level=1):
         request = self.request
+        maincontext = self.context
 
         if path:
             data = []
@@ -70,7 +71,7 @@
 
                 if prefs.__id__ == self.context.__id__:
                     info['selected'] = True
-                    info['items'] = self._process(prefs, [prefs], level+1)
+                    #info['items'] = self._process(prefs, [prefs], level+1)
 
                 if IPreferenceCategory.providedBy(prefs) and not info['items']:
                     if not self._process(prefs, [prefs], level+1):
@@ -85,4 +86,3 @@
             return u''
         else:
             return super(Navigation, self).render()
-

Modified: z3ext.preferences/trunk/src/z3ext/preferences/configure.zcml
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/configure.zcml	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/src/z3ext/preferences/configure.zcml	2008-10-14 12:26:50 UTC (rev 92192)
@@ -1,7 +1,7 @@
 <configure
    xmlns="http://namespaces.zope.org/zope"
    xmlns:z3ext="http://namespaces.zope.org/z3ext"
-   i18n_domain="z3ext">
+   i18n_domain="z3ext.preferences">
 
   <includeDependencies package="z3ext.preferences" />
 

Deleted: z3ext.preferences/trunk/src/z3ext/preferences/i18n.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/i18n.py	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/src/z3ext/preferences/i18n.py	2008-10-14 12:26:50 UTC (rev 92192)
@@ -1,19 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2007 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-""" i18n
-
-$Id$
-"""
-from zope.i18nmessageid import MessageFactory
-_ = MessageFactory('z3ext')

Modified: z3ext.preferences/trunk/src/z3ext/preferences/interfaces.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/interfaces.py	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/src/z3ext/preferences/interfaces.py	2008-10-14 12:26:50 UTC (rev 92192)
@@ -18,7 +18,10 @@
 from zope import schema, interface
 from zope.configuration import fields
 from zope.location.interfaces import ILocation
+from zope.i18nmessageid import MessageFactory
 
+_ = MessageFactory('z3ext.preferences')
+
 ANNOTATION_KEY = 'zope.app.user.UserPreferences'
 
 

Modified: z3ext.preferences/trunk/src/z3ext/preferences/preferencetype.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/preferencetype.py	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/src/z3ext/preferences/preferencetype.py	2008-10-14 12:26:50 UTC (rev 92192)
@@ -18,8 +18,7 @@
 import sys
 from zope import interface
 from zope.schema import getFields
-
-from z3ext.preferences.i18n import _
+from z3ext.preferences.interfaces import _
 from z3ext.preferences.preference import PreferenceGroup
 
 _marker = object()

Modified: z3ext.preferences/trunk/src/z3ext/preferences/root.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/root.py	2008-10-14 11:21:30 UTC (rev 92191)
+++ z3ext.preferences/trunk/src/z3ext/preferences/root.py	2008-10-14 12:26:50 UTC (rev 92192)
@@ -19,9 +19,8 @@
 from zope.app.component.hooks import getSite
 from zope.app.security.interfaces import IUnauthenticatedPrincipal
 
-from i18n import _
 from preference import PreferenceGroup
-from interfaces import IBound, IRootPreferences, IPreferenceCategory
+from interfaces import _, IBound, IRootPreferences, IPreferenceCategory
 
 
 class PersonalPreferences(PreferenceGroup):



More information about the Checkins mailing list